bjoernager/rust
bjoernager/rust
1
Fork 0
Code Issues Pull requests Activity

rename rust_2021_token_prefixes to rust_2021_prefixes_incompatible_syntax

Browse source
This commit is contained in:
Ryan Levick 2021-07-06 16:33:11 +02:00
parent 941eb2adbd
commit d4e384bc1d
5 changed files with 20 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

8
compiler/rustc_lint_defs/src/builtin.rs
View file

@ -2973,7 +2973,7 @@ declare_lint_pass! {
RUST_2021_INCOMPATIBLE_OR_PATTERNS, RUST_2021_INCOMPATIBLE_OR_PATTERNS,
LARGE_ASSIGNMENTS, LARGE_ASSIGNMENTS,
RUST_2021_PRELUDE_COLLISIONS, RUST_2021_PRELUDE_COLLISIONS,
RUST_2021_TOKEN_PREFIXES, RUST_2021_PREFIXES_INCOMPATIBLE_SYNTAX,
UNSUPPORTED_CALLING_CONVENTIONS, UNSUPPORTED_CALLING_CONVENTIONS,
] ]
} }
@ -3270,13 +3270,13 @@ declare_lint! {
} }
declare_lint! { declare_lint! {
/// The `rust_2021_token_prefixes` lint detects identifiers that will be parsed as a /// The `rust_2021_prefixes_incompatible_syntax` lint detects identifiers that will be parsed as a
/// prefix instead in Rust 2021. /// prefix instead in Rust 2021.
/// ///
/// ### Example /// ### Example
/// ///
/// ```rust,compile_fail /// ```rust,compile_fail
/// #![deny(rust_2021_token_prefixes)] /// #![deny(rust_2021_prefixes_incompatible_syntax)]
/// ///
/// macro_rules! m { /// macro_rules! m {
/// (z $x:expr) => (); /// (z $x:expr) => ();
@ -3295,7 +3295,7 @@ declare_lint! {
/// ///
/// This lint suggests to add whitespace between the `z` and `"hey"` tokens /// This lint suggests to add whitespace between the `z` and `"hey"` tokens
/// to keep them separated in Rust 2021. /// to keep them separated in Rust 2021.
pub RUST_2021_TOKEN_PREFIXES, pub RUST_2021_PREFIXES_INCOMPATIBLE_SYNTAX,
Allow, Allow,
"identifiers that will be parsed as a prefix in Rust 2021", "identifiers that will be parsed as a prefix in Rust 2021",
@future_incompatible = FutureIncompatibleInfo { @future_incompatible = FutureIncompatibleInfo {

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

@ -4,7 +4,7 @@ use rustc_ast::tokenstream::{Spacing, TokenStream};
use rustc_errors::{error_code, Applicability, DiagnosticBuilder, FatalError, PResult}; use rustc_errors::{error_code, Applicability, DiagnosticBuilder, FatalError, PResult};
use rustc_lexer::unescape::{self, Mode}; use rustc_lexer::unescape::{self, Mode};
use rustc_lexer::{Base, DocStyle, RawStrError}; use rustc_lexer::{Base, DocStyle, RawStrError};
use rustc_session::lint::builtin::RUST_2021_TOKEN_PREFIXES; use rustc_session::lint::builtin::RUST_2021_PREFIXES_INCOMPATIBLE_SYNTAX;
use rustc_session::lint::BuiltinLintDiagnostics; use rustc_session::lint::BuiltinLintDiagnostics;
use rustc_session::parse::ParseSess; use rustc_session::parse::ParseSess;
use rustc_span::symbol::{sym, Symbol}; use rustc_span::symbol::{sym, Symbol};
@ -526,7 +526,7 @@ impl<'a> StringReader<'a> {
} else { } else {
// Before Rust 2021, only emit a lint for migration. // Before Rust 2021, only emit a lint for migration.
self.sess.buffer_lint_with_diagnostic( self.sess.buffer_lint_with_diagnostic(
&RUST_2021_TOKEN_PREFIXES, &RUST_2021_PREFIXES_INCOMPATIBLE_SYNTAX,
prefix_span, prefix_span,
ast::CRATE_NODE_ID, ast::CRATE_NODE_ID,
&msg, &msg,

12
src/test/ui/rust-2021/reserved-prefixes-migration.fixed
View file

@ -2,7 +2,7 @@
// run-rustfix // run-rustfix
// compile-flags: -Z unstable-options --edition 2018 // compile-flags: -Z unstable-options --edition 2018
#![warn(rust_2021_token_prefixes)] #![warn(rust_2021_prefixes_incompatible_syntax)]
macro_rules! m2 { macro_rules! m2 {
($a:tt $b:tt) => {}; ($a:tt $b:tt) => {};
@ -14,16 +14,16 @@ macro_rules! m3 {
fn main() { fn main() {
m2!(z "hey"); m2!(z "hey");
//~^ WARNING prefix `z` is unknown [rust_2021_token_prefixes] //~^ WARNING prefix `z` is unknown [rust_2021_prefixes_incompatible_syntax]
//~| WARNING hard error in Rust 2021 //~| WARNING hard error in Rust 2021
m2!(prefix "hey"); m2!(prefix "hey");
//~^ WARNING prefix `prefix` is unknown [rust_2021_token_prefixes] //~^ WARNING prefix `prefix` is unknown [rust_2021_prefixes_incompatible_syntax]
//~| WARNING hard error in Rust 2021 //~| WARNING hard error in Rust 2021
m3!(hey #123); m3!(hey #123);
//~^ WARNING prefix `hey` is unknown [rust_2021_token_prefixes] //~^ WARNING prefix `hey` is unknown [rust_2021_prefixes_incompatible_syntax]
//~| WARNING hard error in Rust 2021 //~| WARNING hard error in Rust 2021
m3!(hey #hey); m3!(hey #hey);
//~^ WARNING prefix `hey` is unknown [rust_2021_token_prefixes] //~^ WARNING prefix `hey` is unknown [rust_2021_prefixes_incompatible_syntax]
//~| WARNING hard error in Rust 2021 //~| WARNING hard error in Rust 2021
} }
@ -33,6 +33,6 @@ macro_rules! quote {
quote! { quote! {
#name = #kind #value #name = #kind #value
//~^ WARNING prefix `kind` is unknown [rust_2021_token_prefixes] //~^ WARNING prefix `kind` is unknown [rust_2021_prefixes_incompatible_syntax]
//~| WARNING hard error in Rust 2021 //~| WARNING hard error in Rust 2021
} }

12
src/test/ui/rust-2021/reserved-prefixes-migration.rs
View file

@ -2,7 +2,7 @@
// run-rustfix // run-rustfix
// compile-flags: -Z unstable-options --edition 2018 // compile-flags: -Z unstable-options --edition 2018
#![warn(rust_2021_token_prefixes)] #![warn(rust_2021_prefixes_incompatible_syntax)]
macro_rules! m2 { macro_rules! m2 {
($a:tt $b:tt) => {}; ($a:tt $b:tt) => {};
@ -14,16 +14,16 @@ macro_rules! m3 {
fn main() { fn main() {
m2!(z"hey"); m2!(z"hey");
//~^ WARNING prefix `z` is unknown [rust_2021_token_prefixes] //~^ WARNING prefix `z` is unknown [rust_2021_prefixes_incompatible_syntax]
//~| WARNING hard error in Rust 2021 //~| WARNING hard error in Rust 2021
m2!(prefix"hey"); m2!(prefix"hey");
//~^ WARNING prefix `prefix` is unknown [rust_2021_token_prefixes] //~^ WARNING prefix `prefix` is unknown [rust_2021_prefixes_incompatible_syntax]
//~| WARNING hard error in Rust 2021 //~| WARNING hard error in Rust 2021
m3!(hey#123); m3!(hey#123);
//~^ WARNING prefix `hey` is unknown [rust_2021_token_prefixes] //~^ WARNING prefix `hey` is unknown [rust_2021_prefixes_incompatible_syntax]
//~| WARNING hard error in Rust 2021 //~| WARNING hard error in Rust 2021
m3!(hey#hey); m3!(hey#hey);
//~^ WARNING prefix `hey` is unknown [rust_2021_token_prefixes] //~^ WARNING prefix `hey` is unknown [rust_2021_prefixes_incompatible_syntax]
//~| WARNING hard error in Rust 2021 //~| WARNING hard error in Rust 2021
} }
@ -33,6 +33,6 @@ macro_rules! quote {
quote! { quote! {
#name = #kind#value #name = #kind#value
//~^ WARNING prefix `kind` is unknown [rust_2021_token_prefixes] //~^ WARNING prefix `kind` is unknown [rust_2021_prefixes_incompatible_syntax]
//~| WARNING hard error in Rust 2021 //~| WARNING hard error in Rust 2021
} }

4
src/test/ui/rust-2021/reserved-prefixes-migration.stderr
View file

@ -7,8 +7,8 @@ LL | m2!(z"hey");
note: the lint level is defined here note: the lint level is defined here
--> $DIR/reserved-prefixes-migration.rs:5:9 --> $DIR/reserved-prefixes-migration.rs:5:9
| |
LL | #![warn(rust_2021_token_prefixes)] LL | #![warn(rust_2021_prefixes_incompatible_syntax)]
| ^^^^^^^^^^^^^^^^^^^^^^^^ | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
= warning: this is accepted in the current edition (Rust 2018) but is a hard error in Rust 2021! = warning: this is accepted in the current edition (Rust 2018) but is a hard error in Rust 2021!
= note: for more information, see issue #84978 <https://github.com/rust-lang/rust/issues/84978> = note: for more information, see issue #84978 <https://github.com/rust-lang/rust/issues/84978>
help: insert whitespace here to avoid this being parsed as a prefix in Rust 2021 help: insert whitespace here to avoid this being parsed as a prefix in Rust 2021