cargo: Bump to 2021 edition

Change-Id: Icb2deaff58da7f92970d8f57f7853349769323f5 GitOrigin-RevId: f8303df543a9d84c066b9a4a1bd1c0239eb75857
2025-08-31 13:06:15 +00:00 · 2022-04-18 20:22:08 +00:00
parent 9188a29bd4
commit 57a4ee2f13
41 changed files with 117 additions and 42 deletions
--- a/apps/system/components/DebugConsole/Cargo.toml
+++ b/apps/system/components/DebugConsole/Cargo.toml
@@ -1,3 +1,5 @@
+cargo-features = ["edition2021"]
+
 [workspace]

 members = [
@@ -8,7 +10,6 @@ members = [
    "kata-uart-client",
    "zmodem",
 ]
-resolver = "2"

 [profile.dev]
 opt-level = 0
--- a/apps/system/components/DebugConsole/kata-debug-console/Cargo.toml
+++ b/apps/system/components/DebugConsole/kata-debug-console/Cargo.toml
@@ -1,8 +1,10 @@
+cargo-features = ["edition2021"]
+
 [package]
 name = "kata-debug-console"
 version = "0.1.0"
 authors = ["Matt Harvey <mattharvey@google.com>"]
-edition = "2018"
+edition = "2021"
 description = "Kata OS DebugConsole"

 [dependencies]
--- a/apps/system/components/DebugConsole/kata-io/Cargo.toml
+++ b/apps/system/components/DebugConsole/kata-io/Cargo.toml
@@ -1,8 +1,10 @@
+cargo-features = ["edition2021"]
+
 [package]
 name = "kata-io"
 version = "0.1.0"
 authors = ["Matt Harvey <mattharvey@google.com>"]
-edition = "2018"
+edition = "2021"

 [dependencies]
 memchr = { version = "2.4.1", default-features = false }
--- a/apps/system/components/DebugConsole/kata-line-reader/Cargo.toml
+++ b/apps/system/components/DebugConsole/kata-line-reader/Cargo.toml
@@ -1,8 +1,10 @@
+cargo-features = ["edition2021"]
+
 [package]
 name = "kata-line-reader"
 version = "0.1.0"
 authors = ["Matt Harvey <mattharvey@google.com>"]
-edition = "2018"
+edition = "2021"

 [dependencies]
 kata-io = { path = "../kata-io" }
--- a/apps/system/components/DebugConsole/kata-shell/Cargo.toml
+++ b/apps/system/components/DebugConsole/kata-shell/Cargo.toml
@@ -1,8 +1,10 @@
+cargo-features = ["edition2021"]
+
 [package]
 name = "kata-shell"
 version = "0.1.0"
 authors = ["Matt Harvey <mattharvey@google.com>"]
-edition = "2018"
+edition = "2021"
 build = "build.rs"

 [build-dependencies]
--- a/apps/system/components/DebugConsole/kata-uart-client/Cargo.toml
+++ b/apps/system/components/DebugConsole/kata-uart-client/Cargo.toml
@@ -1,8 +1,10 @@
+cargo-features = ["edition2021"]
+
 [package]
 name = "kata-uart-client"
 version = "0.1.0"
 authors = ["Matt Harvey <mattharvey@google.com>"]
-edition = "2018"
+edition = "2021"

 [dependencies]
 # Disable default so we don't pull in CString which requires an allocator
--- a/apps/system/components/DebugConsole/zmodem/Cargo.toml
+++ b/apps/system/components/DebugConsole/zmodem/Cargo.toml
@@ -1,3 +1,5 @@
+cargo-features = ["edition2021"]
+
 [package]
 authors = ["aarbuzov"]
 name = "zmodem"
--- a/apps/system/components/MemoryManager/Cargo.toml
+++ b/apps/system/components/MemoryManager/Cargo.toml
@@ -1,3 +1,5 @@
+cargo-features = ["edition2021"]
+
 [workspace]

 members = [
@@ -5,7 +7,6 @@ members = [
    "kata-memory-interface",
    "kata-memory-manager",
 ]
-resolver = "2"

 [profile.dev]
 opt-level = 0
--- a/apps/system/components/MemoryManager/kata-memory-component/Cargo.toml
+++ b/apps/system/components/MemoryManager/kata-memory-component/Cargo.toml
@@ -1,7 +1,9 @@
+cargo-features = ["edition2021"]
+
 [package]
 name = "kata-memory-component"
 version = "0.1.0"
-edition = "2018"
+edition = "2021"

 [dependencies]
 kata-memory-interface = { path = "../kata-memory-interface" }
--- a/apps/system/components/MemoryManager/kata-memory-interface/Cargo.toml
+++ b/apps/system/components/MemoryManager/kata-memory-interface/Cargo.toml
@@ -1,7 +1,9 @@
+cargo-features = ["edition2021"]
+
 [package]
 name = "kata-memory-interface"
 version = "0.1.0"
-edition = "2018"
+edition = "2021"
 build = "build.rs"

 [build-dependencies]
--- a/apps/system/components/MemoryManager/kata-memory-manager/Cargo.toml
+++ b/apps/system/components/MemoryManager/kata-memory-manager/Cargo.toml
@@ -1,8 +1,10 @@
+cargo-features = ["edition2021"]
+
 [package]
 name = "kata-memory-manager"
 version = "0.1.0"
 description = "Kata OS MemoryManager service"
-edition = "2018"
+edition = "2021"

 [dependencies]
 kata-os-common = { path = "../../kata-os-common" }
--- a/apps/system/components/MlCoordinator/Cargo.toml
+++ b/apps/system/components/MlCoordinator/Cargo.toml
@@ -1,3 +1,5 @@
+cargo-features = ["edition2021"]
+
 [workspace]

 members = [
@@ -5,7 +7,6 @@ members = [
    "kata-ml-interface",
    "kata-vec-core"
 ]
-resolver = "2"

 [profile.dev]
 opt-level = 0
--- a/apps/system/components/MlCoordinator/kata-ml-coordinator/Cargo.toml
+++ b/apps/system/components/MlCoordinator/kata-ml-coordinator/Cargo.toml
@@ -1,8 +1,10 @@
+cargo-features = ["edition2021"]
+
 [package]
 name = "kata-ml-coordinator"
 version = "0.1.0"
 authors = ["Adam Jesionowski <jesionowski@google.com>"]
-edition = "2018"
+edition = "2021"

 [dependencies]
 kata-os-common = { path = "../../kata-os-common" }
--- a/apps/system/components/MlCoordinator/kata-ml-interface/Cargo.toml
+++ b/apps/system/components/MlCoordinator/kata-ml-interface/Cargo.toml
@@ -1,4 +1,6 @@
+cargo-features = ["edition2021"]
+
 [package]
 name = "kata-ml-interface"
 version = "0.1.0"
-edition = "2018"
+edition = "2021"
--- a/apps/system/components/MlCoordinator/kata-vec-core/Cargo.toml
+++ b/apps/system/components/MlCoordinator/kata-vec-core/Cargo.toml
@@ -1,7 +1,9 @@
+cargo-features = ["edition2021"]
+
 [package]
 name = "kata-vec-core"
 version = "0.1.0"
-edition = "2018"
+edition = "2021"

 [dependencies]
 kata-ml-interface = { path = "../kata-ml-interface" }
--- a/apps/system/components/ProcessManager/Cargo.toml
+++ b/apps/system/components/ProcessManager/Cargo.toml
@@ -1,3 +1,5 @@
+cargo-features = ["edition2021"]
+
 [workspace]

 members = [
@@ -5,7 +7,6 @@ members = [
    "kata-proc-interface",
    "kata-proc-manager",
 ]
-resolver = "2"


 [profile.dev]
--- a/apps/system/components/ProcessManager/kata-proc-component/Cargo.toml
+++ b/apps/system/components/ProcessManager/kata-proc-component/Cargo.toml
@@ -1,7 +1,9 @@
+cargo-features = ["edition2021"]
+
 [package]
 name = "kata-proc-component"
 version = "0.1.0"
-edition = "2018"
+edition = "2021"

 [dependencies]
 cstr_core = { version = "0.2.3", default-features = false }
--- a/apps/system/components/ProcessManager/kata-proc-interface/Cargo.toml
+++ b/apps/system/components/ProcessManager/kata-proc-interface/Cargo.toml
@@ -1,7 +1,9 @@
+cargo-features = ["edition2021"]
+
 [package]
 name = "kata-proc-interface"
 version = "0.1.0"
-edition = "2018"
+edition = "2021"

 [dependencies]
 cstr_core = "0.2.3"
--- a/apps/system/components/ProcessManager/kata-proc-manager/Cargo.toml
+++ b/apps/system/components/ProcessManager/kata-proc-manager/Cargo.toml
@@ -1,8 +1,10 @@
+cargo-features = ["edition2021"]
+
 [package]
 name = "kata-proc-manager"
 version = "0.1.0"
 description = "Kata OS ProcessManager services"
-edition = "2018"
+edition = "2021"

 [dependencies]
 hashbrown = { version = "0.11", features = ["ahash-compile-time-rng"] }
--- a/apps/system/components/SecurityCoordinator/Cargo.toml
+++ b/apps/system/components/SecurityCoordinator/Cargo.toml
@@ -1,3 +1,5 @@
+cargo-features = ["edition2021"]
+
 [workspace]

 members = [
@@ -5,7 +7,6 @@ members = [
    "kata-security-coordinator",
    "kata-security-interface",
 ]
-resolver = "2"

 [profile.dev]
 opt-level = 0
--- a/apps/system/components/SecurityCoordinator/kata-security-component/Cargo.toml
+++ b/apps/system/components/SecurityCoordinator/kata-security-component/Cargo.toml
@@ -1,7 +1,9 @@
+cargo-features = ["edition2021"]
+
 [package]
 name = "kata-security-component"
 version = "0.1.0"
-edition = "2018"
+edition = "2021"

 [dependencies]
 kata-os-common = { path = "../../kata-os-common" }
--- a/apps/system/components/SecurityCoordinator/kata-security-coordinator/Cargo.toml
+++ b/apps/system/components/SecurityCoordinator/kata-security-coordinator/Cargo.toml
@@ -1,7 +1,9 @@
+cargo-features = ["edition2021"]
+
 [package]
 name = "kata-security-coordinator"
 version = "0.1.0"
-edition = "2018"
+edition = "2021"

 [features]
 default = ["fake"]  # TODO(sleffler): sel4 once it exists
--- a/apps/system/components/SecurityCoordinator/kata-security-interface/Cargo.toml
+++ b/apps/system/components/SecurityCoordinator/kata-security-interface/Cargo.toml
@@ -1,7 +1,9 @@
+cargo-features = ["edition2021"]
+
 [package]
 name = "kata-security-interface"
 version = "0.1.0"
-edition = "2018"
+edition = "2021"

 [dependencies]
 postcard = { version = "0.7", features = ["alloc"], default-features = false }
--- a/apps/system/components/StorageManager/Cargo.toml
+++ b/apps/system/components/StorageManager/Cargo.toml
@@ -1,3 +1,5 @@
+cargo-features = ["edition2021"]
+
 [workspace]

 members = [
@@ -5,7 +7,6 @@ members = [
    "kata-storage-interface",
    "kata-storage-manager",
 ]
-resolver = "2"

 [profile.dev]
 opt-level = 0
--- a/apps/system/components/StorageManager/kata-storage-component/Cargo.toml
+++ b/apps/system/components/StorageManager/kata-storage-component/Cargo.toml
@@ -1,7 +1,9 @@
+cargo-features = ["edition2021"]
+
 [package]
 name = "kata-storage-component"
 version = "0.1.0"
-edition = "2018"
+edition = "2021"

 [dependencies]
 cstr_core = { version = "0.2.3", default-features = false }
--- a/apps/system/components/StorageManager/kata-storage-interface/Cargo.toml
+++ b/apps/system/components/StorageManager/kata-storage-interface/Cargo.toml
@@ -1,7 +1,9 @@
+cargo-features = ["edition2021"]
+
 [package]
 name = "kata-storage-interface"
 version = "0.1.0"
-edition = "2018"
+edition = "2021"

 [dependencies]
 cstr_core = "0.2.3"
--- a/apps/system/components/StorageManager/kata-storage-manager/Cargo.toml
+++ b/apps/system/components/StorageManager/kata-storage-manager/Cargo.toml
@@ -1,7 +1,9 @@
+cargo-features = ["edition2021"]
+
 [package]
 name = "kata-storage-manager"
 version = "0.1.0"
-edition = "2018"
+edition = "2021"

 [dependencies]
 kata-security-interface = { path = "../../SecurityCoordinator/kata-security-interface" }
--- a/apps/system/components/TimerService/Cargo.toml
+++ b/apps/system/components/TimerService/Cargo.toml
@@ -1,3 +1,5 @@
+cargo-features = ["edition2021"]
+
 [workspace]

 members = [
@@ -6,7 +8,6 @@ members = [
    "kata-timer-service",
    "opentitan-timer"
 ]
-resolver = "2"

 [profile.dev]
 opt-level = 0
--- a/apps/system/components/TimerService/kata-timer-component/Cargo.toml
+++ b/apps/system/components/TimerService/kata-timer-component/Cargo.toml
@@ -1,7 +1,9 @@
+cargo-features = ["edition2021"]
+
 [package]
 name = "kata-timer-component"
 version = "0.1.0"
-edition = "2018"
+edition = "2021"

 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

--- a/apps/system/components/TimerService/kata-timer-interface/Cargo.toml
+++ b/apps/system/components/TimerService/kata-timer-interface/Cargo.toml
@@ -1,7 +1,9 @@
+cargo-features = ["edition2021"]
+
 [package]
 name = "kata-timer-interface"
 version = "0.1.0"
-edition = "2018"
+edition = "2021"

 [dependencies]
-kata-os-common = { path = "../../kata-os-common" }
+kata-os-common = { path = "../../kata-os-common" }
--- a/apps/system/components/TimerService/kata-timer-service/Cargo.toml
+++ b/apps/system/components/TimerService/kata-timer-service/Cargo.toml
@@ -1,7 +1,9 @@
+cargo-features = ["edition2021"]
+
 [package]
 name = "kata-timer-service"
 version = "0.1.0"
-edition = "2018"
+edition = "2021"

 [dependencies]
 kata-os-common = { path = "../../kata-os-common" }
--- a/apps/system/components/TimerService/opentitan-timer/Cargo.toml
+++ b/apps/system/components/TimerService/opentitan-timer/Cargo.toml
@@ -1,9 +1,11 @@
+cargo-features = ["edition2021"]
+
 [package]
 name = "opentitan-timer"
 version = "0.1.0"
-edition = "2018"
+edition = "2021"

 [dependencies]
 kata-timer-interface = { path = "../kata-timer-interface" }
 modular-bitfield = "0.11.2"
-log = "0.4"
+log = "0.4"
--- a/apps/system/components/kata-os-common/Cargo.toml
+++ b/apps/system/components/kata-os-common/Cargo.toml
@@ -1,7 +1,9 @@
+cargo-features = ["edition2021"]
+
 [package]
 name = "kata-os-common"
 version = "0.1.0"
-edition = "2018"
+edition = "2021"

 [dependencies]
 capdl = { path = "src/capdl" }
--- a/apps/system/components/kata-os-common/src/allocator/Cargo.toml
+++ b/apps/system/components/kata-os-common/src/allocator/Cargo.toml
@@ -1,8 +1,10 @@
+cargo-features = ["edition2021"]
+
 [package]
 name = "allocator"
 version = "0.1.0"
 authors = ["Sam Leffler <sleffler@google.com>"]
-edition = "2018"
+edition = "2021"

 [dependencies]
 linked_list_allocator = { version = "0.9", default-features = false, features = ["const_mut_refs"] }
--- a/apps/system/components/kata-os-common/src/capdl/Cargo.toml
+++ b/apps/system/components/kata-os-common/src/capdl/Cargo.toml
@@ -1,7 +1,9 @@
+cargo-features = ["edition2021"]
+
 [package]
 name = "capdl"
 version = "0.1.0"
-edition = "2018"
+edition = "2021"
 build = "build.rs"

 [build-dependencies]
--- a/apps/system/components/kata-os-common/src/logger/Cargo.toml
+++ b/apps/system/components/kata-os-common/src/logger/Cargo.toml
@@ -1,7 +1,9 @@
+cargo-features = ["edition2021"]
+
 [package]
 name = "logger"
 version = "0.1.0"
-edition = "2018"
+edition = "2021"

 [dependencies]
 arrayvec = { version = "0.7", default-features = false }
--- a/apps/system/components/kata-os-common/src/model/Cargo.toml
+++ b/apps/system/components/kata-os-common/src/model/Cargo.toml
@@ -1,7 +1,9 @@
+cargo-features = ["edition2021"]
+
 [package]
 name = "model"
 version = "0.1.0"
-edition = "2018"
+edition = "2021"
 build = "build.rs"

 [build-dependencies]
--- a/apps/system/components/kata-os-common/src/panic/Cargo.toml
+++ b/apps/system/components/kata-os-common/src/panic/Cargo.toml
@@ -1,7 +1,9 @@
+cargo-features = ["edition2021"]
+
 [package]
 name = "panic"
 version = "0.1.0"
-edition = "2018"
+edition = "2021"

 [dependencies]
 log = "0.4"
--- a/apps/system/components/kata-os-common/src/sel4-config/Cargo.toml
+++ b/apps/system/components/kata-os-common/src/sel4-config/Cargo.toml
@@ -1,7 +1,9 @@
+cargo-features = ["edition2021"]
+
 [package]
 name = "sel4-config"
 version = "0.1.0"
-edition = "2018"
+edition = "2021"
 description = "build glue for seL4 kernel configuration"

 [lib]
--- a/apps/system/components/kata-os-common/src/sel4-sys/Cargo.toml
+++ b/apps/system/components/kata-os-common/src/sel4-sys/Cargo.toml
@@ -1,3 +1,5 @@
+cargo-features = ["edition2021"]
+
 # Copyright (c) 2015 The Robigalia Project Developers
 # TBD: Google copyright
 # Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
@@ -8,7 +10,7 @@
 [package]
 name = "sel4-sys"
 version = "0.1.0"
-edition = "2018"
+edition = "2021"
 authors = ["Corey Richardson <corey@octayn.net>", "Sam Leffler <sleffler@google.com>"]
 description = "Rust interface to the seL4 kernel"
 documentation = "fixme"
--- a/apps/system/components/kata-os-common/src/slot-allocator/Cargo.toml
+++ b/apps/system/components/kata-os-common/src/slot-allocator/Cargo.toml
@@ -1,8 +1,10 @@
+cargo-features = ["edition2021"]
+
 [package]
 name = "slot-allocator"
 version = "0.1.0"
 authors = ["Sam Leffler <sleffler@google.com>"]
-edition = "2018"
+edition = "2021"

 [dependencies]
 # TODO(sleffler): v1.0 requires rust edition2021