Merge branch '⬆️-deps' into 🦆

yvt · yvt · commit ecfb4e1c4710 · 2023-01-14T22:22:19.000+09:00
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -95,6 +95,7 @@ branch = "refresh/0.6"
 [patch.crates-io.riscv-0p7]
 # Ditto.
 git = "https://github.com/rust-embedded/riscv.git"
+rev = "cd31989ba11d5d64e1addd8aab98bfb00dd927d5"
 package = "riscv"
 
 [patch.crates-io.riscv-rt]
diff --git a/examples/basic_rp_pico/Cargo.toml b/examples/basic_rp_pico/Cargo.toml
@@ -17,5 +17,5 @@ r3_kernel = { workspace = true, features = ["system_time"] }
 r3 = { workspace = true, features = ["sync"] }
 
 rp2040-boot2 = { version = "0.2.0" }
-rp2040-pac = { version = "0.3.0" }
+rp2040-pac = { version = "0.4.0" }
 cortex-m-rt = { version = "0.6.12", features = ["device"] }
diff --git a/examples/common/Cargo.toml b/examples/common/Cargo.toml
@@ -14,4 +14,4 @@ embedded-graphics = { version = "0.7.1" }
 embedded-graphics = { version = "0.7.1" }
 image = { version = "0.24.1", default-features = false, features = ["gif"] }
 nsvg = { version = "0.5.1", default-features = false }
-zstd = { version = "0.11.1" }
+zstd = { version = "0.12.2" }
diff --git a/examples/smp_rp_pico/Cargo.toml b/examples/smp_rp_pico/Cargo.toml
@@ -18,5 +18,5 @@ r3 = { workspace = true, features = ["sync"] }
 
 rp2040-boot2 = { version = "0.2.0" }
 cortex-m-rt = { version = "0.6.12", features = ["device"] }
-rp2040-pac = { version = "0.3.0" }
+rp2040-pac = { version = "0.4.0" }
 cortex-m = { version = "0.7.3", features = ["inline-asm"] }
diff --git a/src/r3_port_arm/Cargo.toml b/src/r3_port_arm/Cargo.toml
@@ -20,7 +20,7 @@ r3_core_ks = { workspace = true }
 r3_portkit = { workspace = true }
 r3_kernel = { workspace = true }
 
-tock-registers = { version = "0.7.0" }
+tock-registers = { version = "0.8.0" }
 memoffset = { version = "0.6.5", features = ["unstable_const"] }
 macropol = { version = "0.1.2" }
 r0 = { version = "1.0.0" }
diff --git a/src/r3_port_arm_m_test_driver/Cargo.toml b/src/r3_port_arm_m_test_driver/Cargo.toml
@@ -47,7 +47,7 @@ cortex-m-semihosting = { version = "0.5.0", optional = true }
 panic-semihosting = { version = "0.6.0", optional = true }
 panic-rtt-target = { version = "0.1.2", optional = true, features = ["cortex-m"] }
 cortex-m-rt = { version = "0.6.12", optional = true, features = ["device"] }
-rp2040-pac = { version = "0.3.0", optional = true }
+rp2040-pac = { version = "0.4.0", optional = true }
 rtt-target = { version = "0.3.0", optional = true, features = ["cortex-m"] }
 cortex-m = { version = "0.7.3", optional = true, features = ["inline-asm"] }
 log = { version = "0.4.8", optional = true }
