From 5780bb5e838aa992abcaea1f4242611165fb53b2 Mon Sep 17 00:00:00 2001 From: Tim Crawford Date: Mon, 4 Apr 2022 13:11:27 -0600 Subject: [PATCH] Update Rust toolchain to 2022-03-18 Match the toolchain used by Redox. Update dependencies and submodules to fix building. Signed-off-by: Tim Crawford --- ecflash | 2 +- ecspy | 2 +- rust-toolchain.toml | 2 +- tool/Cargo.lock | 28 ++++++++++++++-------------- 4 files changed, 17 insertions(+), 17 deletions(-) diff --git a/ecflash b/ecflash index b08db29..2b94b81 160000 --- a/ecflash +++ b/ecflash @@ -1 +1 @@ -Subproject commit b08db293137726bc576da6bef6d57adf3e4adc97 +Subproject commit 2b94b81b971dce74f11fc8549fa8d6c4acd68657 diff --git a/ecspy b/ecspy index 308a5bb..3ff52b2 160000 --- a/ecspy +++ b/ecspy @@ -1 +1 @@ -Subproject commit 308a5bbfa660fc623433037a2f6d0a9b9f879de1 +Subproject commit 3ff52b23483afe8965e89f2cea89bd571ca28900 diff --git a/rust-toolchain.toml b/rust-toolchain.toml index 4d97fdd..f31d204 100644 --- a/rust-toolchain.toml +++ b/rust-toolchain.toml @@ -1,3 +1,3 @@ [toolchain] -channel = "nightly-2021-06-15" +channel = "nightly-2022-03-18" components = ["rust-src"] diff --git a/tool/Cargo.lock b/tool/Cargo.lock index 1e9ed55..611e5ce 100644 --- a/tool/Cargo.lock +++ b/tool/Cargo.lock @@ -4,9 +4,9 @@ version = 3 [[package]] name = "ansi_term" -version = "0.11.0" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b" +checksum = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2" dependencies = [ "winapi", ] @@ -30,15 +30,15 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "cc" -version = "1.0.72" +version = "1.0.73" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22a9137b95ea06864e018375b72adfb7db6e6f68cfc8df5a04d00288050485ee" +checksum = "2fff2a6927b3bb87f9595d67196a70493f627687a71d87a0d692242c33f58c11" [[package]] name = "clap" -version = "2.33.3" +version = "2.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37e58ac78573c40708d45522f0d80fa2f01cc4f9b4e2bf749807255454312002" +checksum = "a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c" dependencies = [ "ansi_term", "atty", @@ -66,9 +66,9 @@ dependencies = [ [[package]] name = "hidapi" -version = "1.2.7" +version = "1.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f39cbe399e8e9550264e9f26553bf26f5ece2b6cf13abe32d06c857a5166263" +checksum = "c2ec6bf425a5c3af047bb2a029de540a7d74cefa4761f14be67d7884dcd497b0" dependencies = [ "cc", "libc", @@ -77,21 +77,21 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.107" +version = "0.2.121" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbe5e23404da5b4f555ef85ebed98fb4083e55a00c317800bc2a50ede9f3d219" +checksum = "efaa7b300f3b5fe8eb6bf21ce3895e1751d9665086af2d64b42f19701015ff4f" [[package]] name = "pkg-config" -version = "0.3.22" +version = "0.3.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12295df4f294471248581bc09bef3c38a5e46f1e36d6a37353621a0c6c357e1f" +checksum = "1df8c4ec4b0627e53bdf214615ad287367e482558cf84b109250b37464dc03ae" [[package]] name = "redox_hwio" -version = "0.1.4" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b3b8075af56e2600f1bc43e97cb3911b8320d89d39a6215739c3cfff91af016" +checksum = "9489d9e1b95e30ca0c6c5e9f5af5960ef838e4045eecd71db748248a7216778d" [[package]] name = "strsim"