Skip to content

Commit

Permalink
Filter out empty feature lists
Browse files Browse the repository at this point in the history
  • Loading branch information
nspin committed Aug 22, 2023
1 parent 0c11225 commit b673f46
Show file tree
Hide file tree
Showing 10 changed files with 23 additions and 22 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,4 @@ sel4-bounce-buffer-allocator = { path = "../../../../../sel4-bounce-buffer-alloc
sel4-externally-shared = { path = "../../../../../sel4-externally-shared" }
sel4-immediate-sync-once-cell = { path = "../../../../../sel4-immediate-sync-once-cell" }
sel4-sync = { path = "../../../../../sel4-sync" }
virtio-drivers = { version = "0.5.0", default-features = false, features = [] }
virtio-drivers = { version = "0.5.0", default-features = false }
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ sel4-shared-ring-buffer = { path = "../../../../../sel4-shared-ring-buffer" }
sel4-sync = { path = "../../../../../sel4-sync" }
sel4cp = { path = "../../../../../sel4cp", default-features = false }
sel4cp-http-server-example-virtio-hal-impl = { path = "../../helpers/virtio-hal-impl" }
virtio-drivers = { version = "0.5.0", default-features = false, features = [] }
virtio-drivers = { version = "0.5.0", default-features = false }

[dependencies.sel4-shared-ring-buffer-block-io-types]
path = "../../../../../sel4-shared-ring-buffer/block-io/types"
4 changes: 2 additions & 2 deletions crates/private/support/sel4-simple-task/rpc/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@ license = "BSD-2-Clause"
postcard = ["dep:serde", "dep:postcard"]

[dependencies]
postcard = { version = "1.0.2", default-features = false, features = [], optional = true }
postcard = { version = "1.0.2", default-features = false, optional = true }
sel4 = { path = "../../../../sel4" }
serde = { version = "1.0.147", default-features = false, features = [], optional = true }
serde = { version = "1.0.147", default-features = false, optional = true }
4 changes: 2 additions & 2 deletions crates/private/support/sel4-simple-task/runtime/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ default = ["serde_json", "alloc"]
serde_json = ["dep:serde_json"]

[dependencies]
postcard = { version = "1.0.2", default-features = false, features = [] }
postcard = { version = "1.0.2", default-features = false }
sel4 = { path = "../../../../sel4" }
sel4-backtrace = { path = "../../../../sel4-backtrace", features = ["unwinding", "postcard"] }
sel4-backtrace-simple = { path = "../../../../sel4-backtrace/simple" }
Expand All @@ -30,5 +30,5 @@ sel4-simple-task-runtime-config-types = { path = "./config/types" }
sel4-simple-task-runtime-macros = { path = "./macros" }
sel4-simple-task-threading = { path = "../threading" }
sel4-sync = { path = "../../../../sel4-sync" }
serde = { version = "1.0.147", default-features = false, features = [] }
serde = { version = "1.0.147", default-features = false }
serde_json = { version = "1.0.87", default-features = false, optional = true }
2 changes: 0 additions & 2 deletions crates/private/tests/root-task/mbedtls/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,11 @@ features = ["no_std_deps", "debug"]
git = "https://github.com/nspin/rust-mbedtls"
tag = "keep/6eef662dbf636d1ccf86078143b6854f"
default-features = false
features = []

[dependencies.mbedtls-sys-auto]
git = "https://github.com/nspin/rust-mbedtls"
tag = "keep/6eef662dbf636d1ccf86078143b6854f"
default-features = false
features = []

[dependencies.sel4-newlib]
path = "../../../../sel4-newlib"
Expand Down
4 changes: 2 additions & 2 deletions crates/sel4-backtrace/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@ unwinding = ["dep:unwinding"]

[dependencies]
cfg-if = "1.0.0"
postcard = { version = "1.0.2", default-features = false, features = [], optional = true }
postcard = { version = "1.0.2", default-features = false, optional = true }
sel4-backtrace-types = { path = "./types" }
serde = { version = "1.0.147", default-features = false, features = [], optional = true }
serde = { version = "1.0.147", default-features = false, optional = true }

[dependencies.unwinding]
version = "0.1.6"
Expand Down
2 changes: 1 addition & 1 deletion crates/sel4-backtrace/types/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ symbolize = ["addr2line", "fallible-iterator", "alloc"]
[dependencies]
cfg-if = "1.0.0"
fallible-iterator = { version = "0.2.0", default-features = false, optional = true }
postcard = { version = "1.0.2", default-features = false, features = [], optional = true }
postcard = { version = "1.0.2", default-features = false, optional = true }
serde = { version = "1.0.147", default-features = false, features = ["derive"], optional = true }

[dependencies.addr2line]
Expand Down
2 changes: 1 addition & 1 deletion crates/sel4-kernel-loader/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ aarch64-cpu = "9.0.0"
cfg-if = "1.0.0"
heapless = { version = "0.7.16", features = ["serde"] }
log = "0.4.17"
postcard = { version = "1.0.2", default-features = false, features = [] }
postcard = { version = "1.0.2", default-features = false }
psci = { version = "0.1.1", default-features = false }
sel4-config = { path = "../sel4/config" }
sel4-kernel-loader-payload-types = { path = "./payload-types", features = ["serde"] }
Expand Down
4 changes: 2 additions & 2 deletions crates/sel4cp/postcard/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ edition = "2021"
license = "BSD-2-Clause"

[dependencies]
postcard = { version = "1.0.2", default-features = false, features = [] }
postcard = { version = "1.0.2", default-features = false }
sel4 = { path = "../../sel4" }
sel4cp = { path = ".." }
serde = { version = "1.0.147", default-features = false, features = [] }
serde = { version = "1.0.147", default-features = false }
19 changes: 11 additions & 8 deletions hacking/nix/scope/generated-cargo-manifests/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,9 @@ let

cratePaths = lib.mapAttrs (name: path: { inherit name path; }) cratePathAttrs;

filterOutEmptyFeatureList = attrs:
builtins.removeAttrs attrs (lib.optional (attrs ? features && attrs.features == []) "features");

callCrate = { relativePath }:

newScope rec {
Expand Down Expand Up @@ -104,40 +107,40 @@ let
tag = "keep/6eef662dbf636d1ccf86078143b6854f";
};

mbedtlsWith = features: (mbedtlsSource // {
mbedtlsWith = features: filterOutEmptyFeatureList (mbedtlsSource // {
default-features = false;
features = [ "no_std_deps" ] ++ features;
});

mbedtlsSysAutoWith = features: (mbedtlsSource // {
mbedtlsSysAutoWith = features: filterOutEmptyFeatureList (mbedtlsSource // {
default-features = false;
inherit features;
});

mbedtlsPlatformSupportWith = features: (mbedtlsSource // {
mbedtlsPlatformSupportWith = features: filterOutEmptyFeatureList (mbedtlsSource // {
default-features = false;
inherit features;
});

serdeWith = features: {
serdeWith = features: filterOutEmptyFeatureList {
version = versions.serde;
default-features = false;
inherit features;
};

postcardWith = features: {
postcardWith = features: filterOutEmptyFeatureList {
version = versions.postcard;
default-features = false;
inherit features;
};

unwindingWith = features: {
unwindingWith = features: filterOutEmptyFeatureList {
version = versions.unwinding;
default-features = false;
features = [ "unwinder" "fde-custom" "hide-trace" ] ++ features;
};

smoltcpWith = features: {
smoltcpWith = features: filterOutEmptyFeatureList {
version = versions.smoltcp;
default-features = false;
features = smoltcpBaseProtosFeatures ++ features;
Expand Down Expand Up @@ -170,7 +173,7 @@ let
"packetmeta-id" "async"
];

virtioDriversWith = features: {
virtioDriversWith = features: filterOutEmptyFeatureList {
version = versions.virtio-drivers;
default-features = false;
inherit features;
Expand Down

0 comments on commit b673f46

Please sign in to comment.