Skip to content

Commit 802792b

Browse files
committed
compiler-builtins: Clean up features
Remove the `compiler-builtins` from default because it prevents testing via the default `cargo test` command. It made more sense as a default when `compiler-builtins` was a dependency that some crates added via crates.io, but is no longer needed The `rustc-dep-of-std` feature is also removed since it doesn't do anything notable.
1 parent 0760bc4 commit 802792b

File tree

3 files changed

+4
-10
lines changed

3 files changed

+4
-10
lines changed

library/alloc/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ bench = false
1616

1717
[dependencies]
1818
core = { path = "../core", public = true }
19-
compiler_builtins = { path = "../compiler-builtins/compiler-builtins", features = ["rustc-dep-of-std"] }
19+
compiler_builtins = { path = "../compiler-builtins/compiler-builtins", features = ["compiler-builtins"] }
2020

2121
[features]
2222
compiler-builtins-mem = ['compiler_builtins/mem']

library/compiler-builtins/builtins-shim/Cargo.toml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ test = false
3131
cc = { optional = true, version = "1.2" }
3232

3333
[features]
34-
default = ["compiler-builtins"]
34+
default = []
3535

3636
# Enable compilation of C code in compiler-rt, filling in some more optimized
3737
# implementations and also filling in unimplemented intrinsics
@@ -55,9 +55,6 @@ mem = []
5555
# compiler-rt implementations. Also used for testing
5656
mangled-names = []
5757

58-
# Only used in the compiler's build system
59-
rustc-dep-of-std = ["compiler-builtins"]
60-
6158
# This makes certain traits and function specializations public that
6259
# are not normally public but are required by the `builtins-test`
6360
unstable-public-internals = []

library/compiler-builtins/compiler-builtins/Cargo.toml

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ core = { path = "../../core", optional = true }
2727
cc = { optional = true, version = "1.2" }
2828

2929
[features]
30-
default = ["compiler-builtins"]
30+
default = []
3131

3232
# Enable compilation of C code in compiler-rt, filling in some more optimized
3333
# implementations and also filling in unimplemented intrinsics
@@ -42,7 +42,7 @@ no-asm = []
4242
no-f16-f128 = []
4343

4444
# Flag this library as the unstable compiler-builtins lib
45-
compiler-builtins = []
45+
compiler-builtins = ["dep:core"]
4646

4747
# Generate memory-related intrinsics like memcpy
4848
mem = []
@@ -51,9 +51,6 @@ mem = []
5151
# compiler-rt implementations. Also used for testing
5252
mangled-names = []
5353

54-
# Only used in the compiler's build system
55-
rustc-dep-of-std = ["compiler-builtins", "dep:core"]
56-
5754
# This makes certain traits and function specializations public that
5855
# are not normally public but are required by the `builtins-test`
5956
unstable-public-internals = []

0 commit comments

Comments
 (0)