diff --git a/src/r3_port_arm_test_driver/Cargo.toml b/src/r3_port_arm_test_driver/Cargo.toml
@@ -38,7 +38,7 @@ r3_support_rza1 = { workspace = true, optional = true, features = ["semver-exemp
 r3_port_arm = { workspace = true, optional = true }
 r3 = { workspace = true, optional = true }
 
-tock-registers = { version = "0.7.0", optional = true }
+tock-registers = { version = "0.8.0", optional = true }
 arrayvec = { version = "0.7.1", optional = true, default-features = false }
 macropol = { version = "0.1.2" }
 rza1 = { version = "0.2.0", optional = true, features = ["cpg", "gpio", "scif"] }
diff --git a/src/r3_port_riscv/Cargo.toml b/src/r3_port_riscv/Cargo.toml
@@ -23,7 +23,7 @@ r3_portkit = { workspace = true }
 r3_kernel = { workspace = true }
 
 macro_find_and_replace = { version = "1.0.0" }
-tock-registers = { version = "0.7.0" }
+tock-registers = { version = "0.8.0" }
 unstringify = { version = "0.1.4" }
 seq-macro = { version = "0.3.0" }
 svgbobdoc = { version = "0.3.0" }
diff --git a/src/r3_support_rp2040/CHANGELOG.md b/src/r3_support_rp2040/CHANGELOG.md
@@ -7,6 +7,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [Unreleased]
 
+- **Breaking (semver-exempt):** Upgrade `rp2040-pac ^0.3` to `^0.4`
+
 ### Changed
 
 - **Breaking (semver-exempt):** Change the target compiler version to `nightly-2022-08-11`
diff --git a/src/r3_support_rp2040/Cargo.toml b/src/r3_support_rp2040/Cargo.toml
@@ -30,8 +30,8 @@ r3 = { workspace = true }
 
 embedded-hal = { version = "0.2.4", optional = true }
 usbd-serial = { version = "0.1.1", optional = true }
-inline_dyn = { version = "0.1.1", optional = true }
-rp2040-pac = { version = "0.3.0" }
+inline_dyn = { version = "0.2.0", optional = true }
+rp2040-pac = { version = "0.4.0" }
 usb-device = { version = "0.2.7", optional = true }
 cortex-m = { version = "0.7.3", optional = true }
 vcell = { version = "0.1.2", optional = true }
diff --git a/src/r3_support_rp2040/src/stdout.rs b/src/r3_support_rp2040/src/stdout.rs
@@ -13,7 +13,7 @@ use nb::block;
 
 pub fn set_stdout(writer: impl SerialWrite) {
     interrupt::free(|cs| {
-        *STDOUT.borrow(cs).borrow_mut() = Some(inline_dyn![SerialWrite; writer].ok().unwrap());
+        *STDOUT.borrow(cs).borrow_mut() = Some(inline_dyn![SerialWrite; writer]);
     });
 }
 
@@ -26,7 +26,7 @@ impl<T> SerialWrite for T where
 {
 }
 
-type InlineDynWrite = InlineDyn<'static, dyn SerialWrite>;
+type InlineDynWrite = InlineDyn<dyn SerialWrite>;
 
 static STDOUT: interrupt::Mutex<RefCell<Option<InlineDynWrite>>> =
     interrupt::Mutex::new(RefCell::new(None));
diff --git a/src/r3_test_runner/Cargo.toml b/src/r3_test_runner/Cargo.toml
@@ -13,7 +13,7 @@ r3_test_suite = { workspace = true }
 arg_enum_proc_macro = { version = "0.3.0" }
 aho-corasick = { version = "0.7.13" }
 futures-core = { version = "0.3.5" }
-probe-rs-rtt = { version = "0.12.0" }
+probe-rs-rtt = { version = "0.14.0" }
 tokio-serial = { version = "5.4.1" }
 async-mutex = { version = "1.4.0" }
 env_logger = { version = "0.8.4" }
@@ -22,18 +22,18 @@ serialport = { version = "4.0.0" }
 itertools = { version = "0.10.0" }
 thiserror = { version = "1.0.20" }
 bytemuck = { version = "1.12.3", features = ["derive"] }
-probe-rs = { version = "0.12.0" }
+probe-rs = { version = "0.14.0" }
 tempdir = { version = "0.3.7" }
 anyhow = { version = "1.0.32" }
 serde = { version = "1.0.114" }
 clap = { version = "4.0.0", features = ["derive"] }
-rusb = { version = "0.8" }
+rusb = { version = "0.9" }
 toml = { version = "0.5.6" }
 log = { version = "0.4.8" }
 crc = { version = "3.0.0" }
 
 [dependencies.goblin]
-version = "0.5.0"
+version = "0.6.0"
 default-features = false
 # FIXME: <https://github.com/m4b/goblin/issues/212> `elf64` isn't actually used
 features = ["std", "elf32", "elf64", "endian_fd"]
diff --git a/src/r3_test_runner/src/targets/jlink.rs b/src/r3_test_runner/src/targets/jlink.rs
@@ -161,7 +161,9 @@ impl DebugProbe for Fe310JLinkDebugProbe {
 
             let selector: probe_rs::config::TargetSelector = "riscv".try_into().unwrap();
             let session = Arc::new(AsyncMutex::new(
-                probe.attach(selector).map_err(RunError::Attach)?,
+                probe
+                    .attach(selector, probe_rs::Permissions::new())
+                    .map_err(RunError::Attach)?,
             ));
 
             // Open the RTT channels
diff --git a/src/r3_test_runner/src/targets/probe_rs.rs b/src/r3_test_runner/src/targets/probe_rs.rs
@@ -88,7 +88,9 @@ impl ProbeRsDebugProbe {
         let probe = probe_rs::Probe::open(probe_sel).map_err(OpenError::OpenProbe)?;
 
         let session = Arc::new(AsyncMutex::new(
-            probe.attach(target_sel).map_err(OpenError::Attach)?,
+            probe
+                .attach(target_sel, probe_rs::Permissions::new())
+                .map_err(OpenError::Attach)?,
         ));
 
         Ok(Self { session })
