diff options
| author | bors <bors@rust-lang.org> | 2025-02-25 02:24:40 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2025-02-25 02:24:40 +0000 |
| commit | f5729cfed3c45e061e8a443677fc1d5ef9277df7 (patch) | |
| tree | c91747a4b57810c67589004322d9e46c5f099680 /compiler/rustc_span/src | |
| parent | 7d8c6e781d347e087c7d30ea393d7dcd725ed623 (diff) | |
| parent | 6c1f9592881b3e15bbd1157b45440e2bac289ed5 (diff) | |
| download | rust-f5729cfed3c45e061e8a443677fc1d5ef9277df7.tar.gz rust-f5729cfed3c45e061e8a443677fc1d5ef9277df7.zip | |
Auto merge of #137573 - compiler-errors:rollup-noq9yhp, r=compiler-errors
Rollup of 11 pull requests Successful merges: - #136522 (Remove `feature(dyn_compatible_for_dispatch)` from the compiler) - #137289 (Consolidate and improve error messaging for `CoerceUnsized` and `DispatchFromDyn`) - #137321 (Correct doc about `temp_dir()` behavior on Android) - #137417 (rustc_target: Add more RISC-V atomic-related features) - #137489 (remove `#[rustc_intrinsic_must_be_overridde]`) - #137530 (DWARF mixed versions with LTO on MIPS) - #137543 (std: Fix another new symlink test on Windows) - #137548 (Pass correct `TypingEnv` to `InlineAsmCtxt`) - #137550 (Don't immediately panic if dropck fails without returning errors) - #137552 (Update books) - #137556 (rename simd_shuffle_generic → simd_shuffle_const_generic) r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_span/src')
| -rw-r--r-- | compiler/rustc_span/src/symbol.rs | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/compiler/rustc_span/src/symbol.rs b/compiler/rustc_span/src/symbol.rs index 10c79b1be82..172c2faca96 100644 --- a/compiler/rustc_span/src/symbol.rs +++ b/compiler/rustc_span/src/symbol.rs @@ -1764,7 +1764,6 @@ symbols! { rustc_insignificant_dtor, rustc_intrinsic, rustc_intrinsic_const_stable_indirect, - rustc_intrinsic_must_be_overridden, rustc_layout, rustc_layout_scalar_valid_range_end, rustc_layout_scalar_valid_range_start, @@ -1916,7 +1915,7 @@ symbols! { simd_shl, simd_shr, simd_shuffle, - simd_shuffle_generic, + simd_shuffle_const_generic, simd_sub, simd_trunc, simd_with_exposed_provenance, |