diff --git a/Cargo.toml b/Cargo.toml
index 39c1ab6233..21317feab8 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -2,7 +2,7 @@
 name = "crosvm"
 version = "0.1.0"
 authors = ["The Chromium OS Authors"]
-edition = "2018"
+edition = "2021"
 default-run = "crosvm"
 
 [lib]
diff --git a/aarch64/Cargo.toml b/aarch64/Cargo.toml
index 7ad86c2b09..3fb0c235f4 100644
--- a/aarch64/Cargo.toml
+++ b/aarch64/Cargo.toml
@@ -2,7 +2,7 @@
 name = "aarch64"
 version = "0.1.0"
 authors = ["The Chromium OS Authors"]
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 arch = { path = "../arch" }
diff --git a/acpi_tables/Cargo.toml b/acpi_tables/Cargo.toml
index 9537960ca5..c6d5917666 100644
--- a/acpi_tables/Cargo.toml
+++ b/acpi_tables/Cargo.toml
@@ -2,7 +2,7 @@
 name = "acpi_tables"
 version = "0.1.0"
 authors = ["The Chromium OS Authors"]
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 data_model = { path = "../common/data_model" }
diff --git a/arch/Cargo.toml b/arch/Cargo.toml
index 62167d2061..3706fa861c 100644
--- a/arch/Cargo.toml
+++ b/arch/Cargo.toml
@@ -2,7 +2,7 @@
 name = "arch"
 version = "0.1.0"
 authors = ["The Chromium OS Authors"]
-edition = "2018"
+edition = "2021"
 
 [features]
 power-monitor-powerd = ["power_monitor/powerd"]
diff --git a/bit_field/Cargo.toml b/bit_field/Cargo.toml
index ac8846ca14..540412f947 100644
--- a/bit_field/Cargo.toml
+++ b/bit_field/Cargo.toml
@@ -2,7 +2,7 @@
 name = "bit_field"
 version = "0.1.0"
 authors = ["The Chromium OS Authors"]
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 bit_field_derive = { path = "bit_field_derive" }
diff --git a/bit_field/bit_field_derive/Cargo.toml b/bit_field/bit_field_derive/Cargo.toml
index 4642b93898..dddf7b4e2d 100644
--- a/bit_field/bit_field_derive/Cargo.toml
+++ b/bit_field/bit_field_derive/Cargo.toml
@@ -2,7 +2,7 @@
 name = "bit_field_derive"
 version = "0.1.0"
 authors = ["The Chromium OS Authors"]
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 proc-macro2 = "^1"
diff --git a/common/assertions/Cargo.toml b/common/assertions/Cargo.toml
index 60b1c5e59d..6608f092b3 100644
--- a/common/assertions/Cargo.toml
+++ b/common/assertions/Cargo.toml
@@ -2,7 +2,7 @@
 name = "assertions"
 version = "0.1.0"
 authors = ["The Chromium OS Authors"]
-edition = "2018"
+edition = "2021"
 include = ["src/**/*", "Cargo.toml"]
 
 [workspace]
diff --git a/common/audio_streams/Cargo.toml b/common/audio_streams/Cargo.toml
index e014a6a315..960dc4e2b6 100644
--- a/common/audio_streams/Cargo.toml
+++ b/common/audio_streams/Cargo.toml
@@ -2,7 +2,7 @@
 name = "audio_streams"
 version = "0.1.0"
 authors = ["The Chromium OS Authors"]
-edition = "2018"
+edition = "2021"
 
 [lib]
 path = "src/audio_streams.rs"
diff --git a/common/balloon_control/Cargo.toml b/common/balloon_control/Cargo.toml
index 32384b1801..11b8acfe74 100644
--- a/common/balloon_control/Cargo.toml
+++ b/common/balloon_control/Cargo.toml
@@ -2,7 +2,7 @@
 name = "balloon_control"
 version = "0.1.0"
 authors = ["The Chromium OS Authors"]
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 serde = { version = "1", features = [ "derive" ] }
diff --git a/common/base/Cargo.toml b/common/base/Cargo.toml
index ca94518ba9..3a575992dc 100644
--- a/common/base/Cargo.toml
+++ b/common/base/Cargo.toml
@@ -2,7 +2,7 @@
 name = "base"
 version = "0.1.0"
 authors = ["The Chromium OS Authors"]
