Skip to content

Commit 09494a0

Browse files
rust-timerrust-timer
authored
Unrolled build for rust-lang#121120
Rollup merge of rust-lang#121120 - nnethercote:LitKind-Err-guar, r=fmease Add `ErrorGuaranteed` to `ast::LitKind::Err`, `token::LitKind::Err`. Similar to recent work doing the same for `ExprKind::Err` (rust-lang#120586) and `TyKind::Err` (rust-lang#121109). r? `@oli-obk`
2 parents 62fb0db + ac47f6c commit 09494a0

File tree

28 files changed

+170
-162
lines changed

28 files changed

+170
-162
lines changed

‎compiler/rustc_ast/src/ast.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1846,7 +1846,7 @@ pub enum LitKind {
18461846
/// A boolean literal (`true`, `false`).
18471847
Bool(bool),
18481848
/// Placeholder for a literal that wasn't well-formed in some way.
1849-
Err,
1849+
Err(ErrorGuaranteed),
18501850
}
18511851

18521852
impl LitKind {
@@ -1893,7 +1893,7 @@ impl LitKind {
18931893
| LitKind::Int(_, LitIntType::Unsuffixed)
18941894
| LitKind::Float(_, LitFloatType::Unsuffixed)
18951895
| LitKind::Bool(..)
1896-
| LitKind::Err => false,
1896+
| LitKind::Err(_) => false,
18971897
}
18981898
}
18991899
}

‎compiler/rustc_ast/src/token.rs

+6-6
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ use rustc_macros::HashStable_Generic;
1313
use rustc_span::symbol::{kw, sym};
1414
#[allow(hidden_glob_reexports)]
1515
use rustc_span::symbol::{Ident, Symbol};
16-
use rustc_span::{edition::Edition, Span, DUMMY_SP};
16+
use rustc_span::{edition::Edition, ErrorGuaranteed, Span, DUMMY_SP};
1717
use std::borrow::Cow;
1818
use std::fmt;
1919

@@ -75,7 +75,7 @@ pub enum LitKind {
7575
ByteStrRaw(u8), // raw byte string delimited by `n` hash symbols
7676
CStr,
7777
CStrRaw(u8),
78-
Err,
78+
Err(ErrorGuaranteed),
7979
}
8080

8181
/// A literal token.
@@ -144,7 +144,7 @@ impl fmt::Display for Lit {
144144
CStrRaw(n) => {
145145
write!(f, "cr{delim}\"{symbol}\"{delim}", delim = "#".repeat(n as usize))?
146146
}
147-
Integer | Float | Bool | Err => write!(f, "{symbol}")?,
147+
Integer | Float | Bool | Err(_) => write!(f, "{symbol}")?,
148148
}
149149

150150
if let Some(suffix) = suffix {
@@ -159,7 +159,7 @@ impl LitKind {
159159
/// An English article for the literal token kind.
160160
pub fn article(self) -> &'static str {
161161
match self {
162-
Integer | Err => "an",
162+
Integer | Err(_) => "an",
163163
_ => "a",
164164
}
165165
}
@@ -174,12 +174,12 @@ impl LitKind {
174174
Str | StrRaw(..) => "string",
175175
ByteStr | ByteStrRaw(..) => "byte string",
176176
CStr | CStrRaw(..) => "C string",
177-
Err => "error",
177+
Err(_) => "error",
178178
}
179179
}
180180

181181
pub(crate) fn may_have_suffix(self) -> bool {
182-
matches!(self, Integer | Float | Err)
182+
matches!(self, Integer | Float | Err(_))
183183
}
184184
}
185185

‎compiler/rustc_ast/src/util/literal.rs

