diff options
| author | bors <bors@rust-lang.org> | 2025-07-28 02:09:05 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2025-07-28 02:09:05 +0000 |
| commit | 733dab558992d902d6d17576de1da768094e2cf3 (patch) | |
| tree | c36891d3e7417fc84ef299b806d7601eb3d26471 /library/std | |
| parent | 2b5e239c6b86cde974b0ef0f8e23754fb08ff3c5 (diff) | |
| parent | d33c8f933696ab1fcdbca369d4c18f436a7faf4c (diff) | |
| download | rust-733dab558992d902d6d17576de1da768094e2cf3.tar.gz rust-733dab558992d902d6d17576de1da768094e2cf3.zip | |
Auto merge of #144556 - matthiaskrgr:rollup-aayo3h5, r=matthiaskrgr
Rollup of 6 pull requests
Successful merges:
- rust-lang/rust#143607 (Port the proc macro attributes to the new attribute parsing infrastructure)
- rust-lang/rust#144471 (Remove `compiler-builtins-{no-asm,mangled-names}`)
- rust-lang/rust#144495 (bump cargo_metadata)
- rust-lang/rust#144523 (rustdoc: save target modifiers)
- rust-lang/rust#144534 (check_static_item: explain should_check_for_sync choices)
- rust-lang/rust#144535 (miri: for ABI mismatch errors, say which argument is the problem)
Failed merges:
- rust-lang/rust#144536 (miri subtree update)
r? `@ghost`
`@rustbot` modify labels: rollup
Diffstat (limited to 'library/std')
| -rw-r--r-- | library/std/Cargo.toml | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/library/std/Cargo.toml b/library/std/Cargo.toml index f1b38813d44..29ab9be0e69 100644 --- a/library/std/Cargo.toml +++ b/library/std/Cargo.toml @@ -97,9 +97,7 @@ backtrace-trace-only = [] panic-unwind = ["dep:panic_unwind"] compiler-builtins-c = ["alloc/compiler-builtins-c"] compiler-builtins-mem = ["alloc/compiler-builtins-mem"] -compiler-builtins-no-asm = ["alloc/compiler-builtins-no-asm"] compiler-builtins-no-f16-f128 = ["alloc/compiler-builtins-no-f16-f128"] -compiler-builtins-mangled-names = ["alloc/compiler-builtins-mangled-names"] llvm-libunwind = ["unwind/llvm-libunwind"] system-llvm-libunwind = ["unwind/system-llvm-libunwind"] |