-edition = "2018"
+edition = "2021"
 
 [features]
 chromeos = ["sys_util/chromeos"]
diff --git a/common/cros-fuzz/Cargo.toml b/common/cros-fuzz/Cargo.toml
index e91baf2e45..c304d95dc0 100644
--- a/common/cros-fuzz/Cargo.toml
+++ b/common/cros-fuzz/Cargo.toml
@@ -2,7 +2,7 @@
 name = "cros_fuzz"
 version = "0.1.0"
 authors = ["The Chromium OS Authors"]
-edition = "2018"
+edition = "2021"
 include = ["Cargo.toml", "src/*.rs"]
 
 [dependencies]
diff --git a/common/cros_async/Cargo.toml b/common/cros_async/Cargo.toml
index d8ee886afe..009dbbffe6 100644
--- a/common/cros_async/Cargo.toml
+++ b/common/cros_async/Cargo.toml
@@ -2,7 +2,7 @@
 name = "cros_async"
 version = "0.1.0"
 authors = ["The Chromium OS Authors"]
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 async-trait = "0.1.36"
diff --git a/common/cros_asyncv2/Cargo.toml b/common/cros_asyncv2/Cargo.toml
index 468ed9064d..0dac52ba74 100644
--- a/common/cros_asyncv2/Cargo.toml
+++ b/common/cros_asyncv2/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "cros_async"
 version = "0.2.0"
-edition = "2018"
+edition = "2021"
 
 [features]
 uring = ["io-uring"]
diff --git a/common/data_model/Cargo.toml b/common/data_model/Cargo.toml
index 4401e0e269..d7eb19120d 100644
--- a/common/data_model/Cargo.toml
+++ b/common/data_model/Cargo.toml
@@ -2,7 +2,7 @@
 name = "data_model"
 version = "0.1.0"
 authors = ["The Chromium OS Authors"]
-edition = "2018"
+edition = "2021"
 include = ["src/**/*", "Cargo.toml"]
 
 [dependencies]
diff --git a/common/io_uring/Cargo.toml b/common/io_uring/Cargo.toml
index d4206412c7..47b31382f8 100644
--- a/common/io_uring/Cargo.toml
+++ b/common/io_uring/Cargo.toml
@@ -2,7 +2,7 @@
 name = "io_uring"
 version = "0.1.0"
 authors = ["The Chromium OS Authors"]
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 data_model = { path = "../data_model" } # provided by ebuild
diff --git a/common/p9/Cargo.toml b/common/p9/Cargo.toml
index 90616f3ac8..45c5d0dec1 100644
--- a/common/p9/Cargo.toml
+++ b/common/p9/Cargo.toml
@@ -2,7 +2,7 @@
 name = "p9"
 version = "0.1.0"
 authors = ["The Chromium OS Authors"]
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 libc = "*"
diff --git a/common/p9/fuzz/Cargo.toml b/common/p9/fuzz/Cargo.toml
index fe9af4a555..76ccc60dcf 100644
--- a/common/p9/fuzz/Cargo.toml
+++ b/common/p9/fuzz/Cargo.toml
@@ -2,7 +2,7 @@
 name = "p9-fuzz"
 version = "0.1.0"
 authors = ["The Chromium OS Authors"]
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 p9 = { path = "../" }
diff --git a/common/sync/Cargo.toml b/common/sync/Cargo.toml
index af38fd15b9..953d41b479 100644
--- a/common/sync/Cargo.toml
+++ b/common/sync/Cargo.toml
@@ -2,7 +2,7 @@
 name = "sync"
 version = "0.1.0"
 authors = ["The Chromium OS Authors"]
