diff options
| author | bors <bors@rust-lang.org> | 2021-12-09 07:08:32 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2021-12-09 07:08:32 +0000 |
| commit | 600820da45daa50870fe711d53938fc6a52edd35 (patch) | |
| tree | c5664462839bd20b23683f20ded11f594c758cdc /compiler/rustc_span/src | |
| parent | e25077704164071a1ef87cdc90fe7dd1872ba3fa (diff) | |
| parent | ab92eca61248f89cd1355690f49e32fcb1708d80 (diff) | |
| download | rust-600820da45daa50870fe711d53938fc6a52edd35.tar.gz rust-600820da45daa50870fe711d53938fc6a52edd35.zip | |
Auto merge of #91692 - matthiaskrgr:rollup-u7dvh0n, r=matthiaskrgr
Rollup of 6 pull requests Successful merges: - #87599 (Implement concat_bytes!) - #89999 (Update std::env::temp_dir to use GetTempPath2 on Windows when available.) - #90796 (Remove the reg_thumb register class for asm! on ARM) - #91042 (Use Vec extend instead of repeated pushes on several places) - #91634 (Do not attempt to suggest help for overly malformed struct/function call) - #91685 (Install llvm tools to sysroot when assembling local toolchain) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_span/src')
| -rw-r--r-- | compiler/rustc_span/src/symbol.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/compiler/rustc_span/src/symbol.rs b/compiler/rustc_span/src/symbol.rs index 492cecf7d67..eb6063d7612 100644 --- a/compiler/rustc_span/src/symbol.rs +++ b/compiler/rustc_span/src/symbol.rs @@ -439,6 +439,7 @@ symbols! { compiler_builtins, compiler_fence, concat, + concat_bytes, concat_idents, conservative_impl_trait, console, @@ -1058,7 +1059,6 @@ symbols! { reg_nonzero, reg_pair, reg_ptr, - reg_thumb, reg_upper, register_attr, register_tool, |