Remove unecessary instances of default-features = false

Signed-off-by: Nick Spinale <[email protected]>
seL4 · Oct 31, 2024 · 66c726d · 66c726d
1 parent df4495f
commit 66c726d
Show file tree

Hide file tree

Showing 24 changed files with 24 additions and 44 deletions.
diff --git a/crates/examples/microkit/banscii/pds/artist/Cargo.nix b/crates/examples/microkit/banscii/pds/artist/Cargo.nix
@@ -14,7 +14,7 @@ mk {
       sel4-microkit-message
       banscii-artist-interface-types
     ;
-    sel4-microkit = localCrates.sel4-microkit // { default-features = false; features = [ "alloc" ]; };
+    sel4-microkit = localCrates.sel4-microkit // { features = [ "alloc" ]; };
     sel4-externally-shared = localCrates.sel4-externally-shared // { features = [ "unstable" ]; };
   };
   build-dependencies = {

diff --git a/crates/examples/microkit/banscii/pds/artist/Cargo.toml b/crates/examples/microkit/banscii/pds/artist/Cargo.toml
@@ -20,12 +20,8 @@ license = "BSD-2-Clause"
 banscii-artist-interface-types = { path = "interface-types" }
 rsa = { version = "0.9.6", default-features = false, features = ["pem", "sha2"] }
 sel4-externally-shared = { path = "../../../../../sel4-externally-shared", features = ["unstable"] }
+sel4-microkit = { path = "../../../../../sel4-microkit", features = ["alloc"] }
 sel4-microkit-message = { path = "../../../../../sel4-microkit/message" }
 
-[dependencies.sel4-microkit]
-path = "../../../../../sel4-microkit"
-default-features = false
-features = ["alloc"]
-
 [build-dependencies]
 rsa = "0.9.6"
diff --git a/crates/examples/microkit/banscii/pds/assistant/Cargo.nix b/crates/examples/microkit/banscii/pds/assistant/Cargo.nix
@@ -18,6 +18,6 @@ mk {
       banscii-artist-interface-types
     ;
     sel4-externally-shared = localCrates.sel4-externally-shared // { features = [ "unstable" ]; };
-    sel4-microkit = localCrates.sel4-microkit // { default-features = false; features = [ "alloc" ]; };
+    sel4-microkit = localCrates.sel4-microkit // { features = [ "alloc" ]; };
   };
 }
diff --git a/crates/examples/microkit/banscii/pds/assistant/Cargo.toml b/crates/examples/microkit/banscii/pds/assistant/Cargo.toml
@@ -22,10 +22,6 @@ banscii-assistant-core = { path = "core" }
 embedded-hal-nb = "1.0"
 hex = { version = "0.4.3", default-features = false, features = ["alloc"] }
 sel4-externally-shared = { path = "../../../../../sel4-externally-shared", features = ["unstable"] }
+sel4-microkit = { path = "../../../../../sel4-microkit", features = ["alloc"] }
 sel4-microkit-driver-adapters = { path = "../../../../../sel4-microkit/driver-adapters" }
 sel4-microkit-message = { path = "../../../../../sel4-microkit/message" }
