Auto merge of #41990 - qnighy:disallow-underscore-suffix-for-string-like-literals, r=nikomatsakis
Disallow underscore suffix for string-like literals. This patch turns string/bytestring/char/byte literals followed by an underscore, like `"Foo"_`, to an error. `scan_optional_raw_name` will parse `_` as a valid raw name, but it will be rejected by the parser. I also considered just stopping parsing when the suffix is `_`, but in that case `"Foo"_` will be lexed as two valid tokens. Fixes the latter half of #41723.
This commit is contained in:
@@ -480,6 +480,15 @@ impl<'a> StringReader<'a> {
|
|||||||
|
|
||||||
self.with_str_from(start, |string| {
|
self.with_str_from(start, |string| {
|
||||||
if string == "_" {
|
if string == "_" {
|
||||||
|
self.sess.span_diagnostic
|
||||||
|
.struct_span_warn(mk_sp(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("for more information, see issue #42326 \
|
||||||
|
<https://github.com/rust-lang/rust/issues/42326>")
|
||||||
|
.emit();
|
||||||
None
|
None
|
||||||
} else {
|
} else {
|
||||||
Some(Symbol::intern(string))
|
Some(Symbol::intern(string))
|
||||||
|
|||||||
20
src/test/parse-fail/underscore-suffix-for-string.rs
Normal file
20
src/test/parse-fail/underscore-suffix-for-string.rs
Normal file
@@ -0,0 +1,20 @@
|
|||||||
|
// Copyright 2017 The Rust Project Developers. See the COPYRIGHT
|
||||||
|
// file at the top-level directory of this distribution and at
|
||||||
|
// http://rust-lang.org/COPYRIGHT.
|
||||||
|
//
|
||||||
|
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
|
||||||
|
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
|
||||||
|
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
|
||||||
|
// option. This file may not be copied, modified, or distributed
|
||||||
|
// except according to those terms.
|
||||||
|
|
||||||
|
fn main() {
|
||||||
|
let _ = "Foo"_;
|
||||||
|
//~^ WARNING underscore literal suffix is not allowed
|
||||||
|
//~| WARNING this was previously accepted
|
||||||
|
//~| NOTE issue #42326
|
||||||
|
}
|
||||||
|
|
||||||
|
FAIL
|
||||||
|
//~^ ERROR
|
||||||
|
//~| NOTE
|
||||||
Reference in New Issue
Block a user