diff --git a/Cargo.toml b/Cargo.toml
index ed6efbaadd..f67af6ff9e 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -7,7 +7,7 @@ authors = [
 categories = ["concurrency", "embedded", "no-std"]
 description = "Real-Time Interrupt-driven Concurrency (RTIC): a concurrency framework for building real-time systems"
 documentation = "https://rtic.rs/"
-edition = "2018"
+edition = "2021"
 keywords = ["arm", "cortex-m"]
 license = "MIT OR Apache-2.0"
 name = "cortex-m-rtic"
diff --git a/src/lib.rs b/src/lib.rs
index 5fe35a95e2..500993e5ec 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -30,6 +30,7 @@
 //! [SemVer]: https://semver.org/spec/v2.0.0.html
 
 #![deny(missing_docs)]
+#![deny(rust_2021_compatibility)]
 #![deny(rust_2018_compatibility)]
 #![deny(rust_2018_idioms)]
 #![no_std]