sw:matcha: Fix rust build breakage from bare-io dependency Following https://spacebeaker-review.googlesource.com/c/shodan/kata/projects/processmanager/+/13240 to use core2 Cursor to support bare-io functionality. Change-Id: I530792445bbe9568f0794dd357d8cf3ac64c78f8
diff --git a/app/Cargo.toml b/app/Cargo.toml index 7876a41..a48e763 100644 --- a/app/Cargo.toml +++ b/app/Cargo.toml
@@ -4,7 +4,7 @@ edition = "2018" [dependencies] -bare-io = "0.2" +core2 = { version = "0.3", default-features = false } libtock = { path = "../../libtock-rs" } libtock_core = { path = "../../libtock-rs/core" } matcha_config = { path = "../config" }
diff --git a/app/src/dprintf.rs b/app/src/dprintf.rs index 179cfdf..c9c75e0 100644 --- a/app/src/dprintf.rs +++ b/app/src/dprintf.rs
@@ -1,6 +1,6 @@ //! App-side dprintf macro that calls through to the debug_uart capsule. -use bare_io::{Cursor, Write}; +use core2::io::{Cursor, Write}; use core::fmt; use libtock::syscalls; use matcha_config::*;
diff --git a/hal/Cargo.toml b/hal/Cargo.toml index bd27c2b..82d74bc 100644 --- a/hal/Cargo.toml +++ b/hal/Cargo.toml
@@ -4,6 +4,6 @@ edition = "2018" [dependencies] -bare-io = "0.2" +core2 = { version = "0.3", default-features = false } kernel = { path = "../../tock/kernel" } matcha_config = { path = "../config" }
diff --git a/hal/src/debug_uart.rs b/hal/src/debug_uart.rs index 183736d..9dcc161 100644 --- a/hal/src/debug_uart.rs +++ b/hal/src/debug_uart.rs
@@ -1,6 +1,6 @@ //! Unsafe synchronous dump-string-to-uart impl and macro for debugging. -use bare_io::{Cursor, Write}; +use core2::io::{Cursor, Write}; use core::fmt; pub const TX_BUSY: *const u32 = 0x4000_0010 as *const u32;
diff --git a/platform/Cargo.toml b/platform/Cargo.toml index 821688e..e3c1b04 100644 --- a/platform/Cargo.toml +++ b/platform/Cargo.toml
@@ -6,8 +6,6 @@ edition = "2018" [dependencies] -bare-io = "0.2" - components = { path = "../../tock/boards/components" } rv32i = { path = "../../tock/arch/rv32i" } capsules = { path = "../../tock/capsules" } @@ -18,4 +16,4 @@ matcha_capsules = { path = "../capsules" } matcha_config = { path = "../config" } matcha_utils = { path = "../utils" } -matcha_hal = { path = "../hal" } \ No newline at end of file +matcha_hal = { path = "../hal" }
diff --git a/utils/Cargo.toml b/utils/Cargo.toml index 2c51401..8d773c0 100644 --- a/utils/Cargo.toml +++ b/utils/Cargo.toml
@@ -4,6 +4,5 @@ edition = "2018" [dependencies] -bare-io = "0.2" -matcha_hal = { path = "../hal" } \ No newline at end of file +matcha_hal = { path = "../hal" }