bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Rollup merge of #105078 - TaKO8Ki:fix-105011, r=nnethercote

Browse source 
Fix `expr_to_spanned_string` ICE

Fixes #105011
This commit is contained in:
Matthias Krüger 2022-12-01 11:58:59 +01:00 • committed by GitHub
commit 741f8c9166
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 19 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

6
compiler/rustc_expand/src/base.rs
View file

@ -16,6 +16,7 @@ use rustc_errors::{
use rustc_lint_defs::builtin::PROC_MACRO_BACK_COMPAT;
use rustc_lint_defs::{BufferedEarlyLint, BuiltinLintDiagnostics};
use rustc_parse::{self, parser, MACRO_ARGUMENTS};
use rustc_session::errors::report_lit_error;
use rustc_session::{parse::ParseSess, Limit, Session};
use rustc_span::def_id::{CrateNum, DefId, LocalDefId};
use rustc_span::edition::Edition;
@ -1245,7 +1246,10 @@ pub fn expr_to_spanned_string<'a>(
Some((err, true))
}
Ok(ast::LitKind::Err) => None,
Err(_) => None,
Err(err) => {
report_lit_error(&cx.sess.parse_sess, err, token_lit, expr.span);
None
}
_ => Some((cx.struct_span_err(expr.span, err_msg), false)),
},
ast::ExprKind::Err => None,