-
-[dependencies.sel4-microkit]
-path = "../../../../../sel4-microkit"
-default-features = false
-features = ["alloc"]
diff --git a/crates/examples/microkit/banscii/pds/serial-driver/Cargo.nix b/crates/examples/microkit/banscii/pds/serial-driver/Cargo.nix
@@ -10,10 +10,10 @@ mk {
   package.name = "banscii-serial-driver";
   dependencies = {
     inherit (localCrates)
+      sel4-microkit
       sel4-microkit-message
       sel4-microkit-driver-adapters
     ;
-    sel4-microkit = localCrates.sel4-microkit // { default-features = false; };
     sel4-pl011-driver = localCrates.sel4-pl011-driver // { optional = true; };
   };
   features = {

diff --git a/crates/examples/microkit/banscii/pds/serial-driver/Cargo.toml b/crates/examples/microkit/banscii/pds/serial-driver/Cargo.toml
@@ -20,7 +20,7 @@ license = "BSD-2-Clause"
 board-qemu_virt_aarch64 = ["sel4-pl011-driver"]
 
 [dependencies]
-sel4-microkit = { path = "../../../../../sel4-microkit", default-features = false }
+sel4-microkit = { path = "../../../../../sel4-microkit" }
 sel4-microkit-driver-adapters = { path = "../../../../../sel4-microkit/driver-adapters" }
 sel4-microkit-message = { path = "../../../../../sel4-microkit/message" }
 sel4-pl011-driver = { path = "../../../../../drivers/pl011", optional = true }
diff --git a/crates/examples/microkit/http-server/pds/pl031-driver/Cargo.nix b/crates/examples/microkit/http-server/pds/pl031-driver/Cargo.nix
@@ -11,8 +11,8 @@ mk {
   dependencies = {
     inherit (localCrates)
       sel4-pl031-driver
+      sel4-microkit
       sel4-microkit-driver-adapters
     ;
-    sel4-microkit = localCrates.sel4-microkit // { default-features = false; };
   };
 }
diff --git a/crates/examples/microkit/http-server/pds/pl031-driver/Cargo.toml b/crates/examples/microkit/http-server/pds/pl031-driver/Cargo.toml
@@ -17,6 +17,6 @@ edition = "2021"
 license = "BSD-2-Clause"
 
 [dependencies]
-sel4-microkit = { path = "../../../../../sel4-microkit", default-features = false }
+sel4-microkit = { path = "../../../../../sel4-microkit" }
 sel4-microkit-driver-adapters = { path = "../../../../../sel4-microkit/driver-adapters" }
 sel4-pl031-driver = { path = "../../../../../drivers/pl031" }
diff --git a/crates/examples/microkit/http-server/pds/server/Cargo.nix b/crates/examples/microkit/http-server/pds/server/Cargo.nix
@@ -55,7 +55,7 @@ mk {
       ];
     };
 
-    sel4-microkit = localCrates.sel4-microkit // { default-features = false; features = [ "alloc" ]; };
+    sel4-microkit = localCrates.sel4-microkit // { features = [ "alloc" ]; };
     sel4-externally-shared = localCrates.sel4-externally-shared // { features = [ "unstable" ]; };
 
     microkit-http-server-example-server-core = localCrates.microkit-http-server-example-server-core // {

diff --git a/crates/examples/microkit/http-server/pds/server/Cargo.toml b/crates/examples/microkit/http-server/pds/server/Cargo.toml
@@ -33,6 +33,7 @@ sel4-driver-interfaces = { path = "../../../../../sel4-driver-interfaces" }
 sel4-externally-shared = { path = "../../../../../sel4-externally-shared", features = ["unstable"] }
 sel4-immediate-sync-once-cell = { path = "../../../../../sel4-immediate-sync-once-cell" }
 sel4-logging = { path = "../../../../../sel4-logging" }
+sel4-microkit = { path = "../../../../../sel4-microkit", features = ["alloc"] }
 sel4-microkit-driver-adapters = { path = "../../../../../sel4-microkit/driver-adapters" }
 sel4-microkit-message = { path = "../../../../../sel4-microkit/message" }
 sel4-newlib = { path = "../../../../../sel4-newlib", features = ["nosys", "all-symbols"] }
@@ -44,11 +45,6 @@ sel4-sync = { path = "../../../../../sel4-sync" }
 [dependencies.sel4-async-single-threaded-executor]
 path = "../../../../../sel4-async/single-threaded-executor"
 
-[dependencies.sel4-microkit]
-path = "../../../../../sel4-microkit"
-default-features = false
-features = ["alloc"]
-
 [dependencies.sel4-shared-ring-buffer-block-io-types]
 path = "../../../../../sel4-shared-ring-buffer/block-io/types"
 

diff --git a/crates/examples/microkit/http-server/pds/sp804-driver/Cargo.nix b/crates/examples/microkit/http-server/pds/sp804-driver/Cargo.nix
@@ -10,11 +10,11 @@ mk {
   package.name = "microkit-http-server-example-sp804-driver";
   dependencies = {
     inherit (localCrates)
+      sel4-microkit
       sel4-microkit-message
       sel4-microkit-driver-adapters
       sel4-driver-interfaces
       sel4-sp804-driver
     ;
-    sel4-microkit = localCrates.sel4-microkit // { default-features = false; };
   };
 }
diff --git a/crates/examples/microkit/http-server/pds/sp804-driver/Cargo.toml b/crates/examples/microkit/http-server/pds/sp804-driver/Cargo.toml
@@ -18,7 +18,7 @@ license = "BSD-2-Clause"
 
 [dependencies]
 sel4-driver-interfaces = { path = "../../../../../sel4-driver-interfaces" }
-sel4-microkit = { path = "../../../../../sel4-microkit", default-features = false }
+sel4-microkit = { path = "../../../../../sel4-microkit" }
 sel4-microkit-driver-adapters = { path = "../../../../../sel4-microkit/driver-adapters" }
 sel4-microkit-message = { path = "../../../../../sel4-microkit/message" }
 sel4-sp804-driver = { path = "../../../../../drivers/sp804" }
diff --git a/crates/examples/microkit/http-server/pds/virtio-blk-driver/Cargo.nix b/crates/examples/microkit/http-server/pds/virtio-blk-driver/Cargo.nix
@@ -14,6 +14,7 @@ mk {
     virtio-drivers = virtioDriversWith [];
 
     inherit (localCrates)
+      sel4-microkit
       sel4-microkit-message
       sel4
       sel4-logging
@@ -28,6 +29,5 @@ mk {
     ;
 
     sel4-externally-shared = localCrates.sel4-externally-shared // { features = [ "unstable" ]; };
-    sel4-microkit = localCrates.sel4-microkit // { default-features = false; };
   };
 }
diff --git a/crates/examples/microkit/http-server/pds/virtio-blk-driver/Cargo.toml b/crates/examples/microkit/http-server/pds/virtio-blk-driver/Cargo.toml
@@ -24,7 +24,7 @@ sel4-driver-interfaces = { path = "../../../../../sel4-driver-interfaces" }
 sel4-externally-shared = { path = "../../../../../sel4-externally-shared", features = ["unstable"] }
 sel4-immediate-sync-once-cell = { path = "../../../../../sel4-immediate-sync-once-cell" }
 sel4-logging = { path = "../../../../../sel4-logging" }
-sel4-microkit = { path = "../../../../../sel4-microkit", default-features = false }
+sel4-microkit = { path = "../../../../../sel4-microkit" }
 sel4-microkit-driver-adapters = { path = "../../../../../sel4-microkit/driver-adapters" }
 sel4-microkit-message = { path = "../../../../../sel4-microkit/message" }
 sel4-shared-ring-buffer = { path = "../../../../../sel4-shared-ring-buffer" }

diff --git a/crates/examples/microkit/http-server/pds/virtio-net-driver/Cargo.nix b/crates/examples/microkit/http-server/pds/virtio-net-driver/Cargo.nix
@@ -14,6 +14,7 @@ mk {
     virtio-drivers = virtioDriversWith [ "alloc" ];
 
     inherit (localCrates)
+      sel4-microkit
       sel4-microkit-message
       sel4-microkit-driver-adapters
       sel4
@@ -26,6 +27,5 @@ mk {
     ;
 
     sel4-externally-shared = localCrates.sel4-externally-shared // { features = [ "unstable" ]; };
-    sel4-microkit = localCrates.sel4-microkit // { default-features = false; };
   };
 }
diff --git a/crates/examples/microkit/http-server/pds/virtio-net-driver/Cargo.toml b/crates/examples/microkit/http-server/pds/virtio-net-driver/Cargo.toml
@@ -23,7 +23,7 @@ sel4-bounce-buffer-allocator = { path = "../../../../../sel4-bounce-buffer-alloc
 sel4-externally-shared = { path = "../../../../../sel4-externally-shared", features = ["unstable"] }
 sel4-immediate-sync-once-cell = { path = "../../../../../sel4-immediate-sync-once-cell" }
 sel4-logging = { path = "../../../../../sel4-logging" }
-sel4-microkit = { path = "../../../../../sel4-microkit", default-features = false }
+sel4-microkit = { path = "../../../../../sel4-microkit" }
 sel4-microkit-driver-adapters = { path = "../../../../../sel4-microkit/driver-adapters" }
 sel4-microkit-message = { path = "../../../../../sel4-microkit/message" }
 sel4-shared-ring-buffer = { path = "../../../../../sel4-shared-ring-buffer" }

diff --git a/crates/private/tests/microkit/minimal/Cargo.nix b/crates/private/tests/microkit/minimal/Cargo.nix
@@ -10,7 +10,7 @@ mk {
   package.name = "tests-microkit-minimal";
   dependencies = {
     inherit (localCrates)
+      sel4-microkit
     ;
-    sel4-microkit = localCrates.sel4-microkit // { default-features = false; };
   };
 }
diff --git a/crates/private/tests/microkit/minimal/Cargo.toml b/crates/private/tests/microkit/minimal/Cargo.toml
@@ -17,4 +17,4 @@ edition = "2021"
 license = "BSD-2-Clause"
 
 [dependencies]
-sel4-microkit = { path = "../../../../sel4-microkit", default-features = false }
+sel4-microkit = { path = "../../../../sel4-microkit" }
diff --git a/crates/sel4-capdl-initializer/Cargo.nix b/crates/sel4-capdl-initializer/Cargo.nix
@@ -18,7 +18,7 @@ mk {
       sel4-logging
       sel4-sync
     ;
-    sel4-root-task = localCrates.sel4-root-task // { default-features = false; features = [ "single-threaded" ]; };
+    sel4-root-task = localCrates.sel4-root-task // { features = [ "single-threaded" ]; };
     sel4-capdl-initializer-types = localCrates.sel4-capdl-initializer-types // { features = [ "alloc" "serde" "deflate" ]; };
   };
   # features = {

diff --git a/crates/sel4-capdl-initializer/Cargo.toml b/crates/sel4-capdl-initializer/Cargo.toml
@@ -24,9 +24,5 @@ sel4-capdl-initializer-core = { path = "core" }
 sel4-capdl-initializer-types = { path = "types", features = ["alloc", "serde", "deflate"] }
 sel4-dlmalloc = { path = "../sel4-dlmalloc" }
 sel4-logging = { path = "../sel4-logging" }
+sel4-root-task = { path = "../sel4-root-task", features = ["single-threaded"] }
 sel4-sync = { path = "../sel4-sync" }
-
-[dependencies.sel4-root-task]
-path = "../sel4-root-task"
-default-features = false
-features = ["single-threaded"]
diff --git a/crates/sel4-capdl-initializer/with-embedded-spec/Cargo.nix b/crates/sel4-capdl-initializer/with-embedded-spec/Cargo.nix
@@ -16,7 +16,7 @@ mk {
       sel4
       sel4-logging
     ;
-    sel4-root-task = localCrates.sel4-root-task // { default-features = false; features = [ "single-threaded" ]; };
+    sel4-root-task = localCrates.sel4-root-task // { features = [ "single-threaded" ]; };
   };
   build-dependencies = {
     inherit (localCrates)

diff --git a/crates/sel4-capdl-initializer/with-embedded-spec/Cargo.toml b/crates/sel4-capdl-initializer/with-embedded-spec/Cargo.toml
@@ -28,11 +28,7 @@ sel4-capdl-initializer-core = { path = "../core" }
 sel4-capdl-initializer-types = { path = "../types" }
 sel4-capdl-initializer-with-embedded-spec-embedded-spec = { path = "embedded-spec" }
 sel4-logging = { path = "../../sel4-logging" }
-
-[dependencies.sel4-root-task]
-path = "../../sel4-root-task"
-default-features = false
-features = ["single-threaded"]
+sel4-root-task = { path = "../../sel4-root-task", features = ["single-threaded"] }
 
 [build-dependencies.sel4-capdl-initializer-with-embedded-spec-embedded-spec-validate]
 path = "embedded-spec/validate"
diff --git a/crates/sel4-microkit/driver-adapters/Cargo.nix b/crates/sel4-microkit/driver-adapters/Cargo.nix
@@ -21,12 +21,12 @@ mk {
   } // (with localCrates; {
     inherit
       sel4-driver-interfaces
+      sel4-microkit
       sel4-microkit-message
       sel4-shared-ring-buffer
       sel4-bounce-buffer-allocator
     ;
     sel4-externally-shared = sel4-externally-shared // { features = [ "unstable" ]; };
-    sel4-microkit = sel4-microkit // { default-features = false; };
   });
   features = {
     # TODO

diff --git a/crates/sel4-microkit/driver-adapters/Cargo.toml b/crates/sel4-microkit/driver-adapters/Cargo.toml
@@ -25,7 +25,7 @@ rtcc = "0.3.2"
 sel4-bounce-buffer-allocator = { path = "../../sel4-bounce-buffer-allocator" }
 sel4-driver-interfaces = { path = "../../sel4-driver-interfaces" }
 sel4-externally-shared = { path = "../../sel4-externally-shared", features = ["unstable"] }
-sel4-microkit = { path = "..", default-features = false }
+sel4-microkit = { path = ".." }
 sel4-microkit-message = { path = "../message" }
 sel4-shared-ring-buffer = { path = "../../sel4-shared-ring-buffer" }
 serde = { version = "1.0.147", default-features = false }