diff options
| author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2021-11-02 18:10:01 +0000 |
|---|---|---|
| committer | GitHub <[email protected]> | 2021-11-02 18:10:01 +0000 |
| commit | 11b0a89b6a46a0d50a8b16d0607a672f9399e01a (patch) | |
| tree | 3ccdbb8192f55a09750163fb2a3c9697303bdf59 | |
| parent | 3dcf899babff5b735b1f1a5a99a9005ce06f517f (diff) | |
| parent | 205a223af32bb33507efa729b66143027be47eb6 (diff) | |
Merge #466
466: Update versions of critical-section and atomic-polyfill r=lulf a=lulf
Co-authored-by: Ulf Lilleengen <[email protected]>
| -rw-r--r-- | embassy-nrf/Cargo.toml | 2 | ||||
| -rw-r--r-- | embassy-rp/Cargo.toml | 4 | ||||
| -rw-r--r-- | embassy-stm32/Cargo.toml | 4 | ||||
| -rw-r--r-- | embassy/Cargo.toml | 4 | ||||
| -rw-r--r-- | examples/rp/Cargo.toml | 2 | ||||
| -rw-r--r-- | examples/stm32h7/Cargo.toml | 2 | ||||
| -rw-r--r-- | examples/wasm/Cargo.toml | 2 |
7 files changed, 10 insertions, 10 deletions
diff --git a/embassy-nrf/Cargo.toml b/embassy-nrf/Cargo.toml index 479e2f912..17c3e29d5 100644 --- a/embassy-nrf/Cargo.toml +++ b/embassy-nrf/Cargo.toml | |||
| @@ -51,7 +51,7 @@ cortex-m = "0.7.3" | |||
| 51 | embedded-hal = "0.2.6" | 51 | embedded-hal = "0.2.6" |
| 52 | embedded-dma = "0.1.2" | 52 | embedded-dma = "0.1.2" |
| 53 | futures = { version = "0.3.17", default-features = false } | 53 | futures = { version = "0.3.17", default-features = false } |
| 54 | critical-section = "0.2.3" | 54 | critical-section = "0.2.5" |
| 55 | rand_core = "0.6.3" | 55 | rand_core = "0.6.3" |
| 56 | fixed = "1.10.0" | 56 | fixed = "1.10.0" |
| 57 | embedded-storage = "0.2.0" | 57 | embedded-storage = "0.2.0" |
diff --git a/embassy-rp/Cargo.toml b/embassy-rp/Cargo.toml index d98ff2d51..21a19a632 100644 --- a/embassy-rp/Cargo.toml +++ b/embassy-rp/Cargo.toml | |||
| @@ -22,12 +22,12 @@ defmt-error = [ ] | |||
| 22 | embassy = { version = "0.1.0", path = "../embassy", features = [ "time-tick-1mhz" ] } | 22 | embassy = { version = "0.1.0", path = "../embassy", features = [ "time-tick-1mhz" ] } |
| 23 | embassy-hal-common = {version = "0.1.0", path = "../embassy-hal-common" } | 23 | embassy-hal-common = {version = "0.1.0", path = "../embassy-hal-common" } |
| 24 | embassy-macros = { version = "0.1.0", path = "../embassy-macros", features = ["rp"]} | 24 | embassy-macros = { version = "0.1.0", path = "../embassy-macros", features = ["rp"]} |
| 25 | atomic-polyfill = "0.1.3" | 25 | atomic-polyfill = "0.1.5" |
| 26 | defmt = { version = "0.2.3", optional = true } | 26 | defmt = { version = "0.2.3", optional = true } |
| 27 | log = { version = "0.4.14", optional = true } | 27 | log = { version = "0.4.14", optional = true } |
| 28 | cortex-m-rt = ">=0.6.15,<0.8" | 28 | cortex-m-rt = ">=0.6.15,<0.8" |
| 29 | cortex-m = "0.7.3" | 29 | cortex-m = "0.7.3" |
| 30 | critical-section = "0.2.3" | 30 | critical-section = "0.2.5" |
| 31 | 31 | ||
| 32 | rp2040-pac2 = { git = "https://github.com/embassy-rs/rp2040-pac2", rev="9ad7223a48a065e612bc7dc7be5bf5bd0b41cfc4", features = ["rt"] } | 32 | rp2040-pac2 = { git = "https://github.com/embassy-rs/rp2040-pac2", rev="9ad7223a48a065e612bc7dc7be5bf5bd0b41cfc4", features = ["rt"] } |
| 33 | #rp2040-pac2 = { path = "../../rp/rp2040-pac2", features = ["rt"] } | 33 | #rp2040-pac2 = { path = "../../rp/rp2040-pac2", features = ["rt"] } |
diff --git a/embassy-stm32/Cargo.toml b/embassy-stm32/Cargo.toml index ecad19751..dafb8ef77 100644 --- a/embassy-stm32/Cargo.toml +++ b/embassy-stm32/Cargo.toml | |||
| @@ -21,9 +21,9 @@ futures = { version = "0.3.17", default-features = false, features = ["async-awa | |||
| 21 | rand_core = "0.6.3" | 21 | rand_core = "0.6.3" |
| 22 | sdio-host = "0.5.0" | 22 | sdio-host = "0.5.0" |
| 23 | embedded-sdmmc = { git = "https://github.com/thalesfragoso/embedded-sdmmc-rs", branch = "async", optional = true } | 23 | embedded-sdmmc = { git = "https://github.com/thalesfragoso/embedded-sdmmc-rs", branch = "async", optional = true } |
| 24 | critical-section = "0.2.3" | 24 | critical-section = "0.2.5" |
| 25 | bare-metal = "1.0.0" | 25 | bare-metal = "1.0.0" |
| 26 | atomic-polyfill = "0.1.3" | 26 | atomic-polyfill = "0.1.5" |
| 27 | stm32-metapac = { version = "0.1.0", path = "../stm32-metapac", features = ["rt"] } | 27 | stm32-metapac = { version = "0.1.0", path = "../stm32-metapac", features = ["rt"] } |
| 28 | vcell = { version = "0.1.3", optional = true } | 28 | vcell = { version = "0.1.3", optional = true } |
| 29 | bxcan = "0.5.1" | 29 | bxcan = "0.5.1" |
diff --git a/embassy/Cargo.toml b/embassy/Cargo.toml index 30eb07716..d531ce3f9 100644 --- a/embassy/Cargo.toml +++ b/embassy/Cargo.toml | |||
| @@ -40,8 +40,8 @@ futures = { version = "0.3.17", default-features = false, features = [ "cfg- | |||
| 40 | pin-project = { version = "1.0.8", default-features = false } | 40 | pin-project = { version = "1.0.8", default-features = false } |
| 41 | embassy-macros = { version = "0.1.0", path = "../embassy-macros"} | 41 | embassy-macros = { version = "0.1.0", path = "../embassy-macros"} |
| 42 | embassy-traits = { version = "0.1.0", path = "../embassy-traits"} | 42 | embassy-traits = { version = "0.1.0", path = "../embassy-traits"} |
| 43 | atomic-polyfill = "0.1.3" | 43 | atomic-polyfill = "0.1.5" |
| 44 | critical-section = "0.2.3" | 44 | critical-section = "0.2.5" |
| 45 | embedded-hal = "0.2.6" | 45 | embedded-hal = "0.2.6" |
| 46 | heapless = "0.7.5" | 46 | heapless = "0.7.5" |
| 47 | 47 | ||
diff --git a/examples/rp/Cargo.toml b/examples/rp/Cargo.toml index d168c39fa..9caa37179 100644 --- a/examples/rp/Cargo.toml +++ b/examples/rp/Cargo.toml | |||
| @@ -19,7 +19,7 @@ defmt-error = [] | |||
| 19 | [dependencies] | 19 | [dependencies] |
| 20 | embassy = { version = "0.1.0", path = "../../embassy", features = ["defmt", "defmt-trace"] } | 20 | embassy = { version = "0.1.0", path = "../../embassy", features = ["defmt", "defmt-trace"] } |
| 21 | embassy-rp = { version = "0.1.0", path = "../../embassy-rp", features = ["defmt", "defmt-trace"] } | 21 | embassy-rp = { version = "0.1.0", path = "../../embassy-rp", features = ["defmt", "defmt-trace"] } |
| 22 | atomic-polyfill = "0.1.3" | 22 | atomic-polyfill = "0.1.5" |
| 23 | 23 | ||
| 24 | defmt = "0.2.3" | 24 | defmt = "0.2.3" |
| 25 | defmt-rtt = "0.2.0" | 25 | defmt-rtt = "0.2.0" |
diff --git a/examples/stm32h7/Cargo.toml b/examples/stm32h7/Cargo.toml index 747d9a120..eed4882c9 100644 --- a/examples/stm32h7/Cargo.toml +++ b/examples/stm32h7/Cargo.toml | |||
| @@ -35,7 +35,7 @@ futures = { version = "0.3.17", default-features = false, features = ["async-awa | |||
| 35 | rtt-target = { version = "0.3.1", features = ["cortex-m"] } | 35 | rtt-target = { version = "0.3.1", features = ["cortex-m"] } |
| 36 | heapless = { version = "0.7.5", default-features = false } | 36 | heapless = { version = "0.7.5", default-features = false } |
| 37 | rand_core = "0.6.3" | 37 | rand_core = "0.6.3" |
| 38 | critical-section = "0.2.3" | 38 | critical-section = "0.2.5" |
| 39 | 39 | ||
| 40 | micromath = "2.0.0" | 40 | micromath = "2.0.0" |
| 41 | 41 | ||
diff --git a/examples/wasm/Cargo.toml b/examples/wasm/Cargo.toml index d8417852b..c6218a805 100644 --- a/examples/wasm/Cargo.toml +++ b/examples/wasm/Cargo.toml | |||
| @@ -14,4 +14,4 @@ wasm-logger = "0.2.0" | |||
| 14 | wasm-bindgen = "0.2" | 14 | wasm-bindgen = "0.2" |
| 15 | web-sys = { version = "0.3", features = ["Document", "Element", "HtmlElement", "Node", "Window" ] } | 15 | web-sys = { version = "0.3", features = ["Document", "Element", "HtmlElement", "Node", "Window" ] } |
| 16 | log = "0.4.11" | 16 | log = "0.4.11" |
| 17 | critical-section = "0.2.3" | 17 | critical-section = "0.2.5" |
