Skip to content

Commit c289dd0

Browse files
committed
Auto merge of rust-lang#144556 - matthiaskrgr:rollup-aayo3h5, r=matthiaskrgr
Rollup of 6 pull requests Successful merges: - rust-lang#143607 (Port the proc macro attributes to the new attribute parsing infrastructure) - rust-lang#144471 (Remove `compiler-builtins-{no-asm,mangled-names}`) - rust-lang#144495 (bump cargo_metadata) - rust-lang#144523 (rustdoc: save target modifiers) - rust-lang#144534 (check_static_item: explain should_check_for_sync choices) - rust-lang#144535 (miri: for ABI mismatch errors, say which argument is the problem) Failed merges: - rust-lang#144536 (miri subtree update) r? `@ghost` `@rustbot` modify labels: rollup
2 parents f2668d2 + f03e04d commit c289dd0

File tree

3 files changed

+0
-6
lines changed

3 files changed

+0
-6
lines changed

alloc/Cargo.toml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,7 @@ compiler_builtins = { path = "../compiler-builtins/compiler-builtins", features
2121
[features]
2222
compiler-builtins-mem = ['compiler_builtins/mem']
2323
compiler-builtins-c = ["compiler_builtins/c"]
24-
compiler-builtins-no-asm = ["compiler_builtins/no-asm"]
2524
compiler-builtins-no-f16-f128 = ["compiler_builtins/no-f16-f128"]
26-
compiler-builtins-mangled-names = ["compiler_builtins/mangled-names"]
2725
# Make panics and failed asserts immediately abort without formatting any message
2826
panic_immediate_abort = ["core/panic_immediate_abort"]
2927
# Choose algorithms that are optimized for binary size instead of runtime performance

std/Cargo.toml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -97,9 +97,7 @@ backtrace-trace-only = []
9797
panic-unwind = ["dep:panic_unwind"]
9898
compiler-builtins-c = ["alloc/compiler-builtins-c"]
9999
compiler-builtins-mem = ["alloc/compiler-builtins-mem"]
100-
compiler-builtins-no-asm = ["alloc/compiler-builtins-no-asm"]
101100
compiler-builtins-no-f16-f128 = ["alloc/compiler-builtins-no-f16-f128"]
102-
compiler-builtins-mangled-names = ["alloc/compiler-builtins-mangled-names"]
103101
llvm-libunwind = ["unwind/llvm-libunwind"]
104102
system-llvm-libunwind = ["unwind/system-llvm-libunwind"]
105103

sysroot/Cargo.toml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,7 @@ backtrace = ["std/backtrace"]
2323
backtrace-trace-only = ["std/backtrace-trace-only"]
2424
compiler-builtins-c = ["std/compiler-builtins-c"]
2525
compiler-builtins-mem = ["std/compiler-builtins-mem"]
26-
compiler-builtins-no-asm = ["std/compiler-builtins-no-asm"]
2726
compiler-builtins-no-f16-f128 = ["std/compiler-builtins-no-f16-f128"]
28-
compiler-builtins-mangled-names = ["std/compiler-builtins-mangled-names"]
2927
debug_refcell = ["std/debug_refcell"]
3028
llvm-libunwind = ["std/llvm-libunwind"]
3129
system-llvm-libunwind = ["std/system-llvm-libunwind"]

0 commit comments

Comments
 (0)