diff --git a/Cargo.toml b/Cargo.toml
index f7aa852c..05f8b490 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -8,7 +8,7 @@ name = "criterion"
 #
 # * Update version numbers in the book;
 version = "0.5.1"
-edition = "2018"
+edition = "2021"
 
 description = "Statistics-driven micro-benchmarking library"
 homepage    = "https://bheisler.github.io/criterion.rs/book/index.html"
@@ -101,6 +101,7 @@ csv_output = ["csv"]
 
 [workspace]
 exclude = ["cargo-criterion"]
+resolver = "2"
 
 [[bench]]
 name    = "bench_main"
diff --git a/bencher_compat/Cargo.toml b/bencher_compat/Cargo.toml
index c901ca72..129d6a8b 100644
--- a/bencher_compat/Cargo.toml
+++ b/bencher_compat/Cargo.toml
@@ -2,7 +2,7 @@
 name = "criterion_bencher_compat"
 version = "0.4.0"
 authors = ["Brook Heisler <redattack34@gmail.com>"]
-edition = "2018"
+edition = "2021"
 
 description = "Drop-in replacement for commonly-used parts of Bencher"
 homepage = "https://bheisler.github.io/criterion.rs/book/index.html"
@@ -23,4 +23,4 @@ default = []
 name = "bencher_example"
 harness = false
 
-[workspace]
\ No newline at end of file
+[workspace]
diff --git a/macro/Cargo.toml b/macro/Cargo.toml
index b8adf2d4..e5527533 100644
--- a/macro/Cargo.toml
+++ b/macro/Cargo.toml
@@ -2,7 +2,7 @@
 name = "criterion-macro"
 version = "0.4.0"
 authors = ["Brook Heisler <redattack34@gmail.com>"]
-edition = "2018"
+edition = "2021"
 
 description = "Custom Test Framework macro for Criterion.rs"
 homepage = "https://bheisler.github.io/criterion.rs/book/index.html"
@@ -25,4 +25,4 @@ criterion = { version = "0.4.0", path = "..", default-features = false }
 [[bench]]
 name = "test_macro_bench"
 
-[workspace]
\ No newline at end of file
+[workspace]
diff --git a/plot/Cargo.toml b/plot/Cargo.toml
index f7ef2023..58dd1b3e 100644
--- a/plot/Cargo.toml
+++ b/plot/Cargo.toml
@@ -2,7 +2,7 @@
 authors = ["Jorge Aparicio <japaricious@gmail.com>", "Brook Heisler <brookheisler@gmail.com>"]
 name = "criterion-plot"
 version = "0.5.0"
-edition = "2018"
+edition = "2021"
 
 description = "Criterion's plotting library"
 repository = "https://github.com/bheisler/criterion.rs"