bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Make underscore_literal_suffix a hard error.

Browse source 
It's been a warning for 5.5 years. Time to make it a hard error.

Closes #42326.
This commit is contained in:
Nicholas Nethercote 2022-11-03 12:02:33 +11:00
parent d726c8467c
commit dba6fc3ef5
4 changed files with 28 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

9
compiler/rustc_lexer/src/lib.rs
View file

@ -88,7 +88,9 @@ pub enum TokenKind {
/// tokens.
UnknownPrefix,
/// Examples: `"12_u8"`, `"1.0e-40"`, `b"123`.
/// Examples: `12u8`, `1.0e-40`, `b"123"`. Note that `_` is an invalid
/// suffix, but may be present here on string and float literals. Users of
/// this type will need to check for and reject that case.
///
/// See [LiteralKind] for more details.
Literal { kind: LiteralKind, suffix_start: u32 },
@ -840,12 +842,13 @@ impl Cursor<'_> {
self.eat_decimal_digits()
}
// Eats the suffix of the literal, e.g. "_u8".
// Eats the suffix of the literal, e.g. "u8".
fn eat_literal_suffix(&mut self) {
self.eat_identifier();
}
// Eats the identifier.
// Eats the identifier. Note: succeeds on `_`, which isn't a valid
// identifer.
fn eat_identifier(&mut self) {
if !is_id_start(self.first()) {
return;

12
compiler/rustc_parse/src/lexer/mod.rs
View file

@ -175,20 +175,10 @@ impl<'a> StringReader<'a> {
if string == "_" {
self.sess
.span_diagnostic
.struct_span_warn(
.struct_span_err(
self.mk_sp(suffix_start, self.pos),
"underscore literal suffix is not allowed",
)
.warn(
"this was previously accepted by the compiler but is \
being phased out; it will become a hard error in \
a future release!",
)
.note(
"see issue #42326 \
<https://github.com/rust-lang/rust/issues/42326> \
for more information",
)
.emit();
None
} else {