4 files changed, 29 insertions, 32 deletions
diff --git a/src/test/ui/enum/issue-67945-1.rs b/src/test/ui/enum/issue-67945-1.rs
index 7977bddae7b..f4697344cc7 100644
--- a/src/test/ui/enum/issue-67945-1.rs
+++ b/src/test/ui/enum/issue-67945-1.rs
@@ -1,6 +1,6 @@
-enum Bug<S> {
+enum Bug<S> { //~ ERROR parameter `S` is never used
     Var = {
-        let x: S = 0; //~ ERROR: mismatched types
+        let x: S = 0; //~ ERROR generic parameters may not be used
         0
     },
 }
diff --git a/src/test/ui/enum/issue-67945-1.stderr b/src/test/ui/enum/issue-67945-1.stderr
index 6583fe13d0c..32ca94203e6 100644
--- a/src/test/ui/enum/issue-67945-1.stderr
+++ b/src/test/ui/enum/issue-67945-1.stderr
@@ -1,17 +1,20 @@
-error[E0308]: mismatched types
-  --> $DIR/issue-67945-1.rs:3:20
+error: generic parameters may not be used in const operations
+  --> $DIR/issue-67945-1.rs:3:16
    |
-LL | enum Bug<S> {
-   |          - this type parameter
-LL |     Var = {
 LL |         let x: S = 0;
-   |                -   ^ expected type parameter `S`, found integer
-   |                |
-   |                expected due to this
+   |                ^ cannot perform const operation using `S`
+   |
+   = note: type parameters may not be used in const expressions
+   = help: use `#![feature(const_generics)]` and `#![feature(const_evaluatable_checked)]` to allow generic const expressions
+
+error[E0392]: parameter `S` is never used
+  --> $DIR/issue-67945-1.rs:1:10
+   |
+LL | enum Bug<S> {
+   |          ^ unused parameter
    |
-   = note: expected type parameter `S`
-                        found type `{integer}`
+   = help: consider removing `S`, referring to it in a field, or using a marker such as `PhantomData`
 
-error: aborting due to previous error
+error: aborting due to 2 previous errors
 
-For more information about this error, try `rustc --explain E0308`.
+For more information about this error, try `rustc --explain E0392`.
diff --git a/src/test/ui/enum/issue-67945-2.rs b/src/test/ui/enum/issue-67945-2.rs
index 16bd8530ab3..e5044468da1 100644
--- a/src/test/ui/enum/issue-67945-2.rs
+++ b/src/test/ui/enum/issue-67945-2.rs
@@ -1,9 +1,8 @@
 #![feature(type_ascription)]
 
-enum Bug<S> {
+enum Bug<S> { //~ ERROR parameter `S` is never used
     Var = 0: S,
-    //~^ ERROR: mismatched types
-    //~| ERROR: mismatched types
+    //~^ ERROR generic parameters may not be used
 }
 
 fn main() {}
diff --git a/src/test/ui/enum/issue-67945-2.stderr b/src/test/ui/enum/issue-67945-2.stderr
index c40506d59ed..a738d3b15a5 100644
--- a/src/test/ui/enum/issue-67945-2.stderr
+++ b/src/test/ui/enum/issue-67945-2.stderr
@@ -1,25 +1,20 @@
-error[E0308]: mismatched types
-  --> $DIR/issue-67945-2.rs:4:11
+error: generic parameters may not be used in const operations
+  --> $DIR/issue-67945-2.rs:4:14
    |
-LL | enum Bug<S> {
-   |          - this type parameter
 LL |     Var = 0: S,
-   |           ^ expected type parameter `S`, found integer
+   |              ^ cannot perform const operation using `S`
    |
-   = note: expected type parameter `S`
-                        found type `{integer}`
+   = note: type parameters may not be used in const expressions
+   = help: use `#![feature(const_generics)]` and `#![feature(const_evaluatable_checked)]` to allow generic const expressions
 
-error[E0308]: mismatched types
-  --> $DIR/issue-67945-2.rs:4:11
+error[E0392]: parameter `S` is never used
+  --> $DIR/issue-67945-2.rs:3:10
    |
 LL | enum Bug<S> {
-   |          - this type parameter
-LL |     Var = 0: S,
-   |           ^^^^ expected `isize`, found type parameter `S`
+   |          ^ unused parameter
    |
-   = note:        expected type `isize`
-           found type parameter `S`
+   = help: consider removing `S`, referring to it in a field, or using a marker such as `PhantomData`
 
 error: aborting due to 2 previous errors
 
-For more information about this error, try `rustc --explain E0308`.
+For more information about this error, try `rustc --explain E0392`.