From aa8bb59f5ed8532c9da9bfaa38122abd0575f4ab Mon Sep 17 00:00:00 2001 From: Urgau Date: Fri, 11 Oct 2024 12:17:32 +0200 Subject: [PATCH] Adjust future-incompat cfg keyword with raw-idents in cfgs --- crates/cargo-platform/src/lib.rs | 6 ++++-- tests/testsuite/cfg.rs | 18 ++++++++++++++++-- 2 files changed, 20 insertions(+), 4 deletions(-) diff --git a/crates/cargo-platform/src/lib.rs b/crates/cargo-platform/src/lib.rs index b3a2aa619d6d..f0e8336003f5 100644 --- a/crates/cargo-platform/src/lib.rs +++ b/crates/cargo-platform/src/lib.rs @@ -117,11 +117,13 @@ impl Platform { } CfgExpr::Value(ref e) => match e { Cfg::Name(name) | Cfg::KeyPair(name, _) => { - if KEYWORDS.contains(&name.as_str()) { + if !name.raw && KEYWORDS.contains(&name.as_str()) { warnings.push(format!( "[{}] future-incompatibility: `cfg({e})` is deprecated as `{name}` is a keyword \ and not an identifier and should not have have been accepted in this position.\n \ - | this was previously accepted by Cargo but is being phased out; it will become a hard error in a future release!", + | this was previously accepted by Cargo but is being phased out; it will become a hard error in a future release!\n \ + |\n \ + | help: use raw-idents instead: `cfg(r#{name})`", path.display() )); } diff --git a/tests/testsuite/cfg.rs b/tests/testsuite/cfg.rs index 6cc39e8e8467..993cb2458129 100644 --- a/tests/testsuite/cfg.rs +++ b/tests/testsuite/cfg.rs @@ -544,8 +544,6 @@ fn cfg_raw_idents() { p.cargo("check") .with_stderr_data(str![[r#" -[WARNING] [[ROOT]/foo/Cargo.toml] future-incompatibility: `cfg(r#fn)` is deprecated as `r#fn` is a keyword and not an identifier and should not have have been accepted in this position. - | this was previously accepted by Cargo but is being phased out; it will become a hard error in a future release! [LOCKING] 1 package to latest compatible version [CHECKING] foo v0.1.0 ([ROOT]/foo) [FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s @@ -642,20 +640,36 @@ fn cfg_keywords() { .with_stderr_data(str![[r#" [WARNING] [[ROOT]/foo/Cargo.toml] future-incompatibility: `cfg(async)` is deprecated as `async` is a keyword and not an identifier and should not have have been accepted in this position. | this was previously accepted by Cargo but is being phased out; it will become a hard error in a future release! + | + | [HELP] use raw-idents instead: `cfg(r#async)` [WARNING] [[ROOT]/foo/Cargo.toml] future-incompatibility: `cfg(fn)` is deprecated as `fn` is a keyword and not an identifier and should not have have been accepted in this position. | this was previously accepted by Cargo but is being phased out; it will become a hard error in a future release! + | + | [HELP] use raw-idents instead: `cfg(r#fn)` [WARNING] [[ROOT]/foo/Cargo.toml] future-incompatibility: `cfg(const)` is deprecated as `const` is a keyword and not an identifier and should not have have been accepted in this position. | this was previously accepted by Cargo but is being phased out; it will become a hard error in a future release! + | + | [HELP] use raw-idents instead: `cfg(r#const)` [WARNING] [[ROOT]/foo/Cargo.toml] future-incompatibility: `cfg(return)` is deprecated as `return` is a keyword and not an identifier and should not have have been accepted in this position. | this was previously accepted by Cargo but is being phased out; it will become a hard error in a future release! + | + | [HELP] use raw-idents instead: `cfg(r#return)` [WARNING] [.cargo/config.toml] future-incompatibility: `cfg(for)` is deprecated as `for` is a keyword and not an identifier and should not have have been accepted in this position. | this was previously accepted by Cargo but is being phased out; it will become a hard error in a future release! + | + | [HELP] use raw-idents instead: `cfg(r#for)` [WARNING] [.cargo/config.toml] future-incompatibility: `cfg(match)` is deprecated as `match` is a keyword and not an identifier and should not have have been accepted in this position. | this was previously accepted by Cargo but is being phased out; it will become a hard error in a future release! + | + | [HELP] use raw-idents instead: `cfg(r#match)` [WARNING] [.cargo/config.toml] future-incompatibility: `cfg(extern)` is deprecated as `extern` is a keyword and not an identifier and should not have have been accepted in this position. | this was previously accepted by Cargo but is being phased out; it will become a hard error in a future release! + | + | [HELP] use raw-idents instead: `cfg(r#extern)` [WARNING] [.cargo/config.toml] future-incompatibility: `cfg(crate)` is deprecated as `crate` is a keyword and not an identifier and should not have have been accepted in this position. | this was previously accepted by Cargo but is being phased out; it will become a hard error in a future release! + | + | [HELP] use raw-idents instead: `cfg(r#crate)` [LOCKING] 1 package to latest compatible version [CHECKING] foo v0.1.0 ([ROOT]/foo) [FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s