Merge branch '⬆️-deps' into 🦆

yvt · yvt · commit 6ac382cf8027 · 2022-03-19T19:32:29.000+09:00
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/examples/basic_gr_peach/Cargo.toml b/examples/basic_gr_peach/Cargo.toml
@@ -10,5 +10,5 @@ r3_port_arm = { path = "../../src/r3_port_arm" }
 r3_kernel = { path = "../../src/r3_kernel", features = ["system_time"] }
 r3 = { path = "../../src/r3" }
 
-rtt-target = { version = "0.2.0" }
+rtt-target = { version = "0.3.0" }
 rza1 = { version = "0.2.0", features = ["cpg", "gpio", "scif"] }
diff --git a/examples/basic_nucleo_f401re/Cargo.toml b/examples/basic_nucleo_f401re/Cargo.toml
@@ -12,7 +12,7 @@ r3_port_arm_m = { path = "../../src/r3_port_arm_m" }
 r3_kernel = { path = "../../src/r3_kernel", features = ["system_time"] }
 r3 = { path = "../../src/r3", features = ["sync"] }
 
-panic-rtt-target = { version = "0.1.0", features = ["cortex-m"] }
+panic-rtt-target = { version = "0.1.2", features = ["cortex-m"] }
 nucleo-f401re = { version = "0.4.1" }
 cortex-m-rt = { version = "0.6.12" }
-rtt-target = { version = "0.2.0", features = ["cortex-m"] }
+rtt-target = { version = "0.3.0", features = ["cortex-m"] }
diff --git a/examples/basic_wio_terminal/Cargo.toml b/examples/basic_wio_terminal/Cargo.toml
@@ -18,7 +18,6 @@ wio_terminal = { version = "0.4" }
 cortex-m-rt = { version = "0.6.12" }
 usbd-serial = { version = "0.1" }
 usb-device = { version = "0.2.7" }
-atsamd-hal = { version = "0.13", features = ["samd51p"] }
 arrayvec = { version = "0.7.1", default-features = false }
 cortex-m = { version = "*" }
 cryo = { version = "0.3.1", default-features = false, features = ["atomic"] }
