43 files changed, 51 insertions, 72 deletions

diff --git a/embassy-boot/boot/Cargo.toml b/embassy-boot/boot/Cargo.toml
index 0a3006ffc..7ceb5885b 100644
--- a/embassy-boot/boot/Cargo.toml
+++ b/embassy-boot/boot/Cargo.toml
@@ -2,7 +2,7 @@
 authors = [
     "Ulf Lilleengen <[email protected]>",
 ]
-edition = "2018"
+edition = "2021"
 name = "embassy-boot"
 version = "0.1.0"
 description = "Bootloader using Embassy"
diff --git a/embassy-boot/nrf/Cargo.toml b/embassy-boot/nrf/Cargo.toml
index 97207ac29..f3cfa1144 100644
--- a/embassy-boot/nrf/Cargo.toml
+++ b/embassy-boot/nrf/Cargo.toml
@@ -2,7 +2,7 @@
 authors = [
     "Ulf Lilleengen <[email protected]>",
 ]
-edition = "2018"
+edition = "2021"
 name = "embassy-boot-nrf"
 version = "0.1.0"
 description = "Bootloader for nRF chips"
diff --git a/embassy-cortex-m/Cargo.toml b/embassy-cortex-m/Cargo.toml
index 8bd30403e..b1a2b2037 100644
--- a/embassy-cortex-m/Cargo.toml
+++ b/embassy-cortex-m/Cargo.toml
@@ -2,8 +2,7 @@
 name = "embassy-cortex-m"
 version = "0.1.0"
 authors = ["Dario Nieuwenhuis <[email protected]>"]
-edition = "2018"
-resolver = "2"
+edition = "2021"
 
 [package.metadata.embassy_docs]
 src_base = "https://github.com/embassy-rs/embassy/blob/embassy-cortex-m-v$VERSION/embassy-cortex-m/src/"
diff --git a/embassy-embedded-hal/Cargo.toml b/embassy-embedded-hal/Cargo.toml
index 14b73dce5..44e0bdbf3 100644
--- a/embassy-embedded-hal/Cargo.toml
+++ b/embassy-embedded-hal/Cargo.toml
@@ -2,7 +2,7 @@
 name = "embassy-embedded-hal"
 version = "0.1.0"
 authors = ["Dario Nieuwenhuis <[email protected]>"]
-edition = "2018"
+edition = "2021"
 
 [features]
 std = []
diff --git a/embassy-hal-common/Cargo.toml b/embassy-hal-common/Cargo.toml
index fee6da6ff..abce22291 100644
--- a/embassy-hal-common/Cargo.toml
+++ b/embassy-hal-common/Cargo.toml
@@ -2,7 +2,7 @@
 name = "embassy-hal-common"
 version = "0.1.0"
 authors = ["Dario Nieuwenhuis <[email protected]>"]
-edition = "2018"
+edition = "2021"
 
 [features]
 
diff --git a/embassy-lora/Cargo.toml b/embassy-lora/Cargo.toml
index 3a2bd624a..18b90ca14 100644
--- a/embassy-lora/Cargo.toml
+++ b/embassy-lora/Cargo.toml
@@ -2,7 +2,7 @@
 name = "embassy-lora"
 version = "0.1.0"
 authors = ["Ulf Lilleengen <[email protected]>"]
-edition = "2018"
+edition = "2021"
 
 [package.metadata.embassy_docs]
 src_base = "https://github.com/embassy-rs/embassy/blob/embassy-lora-v$VERSION/embassy-lora/src/"