+19-22
Original file line numberDiff line numberDiff line change
@@ -31,20 +31,21 @@ pub fn escape_byte_str_symbol(bytes: &[u8]) -> Symbol {
3131

3232
#[derive(Debug)]
3333
pub enum LitError {
34-
LexerError,
35-
InvalidSuffix,
36-
InvalidIntSuffix,
37-
InvalidFloatSuffix,
38-
NonDecimalFloat(u32),
39-
IntTooLarge(u32),
34+
InvalidSuffix(Symbol),
35+
InvalidIntSuffix(Symbol),
36+
InvalidFloatSuffix(Symbol),
37+
NonDecimalFloat(u32), // u32 is the base
38+
IntTooLarge(u32), // u32 is the base
4039
}
4140

4241
impl LitKind {
4342
/// Converts literal token into a semantic literal.
4443
pub fn from_token_lit(lit: token::Lit) -> Result<LitKind, LitError> {
4544
let token::Lit { kind, symbol, suffix } = lit;
46-
if suffix.is_some() && !kind.may_have_suffix() {
47-
return Err(LitError::InvalidSuffix);
45+
if let Some(suffix) = suffix
46+
&& !kind.may_have_suffix()
47+
{
48+
return Err(LitError::InvalidSuffix(suffix));
4849
}
4950

5051
// For byte/char/string literals, chars and escapes have already been
@@ -145,7 +146,7 @@ impl LitKind {
145146
buf.push(0);
146147
LitKind::CStr(buf.into(), StrStyle::Raw(n))
147148
}
148-
token::Err => LitKind::Err,
149+
token::Err(guar) => LitKind::Err(guar),
149150
})
150151
}
151152
}
@@ -202,7 +203,7 @@ impl fmt::Display for LitKind {
202203
}
203204
}
204205
LitKind::Bool(b) => write!(f, "{}", if b { "true" } else { "false" })?,
205-
LitKind::Err => {
206+
LitKind::Err(_) => {
206207
// This only shows up in places like `-Zunpretty=hir` output, so we
207208
// don't bother to produce something useful.
208209
write!(f, "<bad-literal>")?;
@@ -238,7 +239,7 @@ impl MetaItemLit {
238239
LitKind::Char(_) => token::Char,
239240
LitKind::Int(..) => token::Integer,
240241
LitKind::Float(..) => token::Float,
241-
LitKind::Err => token::Err,
242+
LitKind::Err(guar) => token::Err(guar),
242243
};
243244

244245
token::Lit::new(kind, self.symbol, self.suffix)
@@ -272,12 +273,12 @@ fn filtered_float_lit(
272273
return Err(LitError::NonDecimalFloat(base));
273274
}
274275
Ok(match suffix {
275-
Some(suf) => LitKind::Float(
276+
Some(suffix) => LitKind::Float(
276277
symbol,
277-
ast::LitFloatType::Suffixed(match suf {
278+
ast::LitFloatType::Suffixed(match suffix {
278279
sym::f32 => ast::FloatTy::F32,
279280
sym::f64 => ast::FloatTy::F64,
280-
_ => return Err(LitError::InvalidFloatSuffix),
281+
_ => return Err(LitError::InvalidFloatSuffix(suffix)),
281282
}),
282283
),
283284
None => LitKind::Float(symbol, ast::LitFloatType::Unsuffixed),
@@ -318,17 +319,13 @@ fn integer_lit(symbol: Symbol, suffix: Option<Symbol>) -> Result<LitKind, LitErr
318319
// `1f64` and `2f32` etc. are valid float literals, and
319320
// `fxxx` looks more like an invalid float literal than invalid integer literal.
320321
_ if suf.as_str().starts_with('f') => return filtered_float_lit(symbol, suffix, base),
321-
_ => return Err(LitError::InvalidIntSuffix),
322+
_ => return Err(LitError::InvalidIntSuffix(suf)),
322323
},
323324
_ => ast::LitIntType::Unsuffixed,
324325
};
325326

326327
let s = &s[if base != 10 { 2 } else { 0 }..];
327-
u128::from_str_radix(s, base).map(|i| LitKind::Int(i.into(), ty)).map_err(|_| {
328-
// Small bases are lexed as if they were base 10, e.g, the string
329-
// might be `0b10201`. This will cause the conversion above to fail,
330-
// but these kinds of errors are already reported by the lexer.
331-
let from_lexer = base < 10 && s.chars().any(|c| c.to_digit(10).is_some_and(|d| d >= base));
332-
if from_lexer { LitError::LexerError } else { LitError::IntTooLarge(base) }
333-
})
328+
u128::from_str_radix(s, base)
329+
.map(|i| LitKind::Int(i.into(), ty))
330+
.map_err(|_| LitError::IntTooLarge(base))
334331
}

‎compiler/rustc_ast_lowering/src/expr.rs

+7-2
Original file line numberDiff line numberDiff line change
@@ -124,8 +124,13 @@ impl<'hir> LoweringContext<'_, 'hir> {
124124
let lit_kind = match LitKind::from_token_lit(*token_lit) {
125125
Ok(lit_kind) => lit_kind,
126126
Err(err) => {
127-
report_lit_error(&self.tcx.sess.parse_sess, err, *token_lit, e.span);
128-
LitKind::Err
127+
let guar = report_lit_error(
128+
&self.tcx.sess.parse_sess,
129+
err,
130+
*token_lit,
131+
e.span,
132+
);
133+
LitKind::Err(guar)
129134
}
130135
};
131136
let lit = self.arena.alloc(respan(self.lower_span(e.span), lit_kind));

‎compiler/rustc_ast_lowering/src/lib.rs

+2-1
Original file line numberDiff line numberDiff line change
@@ -966,10 +966,11 @@ impl<'a, 'hir> LoweringContext<'a, 'hir> {
966966
{
967967
lit
968968
} else {
969+
let guar = self.dcx().has_errors().unwrap();
969970
MetaItemLit {
970971
symbol: kw::Empty,
971972
suffix: None,
972-
kind: LitKind::Err,
973+
kind: LitKind::Err(guar),
973974
span: DUMMY_SP,
974975
}
975976
};

‎compiler/rustc_ast_pretty/src/pprust/state.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -254,7 +254,7 @@ fn literal_to_string(lit: token::Lit) -> String {
254254
token::CStrRaw(n) => {
255255
format!("cr{delim}\"{symbol}\"{delim}", delim = "#".repeat(n as usize))
256256
}
257-
token::Integer | token::Float | token::Bool | token::Err => symbol.to_string(),
257+
token::Integer | token::Float | token::Bool | token::Err(_) => symbol.to_string(),
258258
};
259259

260260
if let Some(suffix) = suffix {

‎compiler/rustc_builtin_macros/src/concat.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ pub fn expand_concat(
4040
cx.dcx().emit_err(errors::ConcatBytestr { span: e.span });
4141
has_errors = true;
4242
}
43-
Ok(ast::LitKind::Err) => {
43+
Ok(ast::LitKind::Err(_)) => {
4444
has_errors = true;
4545
}
4646
Err(err) => {

‎compiler/rustc_builtin_macros/src/concat_bytes.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ fn invalid_type_err(
4444
Ok(ast::LitKind::Bool(_)) => {
4545
dcx.emit_err(ConcatBytesInvalid { span, lit_kind: "boolean", sugg: None });
4646
}
47-
Ok(ast::LitKind::Err) => {}
47+
Ok(ast::LitKind::Err(_)) => {}
4848
Ok(ast::LitKind::Int(_, _)) if !is_nested => {
4949
let sugg =
5050
snippet.map(|snippet| ConcatBytesInvalidSuggestion::IntLit { span: span, snippet });

‎compiler/rustc_expand/src/base.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1266,7 +1266,7 @@ pub fn expr_to_spanned_string<'a>(
12661266
);
12671267
Some((err, true))
12681268
}
1269-
Ok(ast::LitKind::Err) => None,
1269+
Ok(ast::LitKind::Err(_)) => None,
12701270
Err(err) => {
12711271
report_lit_error(&cx.sess.parse_sess, err, token_lit, expr.span);
12721272
None

‎compiler/rustc_expand/src/proc_macro_server.rs

+18-4
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ use rustc_ast::util::literal::escape_byte_str_symbol;
1010
use rustc_ast_pretty::pprust;
1111
use rustc_data_structures::fx::FxHashMap;
1212
use rustc_data_structures::sync::Lrc;
13-
use rustc_errors::{MultiSpan, PResult};
13+
use rustc_errors::{ErrorGuaranteed, MultiSpan, PResult};
1414
use rustc_parse::lexer::nfc_normalize;
1515
use rustc_parse::parse_stream_from_source_str;
1616
use rustc_session::parse::ParseSess;
@@ -63,7 +63,12 @@ impl FromInternal<token::LitKind> for LitKind {
6363
token::ByteStrRaw(n) => LitKind::ByteStrRaw(n),
6464
token::CStr => LitKind::CStr,
6565
token::CStrRaw(n) => LitKind::CStrRaw(n),
66-
token::Err => LitKind::Err,
66+
token::Err(_guar) => {
67+
// This is the only place a `pm::bridge::LitKind::ErrWithGuar`
68+
// is constructed. Note that an `ErrorGuaranteed` is available,
69+
// as required. See the comment in `to_internal`.
70+
LitKind::ErrWithGuar
71+
}
6772
token::Bool => unreachable!(),
6873
}
6974
}
@@ -82,7 +87,16 @@ impl ToInternal<token::LitKind> for LitKind {
8287
LitKind::ByteStrRaw(n) => token::ByteStrRaw(n),
8388
LitKind::CStr => token::CStr,
8489
LitKind::CStrRaw(n) => token::CStrRaw(n),
85-
LitKind::Err => token::Err,
90+
LitKind::ErrWithGuar => {
91+
// This is annoying but valid. `LitKind::ErrWithGuar` would
92+
// have an `ErrorGuaranteed` except that type isn't available
93+
// in that crate. So we have to fake one. And we don't want to
94+
// use a delayed bug because there might be lots of these,
95+
// which would be expensive.
96+
#[allow(deprecated)]
97+
let guar = ErrorGuaranteed::unchecked_error_guaranteed();
98+
token::Err(guar)
99+
}
86100
}
87101
}
88102
}
@@ -477,7 +491,7 @@ impl server::FreeFunctions for Rustc<'_, '_> {
477491
| token::LitKind::ByteStrRaw(_)
478492
| token::LitKind::CStr
479493
| token::LitKind::CStrRaw(_)
480-
| token::LitKind::Err => return Err(()),
494+
| token::LitKind::Err(_) => return Err(()),
481495
token::LitKind::Integer | token::LitKind::Float => {}
482496
}
483497

‎compiler/rustc_hir_typeck/src/fn_ctxt/checks.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1319,7 +1319,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
13191319
tcx.type_of(tcx.require_lang_item(hir::LangItem::CStr, Some(lit.span)))
13201320
.skip_binder(),
13211321
),
1322-
ast::LitKind::Err => Ty::new_misc_error(tcx),
1322+
ast::LitKind::Err(guar) => Ty::new_error(tcx, guar),
13231323
}
13241324
}
13251325

‎compiler/rustc_mir_build/src/build/expr/as_constant.rs

+1-5
Original file line numberDiff line numberDiff line change
@@ -164,11 +164,7 @@ fn lit_to_mir_constant<'tcx>(
164164
})?,
165165
(ast::LitKind::Bool(b), ty::Bool) => ConstValue::Scalar(Scalar::from_bool(*b)),
166166
(ast::LitKind::Char(c), ty::Char) => ConstValue::Scalar(Scalar::from_char(*c)),
167-
(ast::LitKind::Err, _) => {
168-
return Err(LitToConstError::Reported(
169-
tcx.dcx().delayed_bug("encountered LitKind::Err during mir build"),
170-
));
171-
}
167+
(ast::LitKind::Err(guar), _) => return Err(LitToConstError::Reported(*guar)),
172168
_ => return Err(LitToConstError::TypeError),
173169
};
174170

