diff options
| author | bors <bors@rust-lang.org> | 2023-06-16 11:51:43 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2023-06-16 11:51:43 +0000 |
| commit | 2304917aad2f18ee9a1c6969e1197c96dee907b6 (patch) | |
| tree | 2f11e8ea2652f15c434a88175a472b459b63eddf /compiler/rustc_parse/src/parser | |
| parent | 99b334696fffe8c08d2e6a978862849d5a89f875 (diff) | |
| parent | c2e109744db3322f44ebfbe707847bbb9b9be933 (diff) | |
| download | rust-2304917aad2f18ee9a1c6969e1197c96dee907b6.tar.gz rust-2304917aad2f18ee9a1c6969e1197c96dee907b6.zip | |
Auto merge of #112702 - Dylan-DPC:rollup-12d6qay, r=Dylan-DPC
Rollup of 7 pull requests Successful merges: - #112163 (fix: inline `predicate_may_hold_fatal` and remove expect call in it) - #112399 (Instantiate closure synthetic substs in root universe) - #112443 (Opportunistically resolve regions in new solver) - #112535 (reorder attributes to make miri-test-libstd work again) - #112579 (Fix building libstd documentation on FreeBSD.) - #112639 (Fix `dead_code_cgu` computation) - #112642 (Handle interpolated literal errors) r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_parse/src/parser')
| -rw-r--r-- | compiler/rustc_parse/src/parser/expr.rs | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/compiler/rustc_parse/src/parser/expr.rs b/compiler/rustc_parse/src/parser/expr.rs index cea2a71c988..f00bc54589a 100644 --- a/compiler/rustc_parse/src/parser/expr.rs +++ b/compiler/rustc_parse/src/parser/expr.rs @@ -2023,17 +2023,14 @@ impl<'a> Parser<'a> { let recovered = self.recover_after_dot(); let token = recovered.as_ref().unwrap_or(&self.token); match token::Lit::from_token(token) { - Some(token_lit) => { - match MetaItemLit::from_token_lit(token_lit, token.span) { + Some(lit) => { + match MetaItemLit::from_token_lit(lit, token.span) { Ok(lit) => { self.bump(); Some(lit) } Err(err) => { - let span = token.span; - let token::Literal(lit) = token.kind else { - unreachable!(); - }; + let span = token.uninterpolated_span(); self.bump(); report_lit_error(&self.sess, err, lit, span); // Pack possible quotes and prefixes from the original literal into |