diff --git a/embassy-macros/Cargo.toml b/embassy-macros/Cargo.toml
index 955121230..eff4b005b 100644
--- a/embassy-macros/Cargo.toml
+++ b/embassy-macros/Cargo.toml
@@ -2,7 +2,7 @@
 name = "embassy-macros"
 version = "0.1.0"
 authors = ["Dario Nieuwenhuis <[email protected]>"]
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 syn = { version = "1.0.76", features = ["full", "extra-traits"] }
diff --git a/embassy-net/Cargo.toml b/embassy-net/Cargo.toml
index 87982a726..027bbae31 100644
--- a/embassy-net/Cargo.toml
+++ b/embassy-net/Cargo.toml
@@ -2,7 +2,7 @@
 name = "embassy-net"
 version = "0.1.0"
 authors = ["Dario Nieuwenhuis <[email protected]>"]
-edition = "2018"
+edition = "2021"
 
 
 [package.metadata.embassy_docs]
diff --git a/embassy-nrf/Cargo.toml b/embassy-nrf/Cargo.toml
index f1e6815a5..c725199c3 100644
--- a/embassy-nrf/Cargo.toml
+++ b/embassy-nrf/Cargo.toml
@@ -2,7 +2,7 @@
 name = "embassy-nrf"
 version = "0.1.0"
 authors = ["Dario Nieuwenhuis <[email protected]>"]
-edition = "2018"
+edition = "2021"
 
 [package.metadata.embassy_docs]
 src_base = "https://github.com/embassy-rs/embassy/blob/embassy-nrf-v$VERSION/embassy-nrf/src/"
diff --git a/embassy-rp/Cargo.toml b/embassy-rp/Cargo.toml
index 4896647fb..2be8b3d14 100644
--- a/embassy-rp/Cargo.toml
+++ b/embassy-rp/Cargo.toml
@@ -2,7 +2,7 @@
 name = "embassy-rp"
 version = "0.1.0"
 authors = ["Dario Nieuwenhuis <[email protected]>"]
-edition = "2018"
+edition = "2021"
 
 [package.metadata.embassy_docs]
 src_base = "https://github.com/embassy-rs/embassy/blob/embassy-rp-v$VERSION/embassy-rp/src/"
diff --git a/embassy-stm32/Cargo.toml b/embassy-stm32/Cargo.toml
index 4f83e4cd5..6bb9a0ed5 100644
--- a/embassy-stm32/Cargo.toml
+++ b/embassy-stm32/Cargo.toml
@@ -2,8 +2,7 @@
 name = "embassy-stm32"
 version = "0.1.0"
 authors = ["Dario Nieuwenhuis <[email protected]>"]
-edition = "2018"
-resolver = "2"
+edition = "2021"
 
 [package.metadata.embassy_docs]
 src_base = "https://github.com/embassy-rs/embassy/blob/embassy-stm32-v$VERSION/embassy-stm32/src/"
@@ -63,7 +62,7 @@ vcell = "0.1.3"
 bxcan = "0.6.2"
 nb = "1.0.0"
 stm32-fmc = "0.2.4"
-seq-macro = "0.2.2"
+seq-macro = "0.3.0"
 cfg-if = "1.0.0"
 embedded-io = { version = "0.3.0", features = ["async"], optional = true }
 
