diff --git a/Cargo.toml b/Cargo.toml index 8e77e6b0..b7006ceb 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,40 +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 = "2" [workspace.package] -authors = ["Changyuan Lyu "] -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 5558ab3f..d2393c5a 100644 --- a/alioth-cli/Cargo.toml +++ b/alioth-cli/Cargo.toml @@ -3,28 +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 -authors.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 5b6f04ea..e5039147 100644 --- a/alioth-macros/Cargo.toml +++ b/alioth-macros/Cargo.toml @@ -4,12 +4,11 @@ version = "0.7.0" edition.workspace = true description = "Proc macros for Alioth" repository.workspace = true -authors.workspace = true license.workspace = true [lib] proc-macro = true [dependencies] -syn.workspace = true quote.workspace = true +syn.workspace = true diff --git a/alioth/Cargo.toml b/alioth/Cargo.toml index 9c26ee6e..abf6d904 100644 --- a/alioth/Cargo.toml +++ b/alioth/Cargo.toml @@ -4,31 +4,30 @@ 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] -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 0e3e255b..a49ad07d 100644 --- a/serde-aco-derive/Cargo.toml +++ b/serde-aco-derive/Cargo.toml @@ -1,16 +1,15 @@ [package] name = "serde-aco-derive" -authors.workspace = true -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 fce683b8..d49568fd 100644 --- a/serde-aco/Cargo.toml +++ b/serde-aco/Cargo.toml @@ -3,9 +3,8 @@ 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 +license.workspace = true [dependencies] serde.workspace = true