diff --git a/examples/basic_wio_terminal/src/main.rs b/examples/basic_wio_terminal/src/main.rs
@@ -35,7 +35,7 @@ use usb_device::{
 };
 use usbd_serial::{SerialPort, USB_CLASS_CDC};
 use wio::{
-    hal::{clock::GenericClockController, gpio, usb::UsbBus},
+    hal::{self, clock::GenericClockController, gpio, usb::UsbBus},
     pac::{CorePeripherals, Peripherals},
     prelude::*,
     Pins, Sets,
@@ -262,10 +262,10 @@ fn init_hardware(
 
 type HardwareLateInitInput = (
     GenericClockController,
-    atsamd_hal::pac::MCLK,
+    hal::pac::MCLK,
     Option<wio_terminal::Display>,
-    atsamd_hal::gpio::Port,
-    Option<atsamd_hal::pac::SERCOM7>,
+    hal::gpio::Port,
+    Option<hal::pac::SERCOM7>,
 );
 
 fn init_hardware_late_task_body(
@@ -287,7 +287,7 @@ fn init_hardware_late_task_body(
 /// Implements `DelayMs` using `System::sleep`.
 struct DelayByKernel;
 
-impl atsamd_hal::hal::blocking::delay::DelayMs<u16> for DelayByKernel {
+impl hal::hal::blocking::delay::DelayMs<u16> for DelayByKernel {
     #[inline]
     fn delay_ms(&mut self, ms: u16) {
         System::sleep(r3::time::Duration::from_millis(ms as i32)).unwrap();
diff --git a/examples/common/Cargo.toml b/examples/common/Cargo.toml
@@ -9,6 +9,6 @@ embedded-graphics = { version = "0.7.1" }
 
 [build-dependencies]
 embedded-graphics = { version = "0.7.1" }
-image = { version = "0.23.14", default-features = false, features = ["gif"] }
+image = { version = "0.24.1", default-features = false, features = ["gif"] }
 nsvg = { version = "0.5.1", default-features = false }
-zstd = { version = "0.9.0" }
+zstd = { version = "0.11.1" }
diff --git a/src/r3/CHANGELOG.md b/src/r3/CHANGELOG.md
@@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [Unreleased]
 
+### Fixed
+
+- Upgrade `svgbobdoc` to `^0.3.0` to fix build failures in documentation build
+
 ## [0.2.0] - 2022-03-15
 
 **The design has been wholly revamped!** `r3_core ^0.1` defines the interface between an application and a kernel implementation. `r3` re-exports most of `r3_core` and provides additional items. The current kernel implementation has been moved to `r3_kernel 0.1.0`. Different kernel implementations that use more exotic architectures (such as interrupt-driven multi-threading) or are built on top on existing RTOSes may be added in the future.
diff --git a/src/r3/Cargo.toml b/src/r3/Cargo.toml
@@ -30,7 +30,7 @@ _full = []
 [dependencies]
 stable_deref_trait = { version = "1.2.0", default-features = false }
 embed-doc-image = { version = "0.1.4", optional = true }
-svgbobdoc = { version = "0.3.0-alpha.4" }
+svgbobdoc = { version = "0.3.0" }
 macropol = { version = "0.1.2" }
 r3_core = { version = "0.1.0", path = "../r3_core" }
 
diff --git a/src/r3_core/CHANGELOG.md b/src/r3_core/CHANGELOG.md
@@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [Unreleased]
 
+### Fixed
+
+- Upgrade `svgbobdoc` to `^0.3.0` to fix build failures in documentation build
+
 ## 0.1.0 - 2022-03-15
 
 Initial release.
diff --git a/src/r3_core/Cargo.toml b/src/r3_core/Cargo.toml
@@ -24,7 +24,7 @@ stable_deref_trait = { version = "1.2.0", default-features = false }
 chrono_0p4 = { version = "0.4.13", package = "chrono", optional = true, default-features = false }
 memoffset = { version = "0.6.5", features = ["unstable_const"] }
 seq-macro = { version = "0.3.0" }
-svgbobdoc = { version = "0.3.0-alpha.4" }
+svgbobdoc = { version = "0.3.0" }
 tokenlock = { version = "0.3.4", default-features = false }
 arrayvec = { version = "0.7.1", default-features = false }
 bitflags = { version = "1.2.1" }
diff --git a/src/r3_kernel/CHANGELOG.md b/src/r3_kernel/CHANGELOG.md
@@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [Unreleased]
 
+### Fixed
+
+- Upgrade `svgbobdoc` to `^0.3.0` to fix build failures in documentation build
+
 ## 0.1.0 - 2022-03-15
 
 Initial release. Supports `r3_core ^0.1`.
diff --git a/src/r3_kernel/Cargo.toml b/src/r3_kernel/Cargo.toml
@@ -32,7 +32,7 @@ _full = []
 num-integer = { version = "0.1.42", default-features = false }
 num-traits = { version = "0.2.11", default-features = false }
 pin-utils = { version = "0.1.0" }
-svgbobdoc = { version = "0.3.0-alpha.4" }
+svgbobdoc = { version = "0.3.0" }
 tokenlock = { version = "0.3.4", default-features = false }
 arrayvec = { version = "0.7.1", default-features = false }
 bitflags = { version = "1.2.1" }
diff --git a/src/r3_port_arm_m_test_driver/Cargo.toml b/src/r3_port_arm_m_test_driver/Cargo.toml
@@ -43,10 +43,10 @@ r3 = { path = "../r3", optional = true }
 
 cortex-m-semihosting = { version = "0.3.5", optional = true }
 panic-semihosting = { version = "0.5.3", optional = true }
-panic-rtt-target = { version = "0.1.0", optional = true, features = ["cortex-m"] }
+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 }
-rtt-target = { version = "0.2.0", optional = true, features = ["cortex-m"] }
+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_riscv/CHANGELOG.md b/src/r3_port_riscv/CHANGELOG.md
@@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [Unreleased]
 
+### Fixed
+
+- Upgrade `svgbobdoc` to `^0.3.0` to fix build failures in documentation build
+
 ## [0.2.0] - 2022-03-15
 
 ### Changed
diff --git a/src/r3_port_riscv/Cargo.toml b/src/r3_port_riscv/Cargo.toml
@@ -24,7 +24,7 @@ r3_core = { version = "0.1.0", path = "../r3_core" }
 tock-registers = { version = "0.7.0" }
 unstringify = { version = "0.1.4" }
 seq-macro = { version = "0.3.0" }
-svgbobdoc = { version = "0.3.0-alpha.4" }
+svgbobdoc = { version = "0.3.0" }
 riscv-rt = { version = ">= 0.6.0, < 0.9.0" }
 riscv = { version = ">= 0.5.0, < 0.8.0" }
 
diff --git a/src/r3_port_riscv_test_driver/Cargo.toml b/src/r3_port_riscv_test_driver/Cargo.toml
@@ -78,7 +78,7 @@ r3_port_riscv = { path = "../r3_port_riscv", optional = true }
 r3_portkit = { path = "../r3_portkit", optional = true }
 r3 = { path = "../r3", optional = true }
 
-rtt-target = { version = "0.2.0", optional = true }
+rtt-target = { version = "0.3.0", optional = true, features = ["riscv"] }
 e310x-hal = { version = "0.9.0", optional = true, features = ["g002"] }
 k210-hal = { version = "0.2.0", optional = true }
 riscv-rt = { version = ">= 0.6.0, < 0.9.0", optional = true }
diff --git a/src/r3_port_riscv_test_driver/src/main.rs b/src/r3_port_riscv_test_driver/src/main.rs
@@ -271,12 +271,7 @@ macro_rules! instantiate_test {
                     }
                 };
 
-                unsafe {
-                    rtt_target::set_print_channel_cs(
-                        channels.up.0,
-                        &((|arg, f| f(arg)) as rtt_target::CriticalSectionFunc),
-                    )
-                };
+                rtt_target::set_print_channel(channels.up.0);
                 logger_rtt::init(channels.up.1);
             }).finish(b);
 
diff --git a/src/r3_port_std/CHANGELOG.md b/src/r3_port_std/CHANGELOG.md
@@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [Unreleased]
 
+### Fixed
+
+- Upgrade `svgbobdoc` to `^0.3.0` to fix build failures in documentation build
+
 ## [0.2.0] - 2022-03-15
 
 ### Changed
diff --git a/src/r3_portkit/CHANGELOG.md b/src/r3_portkit/CHANGELOG.md
@@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [Unreleased]
 
+### Fixed
+
+- Upgrade `svgbobdoc` to `^0.3.0` to fix build failures in documentation build
+
 ## [0.2.0] - 2022-03-15
 
 ### Changed
diff --git a/src/r3_portkit/Cargo.toml b/src/r3_portkit/Cargo.toml
@@ -17,7 +17,7 @@ r3_kernel = { version = "0.1.0", path = "../r3_kernel" }
 r3_core = { version = "0.1.0", path = "../r3_core" }
 
 num-rational = { version = "0.4.0", default-features = false }
-svgbobdoc = { version = "0.3.0-alpha.4" }
+svgbobdoc = { version = "0.3.0" }
 
 [dev-dependencies]
 quickcheck_macros = { version = "1.0.0" }
diff --git a/src/r3_test_runner/Cargo.toml b/src/r3_test_runner/Cargo.toml
@@ -11,16 +11,17 @@ r3_test_suite = { path = "../r3_test_suite", default-features = false }
 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.11.0" }
+probe-rs-rtt = { version = "0.12.0" }
 tokio-serial = { version = "5.4.1" }
+async-mutex = { version = "1.4.0" }
 lazy_static = { version = "1.4.0" }
 env_logger = { version = "0.8.4" }
 serde_json = { version = "1.0.57" }
 serialport = { version = "4.0.0" }
 itertools = { version = "0.10.0" }
 pin-utils = { version = "0.1.0" }
 thiserror = { version = "1.0.20" }
-probe-rs = { version = "0.11.0" }
+probe-rs = { version = "0.12.0" }
 tempdir = { version = "0.3.7" }
 anyhow = { version = "1.0.32" }
 serde = { version = "1.0.114" }
@@ -31,7 +32,7 @@ log = { version = "0.4.8" }
 crc = { version = "2.0.0" }
 
 [dependencies.goblin]
-version = "0.4.3"
+version = "0.5.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
@@ -1,11 +1,12 @@
 use anyhow::Result;
+use async_mutex::Mutex as AsyncMutex;
 use std::{
     fmt::Write,
     future::Future,
     io,
     path::Path,
     pin::Pin,
-    sync::{Arc, Mutex},
+    sync::Arc,
     task::{Context, Poll},
 };
 use tempdir::TempDir;
@@ -159,13 +160,13 @@ impl DebugProbe for Fe310JLinkDebugProbe {
             let probe = probe_rs::Probe::open(selector).map_err(RunError::OpenProbe)?;
 
             let selector: probe_rs::config::TargetSelector = "riscv".try_into().unwrap();
-            let session = Arc::new(Mutex::new(
+            let session = Arc::new(AsyncMutex::new(
                 probe.attach(selector).map_err(RunError::Attach)?,
             ));
 
             // Open the RTT channels
             Ok(super::probe_rs::attach_rtt(
-                session,
+                session.try_lock_arc().unwrap(),
                 &exe,
                 super::probe_rs::RttOptions {
                     // The RISC-V External Debug Support specification 0.13 (to
diff --git a/src/r3_test_runner/src/targets/probe_rs.rs b/src/r3_test_runner/src/targets/probe_rs.rs