diff --git a/embassy-stm32/src/rcc/l4.rs b/embassy-stm32/src/rcc/l4.rs
index 1905039b9..71a938550 100644
--- a/embassy-stm32/src/rcc/l4.rs
+++ b/embassy-stm32/src/rcc/l4.rs
@@ -102,7 +102,7 @@ seq_macro::seq!(N in 8..=86 {
     #[derive(Clone, Copy)]
     pub enum PLLMul {
         #(
-            Mul#N,
+            Mul~N,
         )*
     }
 
@@ -110,7 +110,7 @@ seq_macro::seq!(N in 8..=86 {
         fn from(val: PLLMul) -> u8 {
             match val {
                 #(
-                    PLLMul::Mul#N => N,
+                    PLLMul::Mul~N => N,
                 )*
             }
         }
@@ -120,7 +120,7 @@ seq_macro::seq!(N in 8..=86 {
         pub fn to_mul(self) -> u32 {
             match self {
                 #(
-                    PLLMul::Mul#N => N,
+                    PLLMul::Mul~N => N,
                 )*
             }
         }
diff --git a/embassy-stm32/src/rcc/l5.rs b/embassy-stm32/src/rcc/l5.rs
index 48d12a890..60e1dadea 100644
--- a/embassy-stm32/src/rcc/l5.rs
+++ b/embassy-stm32/src/rcc/l5.rs
@@ -104,7 +104,7 @@ seq_macro::seq!(N in 8..=86 {
     #[derive(Clone, Copy)]
     pub enum PLLMul {
         #(
-            Mul#N,
+            Mul~N,
         )*
     }
 
@@ -112,7 +112,7 @@ seq_macro::seq!(N in 8..=86 {
         fn from(val: PLLMul) -> u8 {
             match val {
                 #(
-                    PLLMul::Mul#N => N,
+                    PLLMul::Mul~N => N,
                 )*
             }
         }
@@ -122,7 +122,7 @@ seq_macro::seq!(N in 8..=86 {
         pub fn to_mul(self) -> u32 {
             match self {
                 #(
-                    PLLMul::Mul#N => N,
+                    PLLMul::Mul~N => N,
                 )*
             }
         }
diff --git a/embassy-stm32/src/rcc/u5.rs b/embassy-stm32/src/rcc/u5.rs
index 74d3a11eb..f09e467c6 100644
--- a/embassy-stm32/src/rcc/u5.rs
+++ b/embassy-stm32/src/rcc/u5.rs
@@ -51,7 +51,7 @@ seq_macro::seq!(N in 2..=128 {
     pub enum PllClkDiv {
         NotDivided,
         #(
-            Div#N = (N-1),
+            Div~N = (N-1),
         )*
     }
 
@@ -60,7 +60,7 @@ seq_macro::seq!(N in 2..=128 {
             match self {
                 PllClkDiv::NotDivided => 1,
                 #(
-                    PllClkDiv::Div#N => (N + 1),
+                    PllClkDiv::Div~N => (N + 1),
                 )*
             }
         }
@@ -78,7 +78,7 @@ seq_macro::seq!(N in 4..=512 {
     pub enum PllN {
         NotMultiplied,
         #(
-            Mul#N = (N-1),
+            Mul~N = (N-1),
         )*
     }
 
@@ -87,7 +87,7 @@ seq_macro::seq!(N in 4..=512 {
             match self {
                 PllN::NotMultiplied => 1,
                 #(
-                    PllN::Mul#N => (N + 1),
+                    PllN::Mul~N => (N + 1),
                 )*
             }
         }
diff --git a/embassy/Cargo.toml b/embassy/Cargo.toml
index 2c34047fc..819de23ad 100644
--- a/embassy/Cargo.toml
+++ b/embassy/Cargo.toml
@@ -2,8 +2,7 @@
 name = "embassy"
 version = "0.1.0"
 authors = ["Dario Nieuwenhuis <[email protected]>"]
-edition = "2018"
-resolver = "2"
+edition = "2021"
 
 [package.metadata.embassy_docs]
 src_base = "https://github.com/embassy-rs/embassy/blob/embassy-v$VERSION/embassy/src/"
diff --git a/examples/boot/nrf/Cargo.toml b/examples/boot/nrf/Cargo.toml
index 42bc35430..f1d44bad8 100644
--- a/examples/boot/nrf/Cargo.toml
+++ b/examples/boot/nrf/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 authors = ["Ulf Lilleengen <[email protected]>"]
-edition = "2018"
+edition = "2021"
 name = "embassy-boot-nrf-examples"
 version = "0.1.0"
 
diff --git a/examples/boot/stm32l0/Cargo.toml b/examples/boot/stm32l0/Cargo.toml
index b6fe9ee65..bbfe692a7 100644
--- a/examples/boot/stm32l0/Cargo.toml
+++ b/examples/boot/stm32l0/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 authors = ["Ulf Lilleengen <[email protected]>"]
-edition = "2018"
+edition = "2021"
 name = "embassy-boot-stm32l0-examples"
 version = "0.1.0"
 
diff --git a/examples/boot/stm32l1/Cargo.toml b/examples/boot/stm32l1/Cargo.toml
index d3c66323e..56cfb6f02 100644
--- a/examples/boot/stm32l1/Cargo.toml
+++ b/examples/boot/stm32l1/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 authors = ["Ulf Lilleengen <[email protected]>"]
-edition = "2018"
+edition = "2021"
 name = "embassy-boot-stm32l1-examples"
 version = "0.1.0"
 
diff --git a/examples/boot/stm32l4/Cargo.toml b/examples/boot/stm32l4/Cargo.toml
index 234ea9b5c..ddb6b151a 100644
--- a/examples/boot/stm32l4/Cargo.toml
+++ b/examples/boot/stm32l4/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 authors = ["Ulf Lilleengen <[email protected]>"]
-edition = "2018"
+edition = "2021"
 name = "embassy-boot-stm32l4-examples"
 version = "0.1.0"
 
diff --git a/examples/boot/stm32wl/Cargo.toml b/examples/boot/stm32wl/Cargo.toml
index b6062b6a6..08136c8e1 100644
--- a/examples/boot/stm32wl/Cargo.toml
+++ b/examples/boot/stm32wl/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 authors = ["Ulf Lilleengen <[email protected]>"]
-edition = "2018"
+edition = "2021"
 name = "embassy-boot-stm32wl-examples"
 version = "0.1.0"
 
diff --git a/examples/std/Cargo.toml b/examples/std/Cargo.toml
index 7e1c2e4bb..06f0f357e 100644
--- a/examples/std/Cargo.toml
+++ b/examples/std/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 authors = ["Dario Nieuwenhuis <[email protected]>"]
-edition = "2018"
+edition = "2021"
 name = "embassy-std-examples"
 version = "0.1.0"
 
diff --git a/examples/stm32f0/Cargo.toml b/examples/stm32f0/Cargo.toml
index 53358db9a..8e0dad865 100644
--- a/examples/stm32f0/Cargo.toml
+++ b/examples/stm32f0/Cargo.toml
@@ -2,8 +2,7 @@
 name = "embassy-stm32f0-examples"
 version = "0.1.0"
 authors = ["Thales Fragoso <[email protected]>"]
-edition = "2018"
-resolver = "2"
+edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
diff --git a/examples/stm32f1/Cargo.toml b/examples/stm32f1/Cargo.toml
index 8de736d6b..503114bfb 100644
--- a/examples/stm32f1/Cargo.toml
+++ b/examples/stm32f1/Cargo.toml
@@ -1,9 +1,8 @@
 [package]
 authors = ["Dario Nieuwenhuis <[email protected]>"]
-edition = "2018"
+edition = "2021"
 name = "embassy-stm32f1-examples"
 version = "0.1.0"
-resolver = "2"
 
 [dependencies]
 embassy = { version = "0.1.0", path = "../../embassy", features = ["defmt", "defmt-timestamp-uptime", "time-tick-32768hz"] }
diff --git a/examples/stm32f2/Cargo.toml b/examples/stm32f2/Cargo.toml
index 8310aa3a1..12bcb7200 100644
--- a/examples/stm32f2/Cargo.toml
+++ b/examples/stm32f2/Cargo.toml
@@ -1,9 +1,8 @@
 [package]
 authors = ["Dario Nieuwenhuis <[email protected]>"]
-edition = "2018"
+edition = "2021"
 name = "embassy-stm32f2-examples"
 version = "0.1.0"
-resolver = "2"
 
 [dependencies]
 embassy = { version = "0.1.0", path = "../../embassy", features = ["defmt", "defmt-timestamp-uptime", "time-tick-32768hz"] }
diff --git a/examples/stm32f3/Cargo.toml b/examples/stm32f3/Cargo.toml
index 15128ecc9..f30a5e969 100644
--- a/examples/stm32f3/Cargo.toml
+++ b/examples/stm32f3/Cargo.toml
@@ -1,9 +1,8 @@
 [package]
 authors = ["Dario Nieuwenhuis <[email protected]>"]
-edition = "2018"
+edition = "2021"
 name = "embassy-stm32f3-examples"
 version = "0.1.0"
-resolver = "2"
 
 [dependencies]
 embassy = { version = "0.1.0", path = "../../embassy", features = ["defmt", "defmt-timestamp-uptime", "time-tick-32768hz"] }
diff --git a/examples/stm32f4/Cargo.toml b/examples/stm32f4/Cargo.toml
index 7260ba0d2..f755c1d8c 100644
--- a/examples/stm32f4/Cargo.toml
+++ b/examples/stm32f4/Cargo.toml
@@ -1,9 +1,8 @@
 [package]
 authors = ["Dario Nieuwenhuis <[email protected]>"]
-edition = "2018"
+edition = "2021"
 name = "embassy-stm32f4-examples"
 version = "0.1.0"
-resolver = "2"
 
 
 [dependencies]
diff --git a/examples/stm32f7/Cargo.toml b/examples/stm32f7/Cargo.toml
index 54d6ed3e3..a51f2e6f4 100644
--- a/examples/stm32f7/Cargo.toml
+++ b/examples/stm32f7/Cargo.toml
@@ -1,9 +1,8 @@
 [package]
 authors = ["Dario Nieuwenhuis <[email protected]>"]
-edition = "2018"
+edition = "2021"
 name = "embassy-stm32f7-examples"
 version = "0.1.0"
-resolver = "2"
 
 [dependencies]
 embassy = { version = "0.1.0", path = "../../embassy", features = ["defmt", "defmt-timestamp-uptime", "time-tick-32768hz"] }
diff --git a/examples/stm32g0/Cargo.toml b/examples/stm32g0/Cargo.toml
index 4b17aa286..1a7f3adcb 100644
--- a/examples/stm32g0/Cargo.toml
+++ b/examples/stm32g0/Cargo.toml
@@ -1,9 +1,8 @@
 [package]
 authors = ["Dario Nieuwenhuis <[email protected]>", "Ben Gamari <[email protected]>"]
-edition = "2018"
+edition = "2021"
 name = "embassy-stm32g0-examples"
 version = "0.1.0"
-resolver = "2"
 
 [dependencies]
 embassy = { version = "0.1.0", path = "../../embassy", features = ["defmt", "defmt-timestamp-uptime", "time-tick-32768hz"] }
diff --git a/examples/stm32g4/Cargo.toml b/examples/stm32g4/Cargo.toml
index 0f86c6a38..274825491 100644
--- a/examples/stm32g4/Cargo.toml
+++ b/examples/stm32g4/Cargo.toml
@@ -1,9 +1,8 @@
 [package]
 authors = ["Dario Nieuwenhuis <[email protected]>", "Ben Gamari <[email protected]>"]
-edition = "2018"
+edition = "2021"
 name = "embassy-stm32g4-examples"
 version = "0.1.0"
-resolver = "2"
 
 [dependencies]
 embassy = { version = "0.1.0", path = "../../embassy", features = ["defmt", "defmt-timestamp-uptime", "time-tick-32768hz"] }
diff --git a/examples/stm32h7/Cargo.toml b/examples/stm32h7/Cargo.toml
index 8026e11bf..64cc77e71 100644
--- a/examples/stm32h7/Cargo.toml
+++ b/examples/stm32h7/Cargo.toml
@@ -1,9 +1,8 @@
 [package]
 authors = ["Dario Nieuwenhuis <[email protected]>"]
-edition = "2018"
+edition = "2021"
 name = "embassy-stm32h7-examples"
 version = "0.1.0"
-resolver = "2"
 
 [dependencies]
 embassy = { version = "0.1.0", path = "../../embassy", features = ["defmt", "defmt-timestamp-uptime", "unstable-traits", "time-tick-32768hz"] }
diff --git a/examples/stm32l0/Cargo.toml b/examples/stm32l0/Cargo.toml
index e8e4fbe52..2c1a475b4 100644
--- a/examples/stm32l0/Cargo.toml
+++ b/examples/stm32l0/Cargo.toml
@@ -1,9 +1,8 @@
 [package]
 authors = ["Dario Nieuwenhuis <[email protected]>", "Ulf Lilleengen <[email protected]>"]
-edition = "2018"
+edition = "2021"
 name = "embassy-stm32l0-examples"
 version = "0.1.0"
-resolver = "2"
 
 [features]
 default = ["nightly"]
diff --git a/examples/stm32l1/Cargo.toml b/examples/stm32l1/Cargo.toml
index 80e6f3906..63516b920 100644
--- a/examples/stm32l1/Cargo.toml
+++ b/examples/stm32l1/Cargo.toml
@@ -1,9 +1,8 @@
 [package]
 authors = ["Dario Nieuwenhuis <[email protected]>", "Ulf Lilleengen <[email protected]>"]
-edition = "2018"
+edition = "2021"
 name = "embassy-stm32l1-examples"
 version = "0.1.0"
-resolver = "2"
 
 [dependencies]
 embassy = { version = "0.1.0", path = "../../embassy", features = ["defmt", "defmt-timestamp-uptime", "time-tick-32768hz"] }
diff --git a/examples/stm32l4/Cargo.toml b/examples/stm32l4/Cargo.toml
index fdf0db9c0..950ba7e4d 100644
--- a/examples/stm32l4/Cargo.toml
+++ b/examples/stm32l4/Cargo.toml
@@ -1,9 +1,8 @@
 [package]
 authors = ["Dario Nieuwenhuis <[email protected]>"]
-edition = "2018"
+edition = "2021"
 name = "embassy-stm32l4-examples"
 version = "0.1.0"
-resolver = "2"
 
 [features]
 
diff --git a/examples/stm32l5/Cargo.toml b/examples/stm32l5/Cargo.toml
index 7f60e26da..b6d3848d8 100644
--- a/examples/stm32l5/Cargo.toml
+++ b/examples/stm32l5/Cargo.toml
@@ -1,9 +1,8 @@
 [package]
 authors = ["Dario Nieuwenhuis <[email protected]>"]
-edition = "2018"
+edition = "2021"
 name = "embassy-stm32l5-examples"
 version = "0.1.0"
-resolver = "2"
 
 [features]
 
diff --git a/examples/stm32u5/Cargo.toml b/examples/stm32u5/Cargo.toml
index 1e3119806..1d752fd3f 100644
--- a/examples/stm32u5/Cargo.toml
+++ b/examples/stm32u5/Cargo.toml
@@ -1,9 +1,8 @@
 [package]
 authors = ["Dario Nieuwenhuis <[email protected]>"]
-edition = "2018"
+edition = "2021"
 name = "embassy-stm32u5-examples"
 version = "0.1.0"
-resolver = "2"
 
 [dependencies]
 embassy = { version = "0.1.0", path = "../../embassy", features = ["defmt", "defmt-timestamp-uptime", "time-tick-32768hz"] }
diff --git a/examples/stm32wb/Cargo.toml b/examples/stm32wb/Cargo.toml
index 1e23182f8..3e096a64d 100644
--- a/examples/stm32wb/Cargo.toml
+++ b/examples/stm32wb/Cargo.toml
@@ -1,9 +1,8 @@
 [package]
 authors = ["Dario Nieuwenhuis <[email protected]>"]
-edition = "2018"
+edition = "2021"
 name = "embassy-stm32wb-examples"
 version = "0.1.0"
-resolver = "2"
 
 [dependencies]
 embassy = { version = "0.1.0", path = "../../embassy", features = ["defmt", "defmt-timestamp-uptime", "time-tick-32768hz"] }
diff --git a/examples/stm32wl/Cargo.toml b/examples/stm32wl/Cargo.toml
index b635cb178..68f5f137d 100644
--- a/examples/stm32wl/Cargo.toml
+++ b/examples/stm32wl/Cargo.toml
@@ -1,9 +1,8 @@
 [package]
 authors = ["Dario Nieuwenhuis <[email protected]>", "Ulf Lilleengen <[email protected]>"]
-edition = "2018"
+edition = "2021"
 name = "embassy-stm32wl-examples"
 version = "0.1.0"
-resolver = "2"
 
 [dependencies]
 embassy = { version = "0.1.0", path = "../../embassy", features = ["defmt", "defmt-timestamp-uptime", "time-tick-32768hz"] }
diff --git a/examples/wasm/Cargo.toml b/examples/wasm/Cargo.toml
index 6750f6a6c..7d19c9fe9 100644
--- a/examples/wasm/Cargo.toml
+++ b/examples/wasm/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 authors = ["Ulf Lilleengen <[email protected]>"]
-edition = "2018"
+edition = "2021"
 name = "embassy-wasm-example"
 version = "0.1.0"
 
diff --git a/stm32-gen-features/Cargo.toml b/stm32-gen-features/Cargo.toml
index fea636511..7146a9e9c 100644
--- a/stm32-gen-features/Cargo.toml
+++ b/stm32-gen-features/Cargo.toml
@@ -2,7 +2,7 @@
 name = "gen_features"
 version = "0.1.0"
 authors = ["Côme ALLART <[email protected]>"]
-edition = "2018"
+edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
diff --git a/stm32-metapac-gen/Cargo.toml b/stm32-metapac-gen/Cargo.toml
index 5cf142083..0ec2075f3 100644
--- a/stm32-metapac-gen/Cargo.toml
+++ b/stm32-metapac-gen/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "stm32-metapac-gen"
 version = "0.1.0"
-edition = "2018"
+edition = "2021"
 
 
 [dependencies]
diff --git a/stm32-metapac/Cargo.toml b/stm32-metapac/Cargo.toml
index 98249ec6a..d74484774 100644
--- a/stm32-metapac/Cargo.toml
+++ b/stm32-metapac/Cargo.toml
@@ -1,8 +1,7 @@
 [package]
 name = "stm32-metapac"
 version = "0.1.0"
-edition = "2018"
-resolver = "2"
+edition = "2021"
 license = "MIT OR Apache-2.0"
 repository = "https://github.com/embassy-rs/embassy"
 description = "Peripheral Access Crate (PAC) for all STM32 chips, including metadata."
diff --git a/tests/stm32/Cargo.toml b/tests/stm32/Cargo.toml
index ad6403ab3..e96c86487 100644
--- a/tests/stm32/Cargo.toml
+++ b/tests/stm32/Cargo.toml
@@ -1,9 +1,8 @@
 [package]
 authors = ["Dario Nieuwenhuis <[email protected]>"]
-edition = "2018"
+edition = "2021"
 name = "embassy-stm32-tests"
 version = "0.1.0"
-resolver = "2"
 
 [features]
 stm32f103c8 = ["embassy-stm32/stm32f103c8"]     # Blue Pill
diff --git a/xtask/Cargo.toml b/xtask/Cargo.toml
index 1f9eabdf5..249cc6aad 100644
--- a/xtask/Cargo.toml
+++ b/xtask/Cargo.toml
@@ -3,7 +3,7 @@ authors = [
     "Ulf Lilleengen <[email protected]>",
     "Bob McWhirter <[email protected]>"
 ]
-edition = "2018"
+edition = "2021"
 name = "xtask"
 version = "0.1.0"