From 3d678c242224f7cd7710627ee2d1ab4e8b760ec9 Mon Sep 17 00:00:00 2001
From: Matt Johnston <matt@ucc.asn.au>
Date: Mon, 29 May 2023 11:12:41 +0800
Subject: [PATCH] Don't use local patch directories for embassy-net
---
embassy/demos/picow/Cargo.lock | 96 +++++++++-------------------------
embassy/demos/picow/Cargo.toml | 16 +++---
2 files changed, 34 insertions(+), 78 deletions(-)
diff --git a/embassy/demos/picow/Cargo.lock b/embassy/demos/picow/Cargo.lock
index 3164bfb..ba87631 100644
--- a/embassy/demos/picow/Cargo.lock
+++ b/embassy/demos/picow/Cargo.lock
@@ -348,10 +348,10 @@ dependencies = [
"cortex-m",
"cortex-m-rt",
"defmt",
- "embassy-futures 0.1.0 (git+https://github.com/embassy-rs/embassy?rev=3e730aa8b06401003202bf9e21a9c83ec6b21b0e)",
- "embassy-net-driver-channel 0.1.0",
+ "embassy-futures",
+ "embassy-net-driver-channel",
"embassy-sync 0.1.0",
- "embassy-time 0.1.1 (git+https://github.com/embassy-rs/embassy?rev=3e730aa8b06401003202bf9e21a9c83ec6b21b0e)",
+ "embassy-time",
"embedded-hal 1.0.0-alpha.10",
"futures",
"num_enum",
@@ -511,7 +511,7 @@ dependencies = [
"cortex-m",
"critical-section 1.1.1",
"embassy-executor",
- "embassy-hal-common 0.1.0 (git+https://github.com/embassy-rs/embassy?rev=3e730aa8b06401003202bf9e21a9c83ec6b21b0e)",
+ "embassy-hal-common",
"embassy-macros",
"embassy-sync 0.2.0 (git+https://github.com/embassy-rs/embassy?rev=3e730aa8b06401003202bf9e21a9c83ec6b21b0e)",
]
@@ -540,27 +540,16 @@ dependencies = [
"critical-section 1.1.1",
"defmt",
"embassy-macros",
- "embassy-time 0.1.1 (git+https://github.com/embassy-rs/embassy?rev=3e730aa8b06401003202bf9e21a9c83ec6b21b0e)",
+ "embassy-time",
"futures-util",
"static_cell",
]
-[[package]]
-name = "embassy-futures"
-version = "0.1.0"
-
[[package]]
name = "embassy-futures"
version = "0.1.0"
source = "git+https://github.com/embassy-rs/embassy?rev=3e730aa8b06401003202bf9e21a9c83ec6b21b0e#3e730aa8b06401003202bf9e21a9c83ec6b21b0e"
-[[package]]
-name = "embassy-hal-common"
-version = "0.1.0"
-dependencies = [
- "num-traits",
-]
-
[[package]]
name = "embassy-hal-common"
version = "0.1.0"
@@ -584,14 +573,15 @@ dependencies = [
[[package]]
name = "embassy-net"
version = "0.1.0"
+source = "git+https://github.com/embassy-rs/embassy?rev=3e730aa8b06401003202bf9e21a9c83ec6b21b0e#3e730aa8b06401003202bf9e21a9c83ec6b21b0e"
dependencies = [
"as-slice 0.2.1",
"atomic-polyfill 1.0.1",
"atomic-pool",
- "embassy-hal-common 0.1.0",
- "embassy-net-driver 0.1.0",
- "embassy-sync 0.2.0",
- "embassy-time 0.1.1",
+ "embassy-hal-common",
+ "embassy-net-driver",
+ "embassy-sync 0.2.0 (git+https://github.com/embassy-rs/embassy?rev=3e730aa8b06401003202bf9e21a9c83ec6b21b0e)",
+ "embassy-time",
"embedded-io 0.4.0",
"embedded-nal-async",
"futures",
@@ -602,31 +592,18 @@ dependencies = [
"stable_deref_trait",
]
-[[package]]
-name = "embassy-net-driver"
-version = "0.1.0"
-
[[package]]
name = "embassy-net-driver"
version = "0.1.0"
source = "git+https://github.com/embassy-rs/embassy?rev=3e730aa8b06401003202bf9e21a9c83ec6b21b0e#3e730aa8b06401003202bf9e21a9c83ec6b21b0e"
-[[package]]
-name = "embassy-net-driver-channel"
-version = "0.1.0"
-dependencies = [
- "embassy-futures 0.1.0",
- "embassy-net-driver 0.1.0",
- "embassy-sync 0.2.0",
-]
-
[[package]]
name = "embassy-net-driver-channel"
version = "0.1.0"
source = "git+https://github.com/embassy-rs/embassy?rev=3e730aa8b06401003202bf9e21a9c83ec6b21b0e#3e730aa8b06401003202bf9e21a9c83ec6b21b0e"
dependencies = [
- "embassy-futures 0.1.0 (git+https://github.com/embassy-rs/embassy?rev=3e730aa8b06401003202bf9e21a9c83ec6b21b0e)",
- "embassy-net-driver 0.1.0 (git+https://github.com/embassy-rs/embassy?rev=3e730aa8b06401003202bf9e21a9c83ec6b21b0e)",
+ "embassy-futures",
+ "embassy-net-driver",
"embassy-sync 0.2.0 (git+https://github.com/embassy-rs/embassy?rev=3e730aa8b06401003202bf9e21a9c83ec6b21b0e)",
]
@@ -644,10 +621,10 @@ dependencies = [
"embassy-cortex-m",
"embassy-embedded-hal",
"embassy-executor",
- "embassy-futures 0.1.0 (git+https://github.com/embassy-rs/embassy?rev=3e730aa8b06401003202bf9e21a9c83ec6b21b0e)",
- "embassy-hal-common 0.1.0 (git+https://github.com/embassy-rs/embassy?rev=3e730aa8b06401003202bf9e21a9c83ec6b21b0e)",
+ "embassy-futures",
+ "embassy-hal-common",
"embassy-sync 0.2.0 (git+https://github.com/embassy-rs/embassy?rev=3e730aa8b06401003202bf9e21a9c83ec6b21b0e)",
- "embassy-time 0.1.1 (git+https://github.com/embassy-rs/embassy?rev=3e730aa8b06401003202bf9e21a9c83ec6b21b0e)",
+ "embassy-time",
"embassy-usb-driver",
"embedded-hal 0.2.7",
"embedded-hal 1.0.0-alpha.10",
@@ -679,17 +656,6 @@ dependencies = [
"heapless",
]
-[[package]]
-name = "embassy-sync"
-version = "0.2.0"
-dependencies = [
- "cfg-if",
- "critical-section 1.1.1",
- "embedded-io 0.4.0",
- "futures-util",
- "heapless",
-]
-
[[package]]
name = "embassy-sync"
version = "0.2.0"
@@ -715,18 +681,6 @@ dependencies = [
"heapless",
]
-[[package]]
-name = "embassy-time"
-version = "0.1.1"
-dependencies = [
- "atomic-polyfill 1.0.1",
- "cfg-if",
- "critical-section 1.1.1",
- "embedded-hal 0.2.7",
- "futures-util",
- "heapless",
-]
-
[[package]]
name = "embassy-time"
version = "0.1.1"
@@ -747,8 +701,8 @@ version = "0.1.0"
source = "git+https://github.com/embassy-rs/embassy?rev=3e730aa8b06401003202bf9e21a9c83ec6b21b0e#3e730aa8b06401003202bf9e21a9c83ec6b21b0e"
dependencies = [
"defmt",
- "embassy-futures 0.1.0 (git+https://github.com/embassy-rs/embassy?rev=3e730aa8b06401003202bf9e21a9c83ec6b21b0e)",
- "embassy-net-driver-channel 0.1.0 (git+https://github.com/embassy-rs/embassy?rev=3e730aa8b06401003202bf9e21a9c83ec6b21b0e)",
+ "embassy-futures",
+ "embassy-net-driver-channel",
"embassy-sync 0.2.0 (git+https://github.com/embassy-rs/embassy?rev=3e730aa8b06401003202bf9e21a9c83ec6b21b0e)",
"embassy-usb-driver",
"heapless",
@@ -1668,6 +1622,8 @@ checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0"
[[package]]
name = "smoltcp"
version = "0.9.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7e9786ac45091b96f946693e05bfa4d8ca93e2d3341237d97a380107a6b38dea"
dependencies = [
"bitflags",
"byteorder",
@@ -1793,11 +1749,11 @@ version = "0.1.0"
dependencies = [
"bcrypt",
"defmt",
- "embassy-futures 0.1.0 (git+https://github.com/embassy-rs/embassy?rev=3e730aa8b06401003202bf9e21a9c83ec6b21b0e)",
+ "embassy-futures",
"embassy-net",
- "embassy-net-driver 0.1.0",
+ "embassy-net-driver",
"embassy-sync 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "embassy-time 0.1.1 (git+https://github.com/embassy-rs/embassy?rev=3e730aa8b06401003202bf9e21a9c83ec6b21b0e)",
+ "embassy-time",
"embedded-io 0.4.0",
"heapless",
"hmac",
@@ -1823,12 +1779,12 @@ dependencies = [
"defmt",
"defmt-rtt",
"embassy-executor",
- "embassy-futures 0.1.0 (git+https://github.com/embassy-rs/embassy?rev=3e730aa8b06401003202bf9e21a9c83ec6b21b0e)",
+ "embassy-futures",
"embassy-net",
- "embassy-net-driver 0.1.0",
+ "embassy-net-driver",
"embassy-rp",
"embassy-sync 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "embassy-time 0.1.1 (git+https://github.com/embassy-rs/embassy?rev=3e730aa8b06401003202bf9e21a9c83ec6b21b0e)",
+ "embassy-time",
"embassy-usb",
"embassy-usb-driver",
"embedded-hal 1.0.0-alpha.10",
@@ -1857,7 +1813,7 @@ name = "sunset-embassy"
version = "0.2.0-alpha"
dependencies = [
"atomic-polyfill 1.0.1",
- "embassy-futures 0.1.0 (git+https://github.com/embassy-rs/embassy?rev=3e730aa8b06401003202bf9e21a9c83ec6b21b0e)",
+ "embassy-futures",
"embassy-sync 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
"embedded-io 0.4.0",
"log",
diff --git a/embassy/demos/picow/Cargo.toml b/embassy/demos/picow/Cargo.toml
index 237a661..c8c14f4 100644
--- a/embassy/demos/picow/Cargo.toml
+++ b/embassy/demos/picow/Cargo.toml
@@ -75,18 +75,18 @@ romfw = []
embassy-executor = { git = "https://github.com/embassy-rs/embassy", rev = "3e730aa8b06401003202bf9e21a9c83ec6b21b0e" }
embassy-futures = { git = "https://github.com/embassy-rs/embassy", rev = "3e730aa8b06401003202bf9e21a9c83ec6b21b0e" }
embassy-rp = { git = "https://github.com/embassy-rs/embassy", rev = "3e730aa8b06401003202bf9e21a9c83ec6b21b0e" }
-# embassy-net = { git = "https://github.com/embassy-rs/embassy", rev = "3e730aa8b06401003202bf9e21a9c83ec6b21b0e" }
embassy-usb = { git = "https://github.com/embassy-rs/embassy", rev = "3e730aa8b06401003202bf9e21a9c83ec6b21b0e" }
embassy-time = { git = "https://github.com/embassy-rs/embassy", rev = "3e730aa8b06401003202bf9e21a9c83ec6b21b0e" }
embassy-usb-driver = { git = "https://github.com/embassy-rs/embassy", rev = "3e730aa8b06401003202bf9e21a9c83ec6b21b0e" }
# for cyw43
-# embassy-net-driver-channel = { git = "https://github.com/embassy-rs/embassy", rev = "3e730aa8b06401003202bf9e21a9c83ec6b21b0e" }
-# embassy-net-driver = { git = "https://github.com/embassy-rs/embassy", rev = "3e730aa8b06401003202bf9e21a9c83ec6b21b0e" }
-
-embassy-net = { path = "/home/matt/3rd/rs/embassy/embassy-net" }
-embassy-net-driver = { path = "/home/matt/3rd/rs/embassy/embassy-net-driver" }
-embassy-net-driver-channel = { path = "/home/matt/3rd/rs/embassy/embassy-net-driver-channel" }
-smoltcp = { path = "/home/matt/3rd/rs/smoltcp" }
+embassy-net = { git = "https://github.com/embassy-rs/embassy", rev = "3e730aa8b06401003202bf9e21a9c83ec6b21b0e" }
+embassy-net-driver-channel = { git = "https://github.com/embassy-rs/embassy", rev = "3e730aa8b06401003202bf9e21a9c83ec6b21b0e" }
+embassy-net-driver = { git = "https://github.com/embassy-rs/embassy", rev = "3e730aa8b06401003202bf9e21a9c83ec6b21b0e" }
+
+# embassy-net = { path = "/home/matt/3rd/rs/embassy/embassy-net" }
+# embassy-net-driver = { path = "/home/matt/3rd/rs/embassy/embassy-net-driver" }
+# embassy-net-driver-channel = { path = "/home/matt/3rd/rs/embassy/embassy-net-driver-channel" }
+# smoltcp = { path = "/home/matt/3rd/rs/smoltcp" }
bcrypt = { version = "0.14", git = "https://github.com/mkj/rust-bcrypt", branch = "noalloc" }
#bcrypt = { path = "/home/matt/3rd/rs/bcrypt" }
--
GitLab