From fb4f51489e1cd04607f7a29a2f83a73e5077d28e Mon Sep 17 00:00:00 2001 From: Eliza Weisman Date: Sat, 4 Jan 2025 12:21:48 -0800 Subject: [PATCH] chore: s/default_features/default-features (#502) Apparently `default_features` is deprecated and will be removed in Rust 2024. So fix that, I guess. --- Cargo.toml | 8 ++++---- alloc/Cargo.toml | 2 +- hal-core/Cargo.toml | 2 +- hal-x86_64/Cargo.toml | 4 ++-- maitake-sync/Cargo.toml | 8 ++++---- maitake/Cargo.toml | 6 +++--- pci/Cargo.toml | 4 ++-- trace/Cargo.toml | 4 ++-- util/Cargo.toml | 4 ++-- 9 files changed, 21 insertions(+), 21 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 010eeedf..5e1041de 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -16,7 +16,7 @@ members = [ resolver = "2" [workspace.dependencies] -thiserror = { version = "2.0.9", default_features = false } +thiserror = { version = "2.0.9", default-features = false } [package] name = "mycelium-kernel" @@ -46,7 +46,7 @@ mycelium-pci = { path = "pci" } mycelium-util = { path = "util" } mycelium-trace = { path = "trace", features = ["embedded-graphics"] } rand_xoshiro = "0.6" -rand = { version = "0.8", default_features = false } +rand = { version = "0.8", default-features = false } rlibc = "1.0" # NOTE FOR FUTURE ELIZAS WHO ARE MESSING WITH THIS: the bootloader crate's build # script is not that good, and breaks if you put this in `cfg(...).dependencies` @@ -59,7 +59,7 @@ futures-util = { version = "0.3", default-features = false, features = ["async-a # Miri-compatible version of `once_cell`. once_cell = { version = "1.15.0", default-features = false } pc-keyboard = "0.6.1" -thingbuf = { version = "0.1.4", default_features = false, features = ["static"] } +thingbuf = { version = "0.1.4", default-features = false, features = ["static"] } [dev-dependencies] mycotest = { path = "mycotest", features = ["runner"] } @@ -70,7 +70,7 @@ yaxpeax-x86 = { version = "1.0.0", default-features = false, features = ["fmt"] yaxpeax-arch = { version = "0.2.0", default-features = false } [dependencies.tracing] -default_features = false +default-features = false features = ["attributes", "alloc"] git = "https://github.com/tokio-rs/tracing" diff --git a/alloc/Cargo.toml b/alloc/Cargo.toml index 08ced8bc..d35b5fe2 100644 --- a/alloc/Cargo.toml +++ b/alloc/Cargo.toml @@ -13,7 +13,7 @@ bump = [] buddy = ["hal-core", "mycelium-util", "tracing"] [dependencies] -tracing = { git = "https://github.com/tokio-rs/tracing", default_features = false, optional = true } +tracing = { git = "https://github.com/tokio-rs/tracing", default-features = false, optional = true } mycelium-util = { path = "../util", optional = true } hal-core = { path = "../hal-core", optional = true } diff --git a/hal-core/Cargo.toml b/hal-core/Cargo.toml index 1e872026..018ea636 100644 --- a/hal-core/Cargo.toml +++ b/hal-core/Cargo.toml @@ -9,7 +9,7 @@ rust-version = "1.81.0" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -tracing = { git = "https://github.com/tokio-rs/tracing", default_features = false } +tracing = { git = "https://github.com/tokio-rs/tracing", default-features = false } thiserror = { workspace = true } maitake-sync = { path = "../maitake-sync", default-features = false } mycelium-util = { path = "../util" } diff --git a/hal-x86_64/Cargo.toml b/hal-x86_64/Cargo.toml index 2d243f70..6ecbaa41 100644 --- a/hal-x86_64/Cargo.toml +++ b/hal-x86_64/Cargo.toml @@ -18,10 +18,10 @@ maitake = { path = "../maitake" } mycelium-util = { path = "../util" } mycelium-trace = { path = "../trace" } mycotest = { path = "../mycotest"} -rand_core = { version = "0.6.4", default_features = false, optional = true } +rand_core = { version = "0.6.4", default-features = false, optional = true } raw-cpuid = "10.6.0" thiserror = { workspace = true } -tracing = { git = "https://github.com/tokio-rs/tracing", default_features = false, features = ["attributes"] } +tracing = { git = "https://github.com/tokio-rs/tracing", default-features = false, features = ["attributes"] } volatile = { version = "0.4.5", features = ["unstable"] } [dev-dependencies] diff --git a/maitake-sync/Cargo.toml b/maitake-sync/Cargo.toml index a26de68d..dc4a218b 100644 --- a/maitake-sync/Cargo.toml +++ b/maitake-sync/Cargo.toml @@ -35,20 +35,20 @@ cordyceps = { version = "0.3.0", path = "../cordyceps" } critical-section = { version = "1.1", optional = true } pin-project = "1" portable-atomic = "1.2" -tracing = { version = "0.1", default_features = false, optional = true } +tracing = { version = "0.1", default-features = false, optional = true } # this is a normal dependency, rather than a dev dependency, so that # `maitake-sync` may be used in other crates' loom tests as well (but only when # the cfg is enabled). [target.'cfg(loom)'.dependencies] -loom = { version = "0.7", default_features = false } -tracing = { version = "0.1", default_features = false } +loom = { version = "0.7", default-features = false } +tracing = { version = "0.1", default-features = false } [dev-dependencies] futures-util = "0.3" futures = "0.3" tokio-test = "0.4" -tracing = { version = "0.1", default_features = false, features = ["std"] } +tracing = { version = "0.1", default-features = false, features = ["std"] } tracing-subscriber = { version = "0.3.11", features = ["fmt", "env-filter"] } [target.'cfg(not(loom))'.dev-dependencies] diff --git a/maitake/Cargo.toml b/maitake/Cargo.toml index 28a611ac..8a37513b 100644 --- a/maitake/Cargo.toml +++ b/maitake/Cargo.toml @@ -46,13 +46,13 @@ portable-atomic = "1.2" [dependencies.tracing-02] package = "tracing" -default_features = false +default-features = false git = "https://github.com/tokio-rs/tracing" optional = true [dependencies.tracing-01] package = "tracing" -default_features = false +default-features = false version = "0.1.35" optional = true @@ -69,7 +69,7 @@ proptest = "1" [target.'cfg(loom)'.dev-dependencies] loom = { version = "0.7", features = ["futures", "checkpoint"] } -tracing_01 = { package = "tracing", version = "0.1", default_features = false } +tracing_01 = { package = "tracing", version = "0.1", default-features = false } tracing_subscriber_03 = { package = "tracing-subscriber", version = "0.3.11", features = ["fmt"] } [package.metadata.docs.rs] diff --git a/pci/Cargo.toml b/pci/Cargo.toml index 1dbeb918..d2335b3d 100644 --- a/pci/Cargo.toml +++ b/pci/Cargo.toml @@ -21,10 +21,10 @@ mycelium-bitfield = { path = "../bitfield" } hal-x86_64 = { path = "../hal-x86_64" } volatile = "0.4.5" pci-ids = "0.2.5" -hex = { version = "0.4.3", default_features = false } +hex = { version = "0.4.3", default-features = false } [dependencies.tracing] -default_features = false +default-features = false features = ["attributes", "alloc"] git = "https://github.com/tokio-rs/tracing" diff --git a/trace/Cargo.toml b/trace/Cargo.toml index 2abd4465..07607c37 100644 --- a/trace/Cargo.toml +++ b/trace/Cargo.toml @@ -13,8 +13,8 @@ default = ["embedded-graphics",] [dependencies] maitake = { path = "../maitake" } -tracing-core = {git = "https://github.com/tokio-rs/tracing", default_features = false } -tracing = { git = "https://github.com/tokio-rs/tracing", default_features = false } +tracing-core = {git = "https://github.com/tokio-rs/tracing", default-features = false } +tracing = { git = "https://github.com/tokio-rs/tracing", default-features = false } hal-core = { path = "../hal-core" } mycelium-util = { path = "../util" } embedded-graphics = { version = "0.7", optional = true } diff --git a/util/Cargo.toml b/util/Cargo.toml index 22aa6d85..f6c19054 100644 --- a/util/Cargo.toml +++ b/util/Cargo.toml @@ -14,7 +14,7 @@ alloc = ["cordyceps/alloc", "maitake-sync/alloc"] no-cache-pad = ["cordyceps/no-cache-pad", "maitake-sync/no-cache-pad"] [dependencies] -tracing = { git = "https://github.com/tokio-rs/tracing", default_features = false, features = ["attributes"] } +tracing = { git = "https://github.com/tokio-rs/tracing", default-features = false, features = ["attributes"] } cordyceps = { path = "../cordyceps", default-features = false } mycelium-bitfield = { path = "../bitfield", default-features = false } maitake-sync = { path = "../maitake-sync", default-features = false } @@ -22,7 +22,7 @@ maitake-sync = { path = "../maitake-sync", default-features = false } [dev-dependencies] proptest = "1" tracing-subscriber = { git = "https://github.com/tokio-rs/tracing", features = ["fmt", "env-filter"] } -tracing = { git = "https://github.com/tokio-rs/tracing", default_features = false, features = ["attributes", "std"] } +tracing = { git = "https://github.com/tokio-rs/tracing", default-features = false, features = ["attributes", "std"] } [target.'cfg(loom)'.dependencies] loom = "0.7"