-edition = "2018"
+edition = "2021"
 include = ["src/**/*", "Cargo.toml"]
 
 [workspace]
diff --git a/common/sys_util/Cargo.toml b/common/sys_util/Cargo.toml
index 29714686ac..933dbda392 100644
--- a/common/sys_util/Cargo.toml
+++ b/common/sys_util/Cargo.toml
@@ -2,7 +2,7 @@
 name = "sys_util"
 version = "0.1.0"
 authors = ["The Chromium OS Authors"]
-edition = "2018"
+edition = "2021"
 include = ["src/**/*", "Cargo.toml"]
 
 [dependencies]
diff --git a/common/sys_util/src/signal.rs b/common/sys_util/src/signal.rs
index 97fa64b533..3dba86e31d 100644
--- a/common/sys_util/src/signal.rs
+++ b/common/sys_util/src/signal.rs
@@ -549,19 +549,12 @@ unsafe impl<T> Killable for JoinHandle<T> {
 
 /// Treat some errno's as Ok(()).
 macro_rules! ok_if {
-    ($result:expr, $($errno:pat)|+) => {{
-    let res = $result;
-    match res {
-        Ok(_) => Ok(()),
-        Err(err) => {
-            if matches!(err.errno(), $($errno)|+) {
-                Ok(())
-            } else {
-                Err(err)
-            }
+    ($result:expr, $errno:pat) => {{
+        match $result {
+            Err(err) if !matches!(err.errno(), $errno) => Err(err),
+            _ => Ok(()),
         }
-    }
-    }}
+    }};
 }
 
 /// Terminates and reaps a child process. If the child process is a group leader, its children will
diff --git a/common/sys_util_core/Cargo.toml b/common/sys_util_core/Cargo.toml
index 2bf2cacca7..2546a51fca 100644
--- a/common/sys_util_core/Cargo.toml
+++ b/common/sys_util_core/Cargo.toml
@@ -2,7 +2,7 @@
 name = "sys_util_core"
 version = "0.1.0"
 authors = ["The Chromium OS Authors"]
-edition = "2018"
+edition = "2021"
 include = ["src/**/*", "Cargo.toml"]
 
 [dependencies]
diff --git a/common/sys_util_core/poll_token_derive/Cargo.toml b/common/sys_util_core/poll_token_derive/Cargo.toml
index 0b4d41c4bf..69540153d6 100644
--- a/common/sys_util_core/poll_token_derive/Cargo.toml
+++ b/common/sys_util_core/poll_token_derive/Cargo.toml
@@ -2,7 +2,7 @@
 name = "poll_token_derive"
 version = "0.1.0"
 authors = ["The Chromium OS Authors"]
-edition = "2018"
+edition = "2021"
 include = ["*.rs", "Cargo.toml"]
 
 [lib]
diff --git a/crosvm-fuzz/Cargo.toml b/crosvm-fuzz/Cargo.toml
index e7f8e8b82c..0b5461182c 100644
--- a/crosvm-fuzz/Cargo.toml
+++ b/crosvm-fuzz/Cargo.toml
@@ -2,7 +2,7 @@
 name = "crosvm-fuzz"
 version = "0.0.1"
 authors = ["The Chromium OS Authors"]
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 cros_fuzz = "*"
diff --git a/crosvm_control/Cargo.toml b/crosvm_control/Cargo.toml
index 4554344fb4..7f97143da5 100644
--- a/crosvm_control/Cargo.toml
+++ b/crosvm_control/Cargo.toml
@@ -2,7 +2,7 @@
 name = "crosvm_control"
 version = "0.1.0"
 authors = ["The Chromium OS Authors"]
-edition = "2018"
+edition = "2021"
 
 [lib]
 crate-type = ["cdylib"]
diff --git a/crosvm_plugin/Cargo.toml b/crosvm_plugin/Cargo.toml
index 8531cf635e..d1a631be94 100644
--- a/crosvm_plugin/Cargo.toml
+++ b/crosvm_plugin/Cargo.toml
@@ -2,7 +2,7 @@
 name = "crosvm_plugin"
 version = "0.17.0"
 authors = ["The Chromium OS Authors"]
-edition = "2018"
+edition = "2021"
 
 [features]
 stats = []
diff --git a/devices/Cargo.toml b/devices/Cargo.toml
index 10a6c911c0..b49572ad87 100644
--- a/devices/Cargo.toml
+++ b/devices/Cargo.toml
@@ -2,7 +2,7 @@
 name = "devices"
 version = "0.1.0"
 authors = ["The Chromium OS Authors"]
-edition = "2018"
+edition = "2021"
 
 [features]
 audio = []
diff --git a/disk/Cargo.toml b/disk/Cargo.toml
index f3bbf14f3a..5dff7ff932 100644
--- a/disk/Cargo.toml
+++ b/disk/Cargo.toml
@@ -2,7 +2,7 @@
 name = "disk"
 version = "0.1.0"
 authors = ["The Chromium OS Authors"]
-edition = "2018"
+edition = "2021"
 
 [lib]
 path = "src/disk.rs"
diff --git a/fuse/Cargo.toml b/fuse/Cargo.toml
index 3cbc6bd0ef..7e4bfc9953 100644
--- a/fuse/Cargo.toml
+++ b/fuse/Cargo.toml
@@ -2,7 +2,7 @@
 name = "fuse"
 version = "0.1.0"
 authors = ["The Chromium OS Authors"]
-edition = "2018"
+edition = "2021"
 
 [lib]
 path = "src/lib.rs"
diff --git a/gpu_display/Cargo.toml b/gpu_display/Cargo.toml
index d5aa36dc93..84e1fc0a1e 100644
--- a/gpu_display/Cargo.toml
+++ b/gpu_display/Cargo.toml
@@ -2,7 +2,7 @@
 name = "gpu_display"
 version = "0.1.0"
 authors = ["The Chromium OS Authors"]
-edition = "2018"
+edition = "2021"
 
 [features]
 x = []
diff --git a/hypervisor/Cargo.toml b/hypervisor/Cargo.toml
index eea6f26b29..1bff2654a2 100644
--- a/hypervisor/Cargo.toml
+++ b/hypervisor/Cargo.toml
@@ -2,7 +2,7 @@
 name = "hypervisor"
 version = "0.1.0"
 authors = ["The Chromium OS Authors"]
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 bit_field = { path = "../bit_field" }
diff --git a/integration_tests/Cargo.toml b/integration_tests/Cargo.toml
index f250cfb1b4..7da71c1e62 100644
--- a/integration_tests/Cargo.toml
+++ b/integration_tests/Cargo.toml
@@ -2,7 +2,7 @@
 name = "integration_tests"
 version = "0.1.0"
 authors = ["The Chromium OS Authors"]
-edition = "2018"
+edition = "2021"
 
 [dev-dependencies]
 tempfile = "3"
diff --git a/kernel_cmdline/Cargo.toml b/kernel_cmdline/Cargo.toml
index bf2a5d6ef9..aacbe05281 100644
--- a/kernel_cmdline/Cargo.toml
+++ b/kernel_cmdline/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "kernel_cmdline"
 version = "0.1.0"
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 libc = "*"
diff --git a/kernel_loader/Cargo.toml b/kernel_loader/Cargo.toml
index 9fd1e8cf98..b57b4d95e5 100644
--- a/kernel_loader/Cargo.toml
+++ b/kernel_loader/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "kernel_loader"
 version = "0.1.0"
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 data_model = { path = "../common/data_model" }
diff --git a/kvm/Cargo.toml b/kvm/Cargo.toml
index 525e73aa83..7bdfd173df 100644
--- a/kvm/Cargo.toml
+++ b/kvm/Cargo.toml
@@ -2,7 +2,7 @@
 name = "kvm"
 version = "0.1.0"
 authors = ["The Chromium OS Authors"]
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 data_model = { path = "../common/data_model" }
diff --git a/kvm_sys/Cargo.toml b/kvm_sys/Cargo.toml
index 0649785542..dbac907ab8 100644
--- a/kvm_sys/Cargo.toml
+++ b/kvm_sys/Cargo.toml
@@ -2,7 +2,7 @@
 name = "kvm_sys"
 version = "0.1.0"
 authors = ["The Chromium OS Authors"]
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 data_model = { path = "../common/data_model" }
diff --git a/libcras_stub/Cargo.toml b/libcras_stub/Cargo.toml
index 7d40cf2636..4b0961cb74 100644
--- a/libcras_stub/Cargo.toml
+++ b/libcras_stub/Cargo.toml
@@ -2,7 +2,7 @@
 name = "libcras"
 version = "0.1.0"
 authors = ["The Chromium OS Authors"]
-edition = "2018"
+edition = "2021"
 
 [lib]
 path = "src/libcras.rs"
diff --git a/libvda/Cargo.toml b/libvda/Cargo.toml
index 7de282cb50..551d558c8d 100644
--- a/libvda/Cargo.toml
+++ b/libvda/Cargo.toml
@@ -2,7 +2,7 @@
 name = "libvda"
 version = "0.1.0"
 authors = ["The Chromium OS Authors"]
-edition = "2018"
+edition = "2021"
 links = "vda"
 
 [dependencies]
diff --git a/linux_input_sys/Cargo.toml b/linux_input_sys/Cargo.toml
index a8181d0e66..7d57c84afa 100644
--- a/linux_input_sys/Cargo.toml
+++ b/linux_input_sys/Cargo.toml
@@ -2,7 +2,7 @@
 name = "linux_input_sys"
 version = "0.1.0"
 authors = ["The Chromium OS Authors"]
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 data_model = { path = "../common/data_model" }
diff --git a/net_sys/Cargo.toml b/net_sys/Cargo.toml
index 53e3b1a29e..cd7c0959be 100644
--- a/net_sys/Cargo.toml
+++ b/net_sys/Cargo.toml
@@ -2,7 +2,7 @@
 name = "net_sys"
 version = "0.1.0"
 authors = ["The Chromium OS Authors"]
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 base = { path = "../common/base" }
diff --git a/net_util/Cargo.toml b/net_util/Cargo.toml
index 8dfe1dffc1..951d0e00ec 100644
--- a/net_util/Cargo.toml
+++ b/net_util/Cargo.toml
@@ -2,7 +2,7 @@
 name = "net_util"
 version = "0.1.0"
 authors = ["The Chromium OS Authors"]
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 libc = "*"
diff --git a/power_monitor/Cargo.toml b/power_monitor/Cargo.toml
index e16362c12a..c7fe4e07d0 100644
--- a/power_monitor/Cargo.toml
+++ b/power_monitor/Cargo.toml
@@ -2,7 +2,7 @@
 name = "power_monitor"
 version = "0.1.0"
 authors = ["The Chromium OS Authors"]
-edition = "2018"
+edition = "2021"
 
 [features]
 powerd = ["dbus", "protobuf", "protoc-rust"]
diff --git a/protos/Cargo.toml b/protos/Cargo.toml
index d4286e6797..736d7555e8 100644
--- a/protos/Cargo.toml
+++ b/protos/Cargo.toml
@@ -2,7 +2,7 @@
 name = "protos"
 version = "0.1.0"
 authors = ["The Chromium OS Authors"]
-edition = "2018"
+edition = "2021"
 
 [features]
 plugin = ["kvm_sys"]
diff --git a/qcow_utils/Cargo.toml b/qcow_utils/Cargo.toml
index 840bb184a9..28ade45f10 100644
--- a/qcow_utils/Cargo.toml
+++ b/qcow_utils/Cargo.toml
@@ -2,7 +2,7 @@
 name = "qcow_utils"
 version = "0.1.0"
 authors = ["The Chromium OS Authors"]
-edition = "2018"
+edition = "2021"
 
 [lib]
 path = "src/qcow_utils.rs"
diff --git a/resources/Cargo.toml b/resources/Cargo.toml
index f5c721961e..6cb4e0d53d 100644
--- a/resources/Cargo.toml
+++ b/resources/Cargo.toml
@@ -2,7 +2,7 @@
 name = "resources"
 version = "0.1.0"
 authors = ["The Chromium OS Authors"]
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 libc = "*"
diff --git a/rutabaga_gfx/Cargo.toml b/rutabaga_gfx/Cargo.toml
index 46d56bbb9d..bb02eaca06 100644
--- a/rutabaga_gfx/Cargo.toml
+++ b/rutabaga_gfx/Cargo.toml
@@ -2,7 +2,7 @@
 name = "rutabaga_gfx"
 version = "0.1.0"
 authors = ["The Chromium OS Authors"]
-edition = "2018"
+edition = "2021"
 
 [features]
 gfxstream = []
diff --git a/rutabaga_gfx/ffi/Cargo.toml b/rutabaga_gfx/ffi/Cargo.toml
index 9e10616c3f..3926c4a8e7 100644
--- a/rutabaga_gfx/ffi/Cargo.toml
+++ b/rutabaga_gfx/ffi/Cargo.toml
@@ -2,7 +2,7 @@
 name = "rutabaga_gfx_ffi"
 version = "0.1.0"
 authors = ["The Chromium OS Authors + Android Open Source Project"]
-edition = "2018"
+edition = "2021"
 
 [lib]
 name = "rutabaga_gfx_ffi"
diff --git a/rutabaga_gfx/src/rutabaga_gralloc/Cargo.toml b/rutabaga_gfx/src/rutabaga_gralloc/Cargo.toml
index 1ab814c578..a541c9c7cf 100644
--- a/rutabaga_gfx/src/rutabaga_gralloc/Cargo.toml
+++ b/rutabaga_gfx/src/rutabaga_gralloc/Cargo.toml
@@ -2,7 +2,7 @@
 name = "gpu_buffer"
 version = "0.1.0"
 authors = ["The Chromium OS Authors"]
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 data_model = { path = "../data_model" }
diff --git a/system_api_stub/Cargo.toml b/system_api_stub/Cargo.toml
index d5a8ec1f35..764a68c7b1 100644
--- a/system_api_stub/Cargo.toml
+++ b/system_api_stub/Cargo.toml
@@ -2,7 +2,7 @@
 name = "system_api"
 version = "0.1.0"
 authors = ["The Chromium OS Authors"]
-edition = "2018"
+edition = "2021"
 
 [lib]
 path = "src/system_api.rs"
diff --git a/third_party/vmm_vhost/Cargo.toml b/third_party/vmm_vhost/Cargo.toml
index 4bb822a48e..9f29a385ab 100644
--- a/third_party/vmm_vhost/Cargo.toml
+++ b/third_party/vmm_vhost/Cargo.toml
@@ -8,7 +8,7 @@ repository = "https://github.com/rust-vmm/vhost"
 documentation = "https://docs.rs/vhost"
 readme = "README.md"
 license = "Apache-2.0 or BSD-3-Clause"
-edition = "2018"
+edition = "2021"
 
 [features]
 default = []
diff --git a/tpm2-sys/Cargo.toml b/tpm2-sys/Cargo.toml
index 89dd491c24..59cfe2c017 100644
--- a/tpm2-sys/Cargo.toml
+++ b/tpm2-sys/Cargo.toml
@@ -2,7 +2,7 @@
 name = "tpm2-sys"
 version = "0.1.0"
 authors = ["The Chromium OS Authors"]
-edition = "2018"
+edition = "2021"
 links = "tpm2"
 
 [build-dependencies]
diff --git a/tpm2/Cargo.toml b/tpm2/Cargo.toml
index 56ee5fbc49..705be840a2 100644
--- a/tpm2/Cargo.toml
+++ b/tpm2/Cargo.toml
@@ -2,7 +2,7 @@
 name = "tpm2"
 version = "0.1.0"
 authors = ["The Chromium OS Authors"]
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 tpm2-sys = { path = "../tpm2-sys" }
diff --git a/usb_sys/Cargo.toml b/usb_sys/Cargo.toml
index 74f7b92eda..e74193aa5a 100644
--- a/usb_sys/Cargo.toml
+++ b/usb_sys/Cargo.toml
@@ -2,7 +2,7 @@
 name = "usb_sys"
 version = "0.1.0"
 authors = ["The Chromium OS Authors"]
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 base = { path = "../common/base" }
diff --git a/usb_util/Cargo.toml b/usb_util/Cargo.toml
index a52b7dcbb7..f161565649 100644
--- a/usb_util/Cargo.toml
+++ b/usb_util/Cargo.toml
@@ -2,7 +2,7 @@
 name = "usb_util"
 version = "0.1.0"
 authors = ["The Chromium OS Authors"]
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 assertions = { path = "../common/assertions" }
diff --git a/vfio_sys/Cargo.toml b/vfio_sys/Cargo.toml
index 856703e5ef..782f1b2e7b 100644
--- a/vfio_sys/Cargo.toml
+++ b/vfio_sys/Cargo.toml
@@ -2,7 +2,7 @@
 name = "vfio_sys"
 version = "0.1.0"
 authors = ["The Chromium OS Authors"]
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 base = { path = "../common/base" }
diff --git a/vhost/Cargo.toml b/vhost/Cargo.toml
index 2f7adea003..09403e4bc7 100644
--- a/vhost/Cargo.toml
+++ b/vhost/Cargo.toml
@@ -2,7 +2,7 @@
 name = "vhost"
 version = "0.1.0"
 authors = ["The Chromium OS Authors"]
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 assertions = { path = "../common/assertions" }
diff --git a/virtio_sys/Cargo.toml b/virtio_sys/Cargo.toml
index b90929b7ec..61460a0645 100644
--- a/virtio_sys/Cargo.toml
+++ b/virtio_sys/Cargo.toml
@@ -2,7 +2,7 @@
 name = "virtio_sys"
 version = "0.1.0"
 authors = ["The Chromium OS Authors"]
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 base = { path = "../common/base" }
diff --git a/vm_control/Cargo.toml b/vm_control/Cargo.toml
index 12fdbbf3cf..9f8b2869e8 100644
--- a/vm_control/Cargo.toml
+++ b/vm_control/Cargo.toml
@@ -2,7 +2,7 @@
 name = "vm_control"
 version = "0.1.0"
 authors = ["The Chromium OS Authors"]
-edition = "2018"
+edition = "2021"
 
 [features]
 gdb = ["gdbstub_arch"]
diff --git a/vm_memory/Cargo.toml b/vm_memory/Cargo.toml
index d79df956a0..f9fc9d24c2 100644
--- a/vm_memory/Cargo.toml
+++ b/vm_memory/Cargo.toml
@@ -2,7 +2,7 @@
 name = "vm_memory"
 version = "0.1.0"
 authors = ["The Chromium OS Authors"]
-edition = "2018"
+edition = "2021"
 include = ["src/**/*", "Cargo.toml"]
 
 [dependencies]
diff --git a/x86_64/Cargo.toml b/x86_64/Cargo.toml
index 2e8ecd2d2e..2d17645570 100644
--- a/x86_64/Cargo.toml
+++ b/x86_64/Cargo.toml
@@ -2,7 +2,7 @@
 name = "x86_64"
 version = "0.1.0"
 authors = ["The Chromium OS Authors"]
-edition = "2018"
+edition = "2021"
 
 [features]
 gdb = ["gdbstub_arch", "arch/gdb"]