Emit error when using path-segment keyword as cfg pred

Author: mu001999

tests/ui/cast_size.32bit.stderr tests/ui/cast_size.r32bit.stderrtests/ui/cast_size.32bit.stderr renamed to tests/ui/cast_size.r32bit.stderr

@@ -1,6 +1,6 @@
-//@revisions: 32bit 64bit
-//@[32bit]ignore-bitwidth: 64
-//@[64bit]ignore-bitwidth: 32
+//@revisions: r32bit r64bit
+//@[r32bit]ignore-bitwidth: 64
+//@[r64bit]ignore-bitwidth: 32
 //@no-rustfix: only some diagnostics have suggestions
 
 #![warn(
@@ -62,7 +62,7 @@ fn main() {
     //~^ cast_precision_loss
     9_999_999_999_999_999usize as f64;
     //~^ cast_precision_loss
-    //~[32bit]^^ ERROR: literal out of range for `usize`
+    //~[r32bit]^^ ERROR: literal out of range for `usize`
     // 999_999_999_999_999_999_999_999_999_999u128 as f128;
 }
 

tests/ui/cast_size.64bit.stderr tests/ui/cast_size.r64bit.stderrtests/ui/cast_size.64bit.stderr renamed to tests/ui/cast_size.r64bit.stderr

@@ -1,6 +1,6 @@
-//@revisions: 32bit 64bit
-//@[32bit]ignore-bitwidth: 64
-//@[64bit]ignore-bitwidth: 32
+//@revisions: r32bit r64bit
+//@[r32bit]ignore-bitwidth: 64
+//@[r64bit]ignore-bitwidth: 32
 //@no-rustfix
 #![warn(clippy::fn_to_numeric_cast, clippy::fn_to_numeric_cast_with_truncation)]
 #![allow(function_casts_as_integer)]
@@ -15,8 +15,8 @@ fn test_function_to_numeric_cast() {
     let _ = foo as i16;
     //~^ fn_to_numeric_cast_with_truncation
     let _ = foo as i32;
-    //~[64bit]^ fn_to_numeric_cast_with_truncation
-    //~[32bit]^^ fn_to_numeric_cast
+    //~[r64bit]^ fn_to_numeric_cast_with_truncation
+    //~[r32bit]^^ fn_to_numeric_cast
     let _ = foo as i64;
     //~^ fn_to_numeric_cast
     let _ = foo as i128;
@@ -29,8 +29,8 @@ fn test_function_to_numeric_cast() {
     let _ = foo as u16;
     //~^ fn_to_numeric_cast_with_truncation
     let _ = foo as u32;
-    //~[64bit]^ fn_to_numeric_cast_with_truncation
-    //~[32bit]^^ fn_to_numeric_cast
+    //~[r64bit]^ fn_to_numeric_cast_with_truncation
+    //~[r32bit]^^ fn_to_numeric_cast
     let _ = foo as u64;
     //~^ fn_to_numeric_cast
     let _ = foo as u128;
@@ -52,8 +52,8 @@ fn test_function_var_to_numeric_cast() {
     let _ = abc as i16;
     //~^ fn_to_numeric_cast_with_truncation
     let _ = abc as i32;
-    //~[64bit]^ fn_to_numeric_cast_with_truncation
-    //~[32bit]^^ fn_to_numeric_cast
+    //~[r64bit]^ fn_to_numeric_cast_with_truncation
+    //~[r32bit]^^ fn_to_numeric_cast
     let _ = abc as i64;
     //~^ fn_to_numeric_cast
     let _ = abc as i128;
@@ -66,8 +66,8 @@ fn test_function_var_to_numeric_cast() {
     let _ = abc as u16;
     //~^ fn_to_numeric_cast_with_truncation
     let _ = abc as u32;
-    //~[64bit]^ fn_to_numeric_cast_with_truncation
-    //~[32bit]^^ fn_to_numeric_cast
+    //~[r64bit]^ fn_to_numeric_cast_with_truncation
+    //~[r32bit]^^ fn_to_numeric_cast
     let _ = abc as u64;
     //~^ fn_to_numeric_cast
     let _ = abc as u128;
@@ -79,8 +79,8 @@ fn test_function_var_to_numeric_cast() {
 
 fn fn_with_fn_args(f: fn(i32) -> i32) -> i32 {
     f as i32
-    //~[64bit]^ fn_to_numeric_cast_with_truncation
-    //~[32bit]^^ fn_to_numeric_cast
+    //~[r64bit]^ fn_to_numeric_cast_with_truncation
+    //~[r32bit]^^ fn_to_numeric_cast
 }
 
 fn main() {}

tests/ui/cast_size.rs

@@ -1,8 +1,8 @@
-//@revisions: 32bit 64bit
+//@revisions: r32bit r64bit
 //@aux-build:proc_macros.rs
 //@no-rustfix
-//@[32bit]ignore-bitwidth: 64
-//@[64bit]ignore-bitwidth: 32
+//@[r32bit]ignore-bitwidth: 64
+//@[r64bit]ignore-bitwidth: 32
 #![allow(dead_code)]
 #![allow(unused_variables)]
 #![warn(clippy::large_enum_variant)]
@@ -221,13 +221,13 @@ mod issue11915 {
     }
 
     enum NoWarnings {
-        //~[64bit]^ large_enum_variant
+        //~[r64bit]^ large_enum_variant
         BigBoi(PublishWithBytes),
         _SmallBoi(u8),
     }
 
     enum MakesClippyAngry {
-        //~[64bit]^ large_enum_variant
+        //~[r64bit]^ large_enum_variant
         BigBoi(PublishWithVec),
         _SmallBoi(u8),
     }