diff options
| author | bors <bors@rust-lang.org> | 2022-02-12 19:01:00 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2022-02-12 19:01:00 +0000 |
| commit | 1945ce6579506787e0b18f0a2ea03fdb4dfc81c7 (patch) | |
| tree | 5eba45b701fae75841fb4395e8b4420a37f302d8 /compiler/rustc_span/src/symbol.rs | |
| parent | f58f0dfd7261dba0cafc25273d8158b6965c7695 (diff) | |
| parent | 0ac18e7adb8470588e615365370de28a95e0ea70 (diff) | |
| download | rust-1945ce6579506787e0b18f0a2ea03fdb4dfc81c7.tar.gz rust-1945ce6579506787e0b18f0a2ea03fdb4dfc81c7.zip | |
Auto merge of #93922 - Mark-Simulacrum:beta-next, r=Mark-Simulacrum
[beta] backports This backports: * Complete removal of #[main] attribute from compiler #93753 * Resolve lifetimes for const generic defaults #93669 * backport llvm fix for issue 91671. #93426 * Fix invalid special casing of the unreachable! macro #93179 * Fix hashing for windows paths containing a CurDir component #93697 r? `@Mark-Simulacrum`
Diffstat (limited to 'compiler/rustc_span/src/symbol.rs')
| -rw-r--r-- | compiler/rustc_span/src/symbol.rs | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/compiler/rustc_span/src/symbol.rs b/compiler/rustc_span/src/symbol.rs index 84cf8878af8..e008224ec08 100644 --- a/compiler/rustc_span/src/symbol.rs +++ b/compiler/rustc_span/src/symbol.rs @@ -1388,7 +1388,13 @@ symbols! { unmarked_api, unpin, unreachable, + unreachable_2015, + unreachable_2015_macro, + unreachable_2021, + unreachable_2021_macro, unreachable_code, + unreachable_display, + unreachable_macro, unrestricted_attribute_tokens, unsafe_block_in_unsafe_fn, unsafe_cell, |