for crater: make this a hard error

Author: RalfJung

compiler/rustc_hir_analysis/src/collect.rs

@@ -638,16 +638,12 @@ pub(super) fn lower_enum_variant_types(tcx: TyCtxt<'_>, def_id: LocalDefId) {
             let c_int = Size::from_bits(tcx.sess.target.c_int_width);
             if discr_val < c_int.signed_int_min() || discr_val > c_int.signed_int_max() {
                 let span = tcx.def_span(variant.def_id);
-                tcx.node_span_lint(
-                    rustc_session::lint::builtin::REPR_C_ENUMS_LARGER_THAN_INT,
-                    tcx.local_def_id_to_hir_id(def_id),
-                    span,
-                    |d| {
-                        d.primary_message("`repr(C)` enum discriminant does not fit into C `int`")
-                        .note("`repr(C)` enums with big discriminants are non-portable, and their size in Rust might not match their size in C")
-                        .help("use `repr($int_ty)` instead to explicitly set the size of this enum");
-                    }
-                );
+                let mut d = tcx
+                    .dcx()
+                    .struct_span_err(span, "`repr(C)` enum discriminant does not fit into C `int`");
+                d.note("`repr(C)` enums with big discriminants are non-portable, and their size in Rust might not match their size in C")
+                    .help("use `repr($int_ty)` instead to explicitly set the size of this enum");
+                d.emit();
             }
         }
 

tests/ui/enum-discriminant/repr-c-big-discriminant1.ptr32.stderr

@@ -8,7 +8,7 @@ LL |     A = 9223372036854775807, // i64::MAX
    = note: `#[deny(overflowing_literals)]` on by default
 
 error: literal out of range for `isize`
-  --> $DIR/repr-c-big-discriminant1.rs:24:9
+  --> $DIR/repr-c-big-discriminant1.rs:23:9
    |
 LL |     A = -2147483649, // i32::MIN-1
    |         ^^^^^^^^^^^

tests/ui/enum-discriminant/repr-c-big-discriminant1.ptr64.stderr

@@ -4,35 +4,24 @@ error: `repr(C)` enum discriminant does not fit into C `int`
 LL |     A = 9223372036854775807, // i64::MAX
    |     ^
    |
-   = warning: 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 #124403 <https://github.com/rust-lang/rust/issues/124403>
    = note: `repr(C)` enums with big discriminants are non-portable, and their size in Rust might not match their size in C
    = help: use `repr($int_ty)` instead to explicitly set the size of this enum
-note: the lint level is defined here
-  --> $DIR/repr-c-big-discriminant1.rs:6:9
-   |
-LL | #![deny(repr_c_enums_larger_than_int)]
-   |         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 error: `repr(C)` enum discriminant does not fit into C `int`
-  --> $DIR/repr-c-big-discriminant1.rs:24:5
+  --> $DIR/repr-c-big-discriminant1.rs:23:5
    |
 LL |     A = -2147483649, // i32::MIN-1
    |     ^
    |
-   = warning: 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 #124403 <https://github.com/rust-lang/rust/issues/124403>
    = note: `repr(C)` enums with big discriminants are non-portable, and their size in Rust might not match their size in C
    = help: use `repr($int_ty)` instead to explicitly set the size of this enum
 
 error: `repr(C)` enum discriminant does not fit into C `int`
-  --> $DIR/repr-c-big-discriminant1.rs:34:5
+  --> $DIR/repr-c-big-discriminant1.rs:32:5
    |
 LL |     A = I64_MAX as isize,
    |     ^
    |
-   = warning: 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 #124403 <https://github.com/rust-lang/rust/issues/124403>
    = note: `repr(C)` enums with big discriminants are non-portable, and their size in Rust might not match their size in C
    = help: use `repr($int_ty)` instead to explicitly set the size of this enum
 

tests/ui/enum-discriminant/repr-c-big-discriminant1.rs

@@ -16,15 +16,13 @@ enum OverflowingEnum1 {
     A = 9223372036854775807, // i64::MAX
     //[ptr32]~^ ERROR: literal out of range
     //[ptr64]~^^ ERROR: discriminant does not fit into C `int`
-    //[ptr64]~^^^ WARN: previously accepted
 }
 
 #[repr(C)]
 enum OverflowingEnum2 {
     A = -2147483649, // i32::MIN-1
     //[ptr32]~^ ERROR: literal out of range
     //[ptr64]~^^ ERROR: discriminant does not fit into C `int`
-    //[ptr64]~^^^ WARN: previously accepted
 }
 
 const I64_MAX: i64 = 9223372036854775807;
@@ -33,7 +31,6 @@ const I64_MAX: i64 = 9223372036854775807;
 enum OverflowingEnum3 {
     A = I64_MAX as isize,
     //[ptr64]~^ ERROR: discriminant does not fit into C `int`
-    //[ptr64]~^^ WARN: previously accepted
     // No warning/error on 32bit targets, but the `as isize` hints that wrapping is occurring.
 }
 

tests/ui/enum-discriminant/repr-c-big-discriminant2.ptr64.stderr

@@ -4,15 +4,8 @@ error: `repr(C)` enum discriminant does not fit into C `int`
 LL |     B, // +1
    |     ^
    |
-   = warning: 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 #124403 <https://github.com/rust-lang/rust/issues/124403>
    = note: `repr(C)` enums with big discriminants are non-portable, and their size in Rust might not match their size in C
    = help: use `repr($int_ty)` instead to explicitly set the size of this enum
-note: the lint level is defined here
-  --> $DIR/repr-c-big-discriminant2.rs:6:9
-   |
-LL | #![deny(repr_c_enums_larger_than_int)]
-   |         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 error: aborting due to 1 previous error
 

tests/ui/enum-discriminant/repr-c-big-discriminant2.rs

@@ -19,7 +19,6 @@ enum OverflowingEnum {
     B, // +1
     //[ptr32]~^ ERROR: enum discriminant overflowed
     //[ptr64]~^^ ERROR: discriminant does not fit into C `int`
-    //[ptr64]~^^^ WARN: previously accepted
 }
 
 fn main() {}