‎compiler/rustc_mir_build/src/thir/constant.rs

+1-5
Original file line numberDiff line numberDiff line change
@@ -71,11 +71,7 @@ pub(crate) fn lit_to_const<'tcx>(
7171
ty::ValTree::from_scalar_int(bits)
7272
}
7373
(ast::LitKind::Char(c), ty::Char) => ty::ValTree::from_scalar_int((*c).into()),
74-
(ast::LitKind::Err, _) => {
75-
return Err(LitToConstError::Reported(
76-
tcx.dcx().delayed_bug("encountered LitKind::Err during mir build"),
77-
));
78-
}
74+
(ast::LitKind::Err(guar), _) => return Err(LitToConstError::Reported(*guar)),
7975
_ => return Err(LitToConstError::TypeError),
8076
};
8177

‎compiler/rustc_mir_build/src/thir/cx/expr.rs

+7-5
Original file line numberDiff line numberDiff line change
@@ -897,12 +897,14 @@ impl<'tcx> Cx<'tcx> {
897897
let hir_id = self.tcx.local_def_id_to_hir_id(def_id.expect_local());
898898
let generics = self.tcx.generics_of(hir_id.owner);
899899
let Some(&index) = generics.param_def_id_to_index.get(&def_id) else {
900-
self.tcx.dcx().has_errors().unwrap();
900+
let guar = self.tcx.dcx().has_errors().unwrap();
901901
// We already errored about a late bound const
902-
return ExprKind::Literal {
903-
lit: &Spanned { span: DUMMY_SP, node: LitKind::Err },
904-
neg: false,
905-
};
902+
903+
let lit = self
904+
.tcx
905+
.hir_arena
906+
.alloc(Spanned { span: DUMMY_SP, node: LitKind::Err(guar) });
907+
return ExprKind::Literal { lit, neg: false };
906908
};
907909
let name = self.tcx.hir().name(hir_id);
908910
let param = ty::ParamConst::new(index, name);

0 commit comments

Comments
 (0)