From 2c04eb3d4b4a9c10458bcaeaf603958c53968b86 Mon Sep 17 00:00:00 2001
From: Matt Johnston <matt@ucc.asn.au>
Date: Wed, 23 Nov 2022 00:18:19 +0800
Subject: [PATCH] Use caprand from github

---
 embassy/demos/picow/Cargo.lock |  1 +
 embassy/demos/picow/Cargo.toml |  2 +-
 embassy/demos/std/Cargo.lock   | 32 ++++++++++----------------------
 3 files changed, 12 insertions(+), 23 deletions(-)

diff --git a/embassy/demos/picow/Cargo.lock b/embassy/demos/picow/Cargo.lock
index 3613524..c9e083d 100644
--- a/embassy/demos/picow/Cargo.lock
+++ b/embassy/demos/picow/Cargo.lock
@@ -151,6 +151,7 @@ checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610"
 [[package]]
 name = "caprand"
 version = "0.1.0"
+source = "git+https://github.com/mkj/caprand#ddd00562d65a9750136dbde53d30773797906801"
 dependencies = [
  "cortex-m",
  "critical-section 1.1.1",
diff --git a/embassy/demos/picow/Cargo.toml b/embassy/demos/picow/Cargo.toml
index db31494..e8a71bb 100644
--- a/embassy/demos/picow/Cargo.toml
+++ b/embassy/demos/picow/Cargo.toml
@@ -38,7 +38,7 @@ pin-utils = "0.1"
 
 menu = "0.3"
 
-caprand = { path = "../../../../caprand" }
+caprand = { git = "https://github.com/mkj/caprand" }
 
 critical-section = "1.1"
 rand = { version = "0.8", default-features = false, features = ["getrandom"] }
diff --git a/embassy/demos/std/Cargo.lock b/embassy/demos/std/Cargo.lock
index 1dca071..6f8387f 100644
--- a/embassy/demos/std/Cargo.lock
+++ b/embassy/demos/std/Cargo.lock
@@ -437,7 +437,7 @@ dependencies = [
 [[package]]
 name = "embassy-executor"
 version = "0.1.0"
-source = "git+https://github.com/embassy-rs/embassy?rev=e7fdd500d8354a03fcd105c8298cf7b4798a4107#e7fdd500d8354a03fcd105c8298cf7b4798a4107"
+source = "git+https://github.com/embassy-rs/embassy?rev=61be0e75c83961a42fc1d844159f1fed7d8afbea#61be0e75c83961a42fc1d844159f1fed7d8afbea"
 dependencies = [
  "atomic-polyfill 1.0.1",
  "cfg-if",
@@ -452,12 +452,12 @@ dependencies = [
 [[package]]
 name = "embassy-futures"
 version = "0.1.0"
-source = "git+https://github.com/embassy-rs/embassy?rev=e7fdd500d8354a03fcd105c8298cf7b4798a4107#e7fdd500d8354a03fcd105c8298cf7b4798a4107"
+source = "git+https://github.com/embassy-rs/embassy?rev=61be0e75c83961a42fc1d844159f1fed7d8afbea#61be0e75c83961a42fc1d844159f1fed7d8afbea"
 
 [[package]]
 name = "embassy-macros"
 version = "0.1.0"
-source = "git+https://github.com/embassy-rs/embassy?rev=e7fdd500d8354a03fcd105c8298cf7b4798a4107#e7fdd500d8354a03fcd105c8298cf7b4798a4107"
+source = "git+https://github.com/embassy-rs/embassy?rev=61be0e75c83961a42fc1d844159f1fed7d8afbea#61be0e75c83961a42fc1d844159f1fed7d8afbea"
 dependencies = [
  "darling",
  "proc-macro2",
@@ -468,12 +468,12 @@ dependencies = [
 [[package]]
 name = "embassy-net"
 version = "0.1.0"
-source = "git+https://github.com/embassy-rs/embassy?rev=e7fdd500d8354a03fcd105c8298cf7b4798a4107#e7fdd500d8354a03fcd105c8298cf7b4798a4107"
+source = "git+https://github.com/embassy-rs/embassy?rev=61be0e75c83961a42fc1d844159f1fed7d8afbea#61be0e75c83961a42fc1d844159f1fed7d8afbea"
 dependencies = [
  "as-slice 0.2.1",
  "atomic-polyfill 1.0.1",
  "atomic-pool",
- "embassy-sync 0.1.0 (git+https://github.com/embassy-rs/embassy?rev=e7fdd500d8354a03fcd105c8298cf7b4798a4107)",
+ "embassy-sync",
  "embassy-time",
  "futures",
  "generic-array 0.14.6",
@@ -487,19 +487,7 @@ dependencies = [
 [[package]]
 name = "embassy-sync"
 version = "0.1.0"
-dependencies = [
- "atomic-polyfill 1.0.1",
- "cfg-if",
- "critical-section 1.1.1",
- "embedded-io",
- "futures-util",
- "heapless",
-]
-
-[[package]]
-name = "embassy-sync"
-version = "0.1.0"
-source = "git+https://github.com/embassy-rs/embassy?rev=e7fdd500d8354a03fcd105c8298cf7b4798a4107#e7fdd500d8354a03fcd105c8298cf7b4798a4107"
+source = "git+https://github.com/embassy-rs/embassy?rev=61be0e75c83961a42fc1d844159f1fed7d8afbea#61be0e75c83961a42fc1d844159f1fed7d8afbea"
 dependencies = [
  "atomic-polyfill 1.0.1",
  "cfg-if",
@@ -512,12 +500,12 @@ dependencies = [
 [[package]]
 name = "embassy-time"
 version = "0.1.0"
-source = "git+https://github.com/embassy-rs/embassy?rev=e7fdd500d8354a03fcd105c8298cf7b4798a4107#e7fdd500d8354a03fcd105c8298cf7b4798a4107"
+source = "git+https://github.com/embassy-rs/embassy?rev=61be0e75c83961a42fc1d844159f1fed7d8afbea#61be0e75c83961a42fc1d844159f1fed7d8afbea"
 dependencies = [
  "atomic-polyfill 1.0.1",
  "cfg-if",
  "critical-section 1.1.1",
- "embassy-sync 0.1.0 (git+https://github.com/embassy-rs/embassy?rev=e7fdd500d8354a03fcd105c8298cf7b4798a4107)",
+ "embassy-sync",
  "embedded-hal 0.2.7",
  "futures-util",
  "heapless",
@@ -1273,7 +1261,7 @@ dependencies = [
  "embassy-executor",
  "embassy-futures",
  "embassy-net",
- "embassy-sync 0.1.0",
+ "embassy-sync",
  "embassy-time",
  "embedded-hal 1.0.0-alpha.9",
  "embedded-hal-async",
@@ -1297,7 +1285,7 @@ version = "0.2.0-alpha"
 dependencies = [
  "embassy-futures",
  "embassy-net",
- "embassy-sync 0.1.0",
+ "embassy-sync",
  "log",
  "pin-utils",
  "sunset",
-- 
GitLab