Skip to content

Commit a0cb748

Browse files
authored
Rollup merge of #109415 - nnethercote:refactor-handle_missing_lit, r=petrochenkov
Refactor `handle_missing_lit`. A small code readability improvement. r? ``@petrochenkov``
2 parents fa98cb2 + 93eeb12 commit a0cb748

File tree

1 file changed

+8
-14
lines changed
  • compiler/rustc_parse/src/parser

1 file changed

+8
-14
lines changed

compiler/rustc_parse/src/parser/expr.rs

+8-14
Original file line numberDiff line numberDiff line change
@@ -1843,20 +1843,14 @@ impl<'a> Parser<'a> {
18431843
&mut self,
18441844
mk_lit_char: impl FnOnce(Symbol, Span) -> L,
18451845
) -> PResult<'a, L> {
1846-
if let token::Interpolated(inner) = &self.token.kind {
1847-
let expr = match inner.as_ref() {
1848-
token::NtExpr(expr) => Some(expr),
1849-
token::NtLiteral(expr) => Some(expr),
1850-
_ => None,
1851-
};
1852-
if let Some(expr) = expr {
1853-
if matches!(expr.kind, ExprKind::Err) {
1854-
let mut err = errors::InvalidInterpolatedExpression { span: self.token.span }
1855-
.into_diagnostic(&self.sess.span_diagnostic);
1856-
err.downgrade_to_delayed_bug();
1857-
return Err(err);
1858-
}
1859-
}
1846+
if let token::Interpolated(nt) = &self.token.kind
1847+
&& let token::NtExpr(e) | token::NtLiteral(e) = &**nt
1848+
&& matches!(e.kind, ExprKind::Err)
1849+
{
1850+
let mut err = errors::InvalidInterpolatedExpression { span: self.token.span }
1851+
.into_diagnostic(&self.sess.span_diagnostic);
1852+
err.downgrade_to_delayed_bug();
1853+
return Err(err);
18601854
}
18611855
let token = self.token.clone();
18621856
let err = |self_: &Self| {

0 commit comments

Comments
 (0)