diff options
| author | bors <bors@rust-lang.org> | 2023-04-12 22:19:29 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2023-04-12 22:19:29 +0000 |
| commit | 9693b178fcebe3cc27129b7bc1237ee5eb706af8 (patch) | |
| tree | febbc3b08f6ad0e8a8e53a456aa5d7661cec1dbf /compiler/rustc_errors/src/lib.rs | |
| parent | 4087deaccd8bceb458c9610d29744d5f3504c5c0 (diff) | |
| parent | b01f0d392864fd581fd6cb4cd1648959bdfbfc5f (diff) | |
| download | rust-9693b178fcebe3cc27129b7bc1237ee5eb706af8.tar.gz rust-9693b178fcebe3cc27129b7bc1237ee5eb706af8.zip | |
Auto merge of #110252 - matthiaskrgr:rollup-ovaixra, r=matthiaskrgr
Rollup of 8 pull requests
Successful merges:
- #109810 (Replace rustdoc-ui/{c,z}-help tests with a stable run-make test )
- #110035 (fix: ensure bad `#[test]` invocs retain correct AST)
- #110089 (sync::mpsc: synchronize receiver disconnect with initialization)
- #110103 (Report overflows gracefully with new solver)
- #110122 (Fix x check --stage 1 when download-ci-llvm=false)
- #110133 (Do not use ImplDerivedObligationCause for inherent impl method error reporting)
- #110135 (Revert "Don't recover lifetimes/labels containing emojis as character literals")
- #110235 (Fix `--extend-css` option)
Failed merges:
r? `@ghost`
`@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_errors/src/lib.rs')
| -rw-r--r-- | compiler/rustc_errors/src/lib.rs | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/compiler/rustc_errors/src/lib.rs b/compiler/rustc_errors/src/lib.rs index 5b0d8096207..3bd1958a08a 100644 --- a/compiler/rustc_errors/src/lib.rs +++ b/compiler/rustc_errors/src/lib.rs @@ -475,8 +475,6 @@ pub enum StashKey { /// When an invalid lifetime e.g. `'2` should be reinterpreted /// as a char literal in the parser LifetimeIsChar, - /// When an invalid lifetime e.g. `'🐱` contains emoji. - LifetimeContainsEmoji, /// Maybe there was a typo where a comma was forgotten before /// FRU syntax MaybeFruTypo, |