From 5ecb53879e6c1c02565914a6f83281515e304b5f Mon Sep 17 00:00:00 2001 From: Changyuan Lyu Date: Fri, 6 Mar 2026 17:15:59 -0800 Subject: [PATCH 1/3] fix: remove deprecated 'authors' from Cargo.toml Signed-off-by: Changyuan Lyu --- Cargo.toml | 1 - alioth-cli/Cargo.toml | 1 - alioth-macros/Cargo.toml | 1 - alioth/Cargo.toml | 1 - serde-aco-derive/Cargo.toml | 1 - serde-aco/Cargo.toml | 1 - 6 files changed, 6 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 8e77e6b0..82f42569 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -9,7 +9,6 @@ members = [ resolver = "2" [workspace.package] -authors = ["Changyuan Lyu "] license = "Apache-2.0" repository = "https://github.com/google/alioth" edition = "2024" diff --git a/alioth-cli/Cargo.toml b/alioth-cli/Cargo.toml index 5558ab3f..0d8e0d28 100644 --- a/alioth-cli/Cargo.toml +++ b/alioth-cli/Cargo.toml @@ -4,7 +4,6 @@ version = "0.11.0" edition.workspace = true description = "Command-line interface for Alioth, an experimental Type-2 hypervisor." repository.workspace = true -authors.workspace = true license.workspace = true readme = "../README.md" diff --git a/alioth-macros/Cargo.toml b/alioth-macros/Cargo.toml index 5b6f04ea..445ebdac 100644 --- a/alioth-macros/Cargo.toml +++ b/alioth-macros/Cargo.toml @@ -4,7 +4,6 @@ version = "0.7.0" edition.workspace = true description = "Proc macros for Alioth" repository.workspace = true -authors.workspace = true license.workspace = true [lib] diff --git a/alioth/Cargo.toml b/alioth/Cargo.toml index 9c26ee6e..d97f2aff 100644 --- a/alioth/Cargo.toml +++ b/alioth/Cargo.toml @@ -4,7 +4,6 @@ version = "0.11.0" edition.workspace = true description = "Core library for Alioth, an experimental Type-2 hypervisor." repository.workspace = true -authors.workspace = true license.workspace = true [features] diff --git a/serde-aco-derive/Cargo.toml b/serde-aco-derive/Cargo.toml index 0e3e255b..201aa46e 100644 --- a/serde-aco-derive/Cargo.toml +++ b/serde-aco-derive/Cargo.toml @@ -1,6 +1,5 @@ [package] name = "serde-aco-derive" -authors.workspace = true license.workspace = true description = "Proc macros for serde-aco" repository.workspace = true diff --git a/serde-aco/Cargo.toml b/serde-aco/Cargo.toml index fce683b8..c4bd9a53 100644 --- a/serde-aco/Cargo.toml +++ b/serde-aco/Cargo.toml @@ -3,7 +3,6 @@ name = "serde-aco" version = "0.10.0" edition.workspace = true description = "Serialization and deserialization library for Alioth command-line options." -authors.workspace = true license.workspace = true repository.workspace = true From 942dd6aa7b095569acd98ac0ccda1f1921a874ba Mon Sep 17 00:00:00 2001 From: Changyuan Lyu Date: Fri, 6 Mar 2026 17:17:10 -0800 Subject: [PATCH 2/3] fix: upgrade workspace Cargo.toml resolver to V3 Signed-off-by: Changyuan Lyu --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index 82f42569..c4ec886c 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -6,7 +6,7 @@ members = [ "serde-aco", "serde-aco-derive", ] -resolver = "2" +resolver = "3" [workspace.package] license = "Apache-2.0" From 86fd03c2f1b3ace996a48f89a905f4051d98cd87 Mon Sep 17 00:00:00 2001 From: Changyuan Lyu Date: Fri, 6 Mar 2026 17:21:25 -0800 Subject: [PATCH 3/3] style: format toml files Signed-off-by: Changyuan Lyu --- Cargo.toml | 42 ++++++++++++++++++------------------- alioth-cli/Cargo.toml | 20 +++++++++--------- alioth-macros/Cargo.toml | 2 +- alioth/Cargo.toml | 20 +++++++++--------- rust-toolchain.toml | 2 +- serde-aco-derive/Cargo.toml | 10 ++++----- serde-aco/Cargo.toml | 2 +- 7 files changed, 49 insertions(+), 49 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index c4ec886c..b7006ceb 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,39 +1,39 @@ [workspace] +resolver = "3" members = [ - "alioth", - "alioth-cli", - "alioth-macros", - "serde-aco", - "serde-aco-derive", + "alioth", + "alioth-cli", + "alioth-macros", + "serde-aco", + "serde-aco-derive", ] -resolver = "3" [workspace.package] -license = "Apache-2.0" -repository = "https://github.com/google/alioth" edition = "2024" +repository = "https://github.com/google/alioth" +license = "Apache-2.0" [workspace.dependencies] -parking_lot = { version = "0.12", features = ["hardware-lock-elision"] } -serde = { version = "1.0", features = ["derive"] } -snafu = "0.8.9" -alioth-macros = { version = "0.7.0", path = "alioth-macros" } -alioth = { version = "0.11.0", path = "alioth" } +alioth = { path = "alioth", version = "0.11.0" } +alioth-macros = { path = "alioth-macros", version = "0.7.0" } +assert_matches = "1" ctor = "0.6" flexi_logger = "0.31" -serde-aco = { version = "0.10.0", path = "serde-aco" } -serde-aco-derive = { version = "0.7.0", path = "serde-aco-derive" } -assert_matches = "1" +parking_lot = { version = "0.12", features = ["hardware-lock-elision"] } +pretty_assertions = "1" proc-macro2 = "1" -syn = { version = "2", features = ["full"] } quote = { version = "1" } rstest = "0.26" +serde = { version = "1.0", features = ["derive"] } +serde-aco = { path = "serde-aco", version = "0.10.0" } +serde-aco-derive = { path = "serde-aco-derive", version = "0.7.0" } +snafu = "0.8.9" +syn = { version = "2", features = ["full"] } tempfile = "3" -pretty_assertions = "1" -zerocopy = { version = "0.8.40", features = ["derive", "alloc"] } +zerocopy = { version = "0.8.40", features = ["alloc", "derive"] } [profile.release] -lto = true -codegen-units = 1 opt-level = 3 strip = true +lto = true +codegen-units = 1 diff --git a/alioth-cli/Cargo.toml b/alioth-cli/Cargo.toml index 0d8e0d28..d2393c5a 100644 --- a/alioth-cli/Cargo.toml +++ b/alioth-cli/Cargo.toml @@ -3,27 +3,27 @@ name = "alioth-cli" version = "0.11.0" edition.workspace = true description = "Command-line interface for Alioth, an experimental Type-2 hypervisor." +readme = "../README.md" repository.workspace = true license.workspace = true -readme = "../README.md" + +[[bin]] +name = "alioth" +path = "src/main.rs" [dependencies] -log = "0.4" -flexi_logger.workspace = true -clap = { version = "4", features = ["derive"] } -snafu.workspace = true alioth.workspace = true +clap = { version = "4", features = ["derive"] } +flexi_logger.workspace = true +log = "0.4" miniz_oxide = { version = "0.9", features = ["simd"] } serde.workspace = true serde-aco.workspace = true +snafu.workspace = true zerocopy.workspace = true -[[bin]] -path = "src/main.rs" -name = "alioth" - [dev-dependencies] assert_matches.workspace = true ctor.workspace = true -rstest.workspace = true pretty_assertions.workspace = true +rstest.workspace = true diff --git a/alioth-macros/Cargo.toml b/alioth-macros/Cargo.toml index 445ebdac..e5039147 100644 --- a/alioth-macros/Cargo.toml +++ b/alioth-macros/Cargo.toml @@ -10,5 +10,5 @@ license.workspace = true proc-macro = true [dependencies] -syn.workspace = true quote.workspace = true +syn.workspace = true diff --git a/alioth/Cargo.toml b/alioth/Cargo.toml index d97f2aff..abf6d904 100644 --- a/alioth/Cargo.toml +++ b/alioth/Cargo.toml @@ -6,28 +6,28 @@ description = "Core library for Alioth, an experimental Type-2 hypervisor." repository.workspace = true license.workspace = true -[features] -test-hv = [] - [dependencies] -bitflags = "2.11.0" +alioth-macros.workspace = true bitfield = "0.19.4" -log = "0.4" -mio = { version = "1", features = ["os-poll", "os-ext", "net"] } +bitflags = "2.11.0" libc = "0.2.182" +log = "0.4" +mio = { version = "1", features = ["net", "os-ext", "os-poll"] } parking_lot.workspace = true -alioth-macros.workspace = true serde.workspace = true serde-aco.workspace = true snafu.workspace = true zerocopy.workspace = true -[target.'cfg(target_os = "linux")'.dependencies] -io-uring = "0.7" - [dev-dependencies] assert_matches.workspace = true ctor.workspace = true flexi_logger.workspace = true rstest.workspace = true tempfile.workspace = true + +[target.'cfg(target_os = "linux")'.dependencies] +io-uring = "0.7" + +[features] +test-hv = [] diff --git a/rust-toolchain.toml b/rust-toolchain.toml index 31578d3b..292fe499 100644 --- a/rust-toolchain.toml +++ b/rust-toolchain.toml @@ -1,2 +1,2 @@ [toolchain] -channel = "stable" \ No newline at end of file +channel = "stable" diff --git a/serde-aco-derive/Cargo.toml b/serde-aco-derive/Cargo.toml index 201aa46e..a49ad07d 100644 --- a/serde-aco-derive/Cargo.toml +++ b/serde-aco-derive/Cargo.toml @@ -1,15 +1,15 @@ [package] name = "serde-aco-derive" -license.workspace = true -description = "Proc macros for serde-aco" -repository.workspace = true version = "0.7.0" edition.workspace = true +description = "Proc macros for serde-aco" +repository.workspace = true +license.workspace = true [lib] proc-macro = true [dependencies] -syn.workspace = true -quote.workspace = true proc-macro2.workspace = true +quote.workspace = true +syn.workspace = true diff --git a/serde-aco/Cargo.toml b/serde-aco/Cargo.toml index c4bd9a53..d49568fd 100644 --- a/serde-aco/Cargo.toml +++ b/serde-aco/Cargo.toml @@ -3,8 +3,8 @@ name = "serde-aco" version = "0.10.0" edition.workspace = true description = "Serialization and deserialization library for Alioth command-line options." -license.workspace = true repository.workspace = true +license.workspace = true [dependencies] serde.workspace = true