From 78083f0fdb51eecf77210d31580ad9b9dd24ea6c Mon Sep 17 00:00:00 2001 From: Valentin Trophime <valentin.trophime@inria.fr> Date: Wed, 6 Nov 2024 22:31:24 +0100 Subject: [PATCH] update embassy to crates-io version --- Cargo.lock | 66 ++++++++++++++++++++++++++++++++++++------------------ Cargo.toml | 5 ----- 2 files changed, 44 insertions(+), 27 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 1aa5b71..56840fb 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -16,9 +16,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "critical-section" -version = "1.1.3" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f64009896348fc5af4222e9cf7d7d82a95a256c634ebcf61c53e4ea461422242" +checksum = "790eea4361631c5e7d22598ecd5723ff611904e3344ce8720784c93e3d83d40b" [[package]] name = "darling" @@ -66,20 +66,23 @@ dependencies = [ [[package]] name = "embassy-executor" -version = "0.6.0" -source = "git+https://github.com/embassy-rs/embassy?rev=bc0180800d751e651c0d15c807285c11cdb4f486#bc0180800d751e651c0d15c807285c11cdb4f486" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "78b1ff3528e58bdefda6be4a68a61e0887a636f06382a87ed5bd99d916cb4bf6" dependencies = [ "critical-section", "document-features", "embassy-executor-macros", "embassy-time-driver", "embassy-time-queue-driver", + "rustc_version", ] [[package]] name = "embassy-executor-macros" -version = "0.5.0" -source = "git+https://github.com/embassy-rs/embassy?rev=bc0180800d751e651c0d15c807285c11cdb4f486#bc0180800d751e651c0d15c807285c11cdb4f486" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3577b1e9446f61381179a330fc5324b01d511624c55f25e3c66c9e3c626dbecf" dependencies = [ "darling", "proc-macro2", @@ -96,7 +99,8 @@ checksum = "1f878075b9794c1e4ac788c95b728f26aa6366d32eeb10c7051389f898f7d067" [[package]] name = "embassy-sync" version = "0.6.0" -source = "git+https://github.com/embassy-rs/embassy?rev=bc0180800d751e651c0d15c807285c11cdb4f486#bc0180800d751e651c0d15c807285c11cdb4f486" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b3e0c49ff02ebe324faf3a8653ba91582e2d0a7fdef5bc88f449d5aa1bfcc05c" dependencies = [ "cfg-if", "critical-section", @@ -108,7 +112,8 @@ dependencies = [ [[package]] name = "embassy-time" version = "0.3.2" -source = "git+https://github.com/embassy-rs/embassy?rev=bc0180800d751e651c0d15c807285c11cdb4f486#bc0180800d751e651c0d15c807285c11cdb4f486" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "158080d48f824fad101d7b2fae2d83ac39e3f7a6fa01811034f7ab8ffc6e7309" dependencies = [ "cfg-if", "critical-section", @@ -126,7 +131,8 @@ dependencies = [ [[package]] name = "embassy-time-driver" version = "0.1.0" -source = "git+https://github.com/embassy-rs/embassy?rev=bc0180800d751e651c0d15c807285c11cdb4f486#bc0180800d751e651c0d15c807285c11cdb4f486" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6e0c214077aaa9206958b16411c157961fb7990d4ea628120a78d1a5a28aed24" dependencies = [ "document-features", ] @@ -134,7 +140,8 @@ dependencies = [ [[package]] name = "embassy-time-queue-driver" version = "0.1.0" -source = "git+https://github.com/embassy-rs/embassy?rev=bc0180800d751e651c0d15c807285c11cdb4f486#bc0180800d751e651c0d15c807285c11cdb4f486" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1177859559ebf42cd24ae7ba8fe6ee707489b01d0bf471f8827b7b12dcb0bc0" [[package]] name = "embedded-hal" @@ -184,21 +191,21 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" [[package]] name = "futures-core" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d" +checksum = "05f29059c0c2090612e8d742178b0580d2dc940c837851ad723096f87af6663e" [[package]] name = "futures-task" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004" +checksum = "f90f7dce0722e95104fcb095585910c0977252f286e354b5e3bd38902cd99988" [[package]] name = "futures-util" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48" +checksum = "9fa08315bb612088cc391249efdc3bc77536f16c91f6cf495e6fbe85b20a4a81" dependencies = [ "futures-core", "futures-task", @@ -260,9 +267,9 @@ checksum = "8d5439c4ad607c3c23abf66de8c8bf57ba8adcd1f129e699851a6e43935d339d" [[package]] name = "pin-project-lite" -version = "0.2.14" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02" +checksum = "915a1e146535de9163f3987b8944ed8cf49a18bb0056bcebcdcece385cece4ff" [[package]] name = "pin-utils" @@ -283,9 +290,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.86" +version = "1.0.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" +checksum = "f139b0662de085916d1fb67d2b4169d1addddda1919e696f3252b740b629986e" dependencies = [ "unicode-ident", ] @@ -299,6 +306,21 @@ dependencies = [ "proc-macro2", ] +[[package]] +name = "rustc_version" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cfcb3a22ef46e85b45de6ee7e79d063319ebb6594faafcf1c225ea92ab6e9b92" +dependencies = [ + "semver", +] + +[[package]] +name = "semver" +version = "1.0.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b" + [[package]] name = "stable_deref_trait" version = "1.2.0" @@ -313,9 +335,9 @@ checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" [[package]] name = "syn" -version = "2.0.79" +version = "2.0.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89132cd0bf050864e1d38dc3bbc07a0eb8e7530af26344d3d2bbbef83499f590" +checksum = "25aa4ce346d03a6dcd68dd8b4010bcb74e54e62c90c573f394c46eae99aba32d" dependencies = [ "proc-macro2", "quote", diff --git a/Cargo.toml b/Cargo.toml index 8a2c064..5b21751 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -15,11 +15,6 @@ embassy-executor = { version = "0.6.0", features = ["task-arena-size-32768", "ar critical-section = { version = "1.1", features = ["std"] } -[patch.crates-io] -embassy-sync = { git = "https://github.com/embassy-rs/embassy", rev = "bc0180800d751e651c0d15c807285c11cdb4f486" } -embassy-executor = { git = "https://github.com/embassy-rs/embassy", rev = "bc0180800d751e651c0d15c807285c11cdb4f486" } -embassy-time = { git = "https://github.com/embassy-rs/embassy", rev = "bc0180800d751e651c0d15c807285c11cdb4f486" } - [profile.release-with-debug] inherits = "release" debug = true -- GitLab