Update E0370 to new error format

GuillaumeGomez · GuillaumeGomez · commit 8ea426a6ceb0 · 2016-09-30T23:33:24.000+02:00
diff --git a/src/librustc_typeck/collect.rs b/src/librustc_typeck/collect.rs
@@ -1164,10 +1164,12 @@ fn convert_enum_def<'a, 'tcx>(ccx: &CrateCtxt<'a, 'tcx>,
         } else if let Some(disr) = repr_type.disr_incr(tcx, prev_disr) {
             Some(disr)
         } else {
-            span_err!(tcx.sess, v.span, E0370,
-                      "enum discriminant overflowed on value after {}; \
-                       set explicitly via {} = {} if that is desired outcome",
-                      prev_disr.unwrap(), v.node.name, wrapped_disr);
+            struct_span_err!(tcx.sess, v.span, E0370,
+                             "enum discriminant overflowed")
+                .span_label(v.span, &format!("overflowed on value after {}", prev_disr.unwrap()))
+                .note(&format!("explicitly set `{} = {}` if that is desired outcome",
+                               v.node.name, wrapped_disr))
+                .emit();
             None
         }.unwrap_or(wrapped_disr);
         prev_disr = Some(disr);
diff --git a/src/test/compile-fail/discrim-overflow-2.rs b/src/test/compile-fail/discrim-overflow-2.rs
@@ -24,7 +24,9 @@ fn f_i8() {
     enum A {
         Ok = i8::MAX - 1,
         Ok2,
-        OhNo, //~ ERROR enum discriminant overflowed on value after 127i8; set explicitly via OhNo = -128i8 if that is desired outcome
+        OhNo, //~ ERROR enum discriminant overflowed [E0370]
+              //~| NOTE overflowed on value after 127i8
+              //~| NOTE explicitly set `OhNo = -128i8` if that is desired outcome
     }
 }
 
@@ -33,7 +35,9 @@ fn f_u8() {
     enum A {
         Ok = u8::MAX - 1,
         Ok2,
-        OhNo, //~ ERROR enum discriminant overflowed on value after 255u8; set explicitly via OhNo = 0u8 if that is desired outcome
+        OhNo, //~ ERROR enum discriminant overflowed [E0370]
+              //~| NOTE overflowed on value after 255u8
+              //~| NOTE explicitly set `OhNo = 0u8` if that is desired outcome
     }
 }
 
@@ -42,7 +46,9 @@ fn f_i16() {
     enum A {
         Ok = i16::MAX - 1,
         Ok2,
-        OhNo, //~ ERROR enum discriminant overflowed
+        OhNo, //~ ERROR enum discriminant overflowed [E0370]
+              //~| NOTE overflowed on value after 32767i16
+              //~| NOTE explicitly set `OhNo = -32768i16` if that is desired outcome
     }
 }
 
@@ -51,7 +57,9 @@ fn f_u16() {
     enum A {
         Ok = u16::MAX - 1,
         Ok2,
-        OhNo, //~ ERROR enum discriminant overflowed
+        OhNo, //~ ERROR enum discriminant overflowed [E0370]
+              //~| NOTE overflowed on value after 65535u16
+              //~| NOTE explicitly set `OhNo = 0u16` if that is desired outcome
     }
 }
 
@@ -60,7 +68,9 @@ fn f_i32() {
     enum A {
         Ok = i32::MAX - 1,
         Ok2,
-        OhNo, //~ ERROR enum discriminant overflowed
+        OhNo, //~ ERROR enum discriminant overflowed [E0370]
+              //~| NOTE overflowed on value after 2147483647i32
+              //~| NOTE explicitly set `OhNo = -2147483648i32` if that is desired outcome
     }
 }
 
@@ -69,7 +79,9 @@ fn f_u32() {
     enum A {
         Ok = u32::MAX - 1,
         Ok2,
-        OhNo, //~ ERROR enum discriminant overflowed
+        OhNo, //~ ERROR enum discriminant overflowed [E0370]
+              //~| NOTE overflowed on value after 4294967295u32
+              //~| NOTE explicitly set `OhNo = 0u32` if that is desired outcome
     }
 }
 
@@ -78,7 +90,9 @@ fn f_i64() {
     enum A {
         Ok = i64::MAX - 1,
         Ok2,
-        OhNo, //~ ERROR enum discriminant overflowed
+        OhNo, //~ ERROR enum discriminant overflowed [E0370]
+              //~| NOTE overflowed on value after 9223372036854775807i64
+              //~| NOTE explicitly set `OhNo = -9223372036854775808i64` if that is desired outcome
     }
 }
 
@@ -87,7 +101,9 @@ fn f_u64() {
     enum A {
         Ok = u64::MAX - 1,
         Ok2,
-        OhNo, //~ ERROR enum discriminant overflowed
+        OhNo, //~ ERROR enum discriminant overflowed [E0370]
+              //~| NOTE overflowed on value after 18446744073709551615u64
+              //~| NOTE explicitly set `OhNo = 0u64` if that is desired outcome
     }
 }
 
diff --git a/src/test/compile-fail/discrim-overflow.rs b/src/test/compile-fail/discrim-overflow.rs
@@ -22,7 +22,9 @@ fn f_i8() {
     enum A {
         Ok = i8::MAX - 1,
         Ok2,
-        OhNo, //~ ERROR enum discriminant overflowed on value after 127i8; set explicitly via OhNo = -128i8 if that is desired outcome
+        OhNo, //~ ERROR enum discriminant overflowed [E0370]
+              //~| NOTE overflowed on value after 127i8
+              //~| NOTE explicitly set `OhNo = -128i8` if that is desired outcome
     }
 
     let x = A::Ok;
@@ -33,7 +35,9 @@ fn f_u8() {
     enum A {
         Ok = u8::MAX - 1,
         Ok2,
-        OhNo, //~ ERROR enum discriminant overflowed on value after 255u8; set explicitly via OhNo = 0u8 if that is desired outcome
+        OhNo, //~ ERROR enum discriminant overflowed [E0370]
+              //~| NOTE overflowed on value after 255u8
+              //~| NOTE explicitly set `OhNo = 0u8` if that is desired outcome
     }
 
     let x = A::Ok;
@@ -44,7 +48,9 @@ fn f_i16() {
     enum A {
         Ok = i16::MAX - 1,
         Ok2,
-        OhNo, //~ ERROR enum discriminant overflowed
+        OhNo, //~ ERROR enum discriminant overflowed [E0370]
+              //~| NOTE overflowed on value after 32767i16
+              //~| NOTE explicitly set `OhNo = -32768i16` if that is desired outcome
     }
 
     let x = A::Ok;
@@ -55,7 +61,9 @@ fn f_u16() {
     enum A {
         Ok = u16::MAX - 1,
         Ok2,
-        OhNo, //~ ERROR enum discriminant overflowed
+        OhNo, //~ ERROR enum discriminant overflowed [E0370]
+              //~| overflowed on value after 65535u16
+              //~| NOTE explicitly set `OhNo = 0u16` if that is desired outcome
     }
 
     let x = A::Ok;
@@ -66,7 +74,9 @@ fn f_i32() {
     enum A {
         Ok = i32::MAX - 1,
         Ok2,
-        OhNo, //~ ERROR enum discriminant overflowed
+        OhNo, //~ ERROR enum discriminant overflowed [E0370]
+              //~| overflowed on value after 2147483647i32
+              //~| NOTE explicitly set `OhNo = -2147483648i32` if that is desired outcome
     }
 
     let x = A::Ok;
@@ -77,7 +87,9 @@ fn f_u32() {
     enum A {
         Ok = u32::MAX - 1,
         Ok2,
-        OhNo, //~ ERROR enum discriminant overflowed
+        OhNo, //~ ERROR enum discriminant overflowed [E0370]
+              //~| overflowed on value after 4294967295u32
+              //~| NOTE explicitly set `OhNo = 0u32` if that is desired outcome
     }
 
     let x = A::Ok;
@@ -88,7 +100,9 @@ fn f_i64() {
     enum A {
         Ok = i64::MAX - 1,
         Ok2,
-        OhNo, //~ ERROR enum discriminant overflowed
+        OhNo, //~ ERROR enum discriminant overflowed [E0370]
+              //~| overflowed on value after 9223372036854775807i64
+              //~| NOTE explicitly set `OhNo = -9223372036854775808i64` if that is desired outcome
     }
 
     let x = A::Ok;
@@ -99,7 +113,9 @@ fn f_u64() {
     enum A {
         Ok = u64::MAX - 1,
         Ok2,
-        OhNo, //~ ERROR enum discriminant overflowed
+        OhNo, //~ ERROR enum discriminant overflowed [E0370]
+              //~| overflowed on value after 18446744073709551615u64
+              //~| NOTE explicitly set `OhNo = 0u64` if that is desired outcome
     }
 
     let x = A::Ok;

Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,9 @@ fn f_i8() {`
`24`	`24`	`enum A {`
`25`	`25`	`Ok = i8::MAX - 1,`
`26`	`26`	`Ok2,`
`27`		`- OhNo, //~ ERROR enum discriminant overflowed on value after 127i8; set explicitly via OhNo = -128i8 if that is desired outcome`
	`27`	`+ OhNo, //~ ERROR enum discriminant overflowed [E0370]`
	`28`	`+ //~\| NOTE overflowed on value after 127i8`
	`29`	+ //~\| NOTE explicitly set `OhNo = -128i8` if that is desired outcome
`28`	`30`	`}`
`29`	`31`	`}`
`30`	`32`
`@@ -33,7 +35,9 @@ fn f_u8() {`
`33`	`35`	`enum A {`
`34`	`36`	`Ok = u8::MAX - 1,`
`35`	`37`	`Ok2,`
`36`		`- OhNo, //~ ERROR enum discriminant overflowed on value after 255u8; set explicitly via OhNo = 0u8 if that is desired outcome`
	`38`	`+ OhNo, //~ ERROR enum discriminant overflowed [E0370]`
	`39`	`+ //~\| NOTE overflowed on value after 255u8`
	`40`	+ //~\| NOTE explicitly set `OhNo = 0u8` if that is desired outcome
`37`	`41`	`}`
`38`	`42`	`}`
`39`	`43`
`@@ -42,7 +46,9 @@ fn f_i16() {`
`42`	`46`	`enum A {`
`43`	`47`	`Ok = i16::MAX - 1,`
`44`	`48`	`Ok2,`
`45`		`- OhNo, //~ ERROR enum discriminant overflowed`
	`49`	`+ OhNo, //~ ERROR enum discriminant overflowed [E0370]`
	`50`	`+ //~\| NOTE overflowed on value after 32767i16`
	`51`	+ //~\| NOTE explicitly set `OhNo = -32768i16` if that is desired outcome
`46`	`52`	`}`
`47`	`53`	`}`
`48`	`54`
`@@ -51,7 +57,9 @@ fn f_u16() {`
`51`	`57`	`enum A {`
`52`	`58`	`Ok = u16::MAX - 1,`
`53`	`59`	`Ok2,`
`54`		`- OhNo, //~ ERROR enum discriminant overflowed`
	`60`	`+ OhNo, //~ ERROR enum discriminant overflowed [E0370]`
	`61`	`+ //~\| NOTE overflowed on value after 65535u16`
	`62`	+ //~\| NOTE explicitly set `OhNo = 0u16` if that is desired outcome
`55`	`63`	`}`
`56`	`64`	`}`
`57`	`65`
`@@ -60,7 +68,9 @@ fn f_i32() {`
`60`	`68`	`enum A {`
`61`	`69`	`Ok = i32::MAX - 1,`
`62`	`70`	`Ok2,`
`63`		`- OhNo, //~ ERROR enum discriminant overflowed`
	`71`	`+ OhNo, //~ ERROR enum discriminant overflowed [E0370]`
	`72`	`+ //~\| NOTE overflowed on value after 2147483647i32`
	`73`	+ //~\| NOTE explicitly set `OhNo = -2147483648i32` if that is desired outcome
`64`	`74`	`}`
`65`	`75`	`}`
`66`	`76`
`@@ -69,7 +79,9 @@ fn f_u32() {`
`69`	`79`	`enum A {`
`70`	`80`	`Ok = u32::MAX - 1,`
`71`	`81`	`Ok2,`
`72`		`- OhNo, //~ ERROR enum discriminant overflowed`
	`82`	`+ OhNo, //~ ERROR enum discriminant overflowed [E0370]`
	`83`	`+ //~\| NOTE overflowed on value after 4294967295u32`
	`84`	+ //~\| NOTE explicitly set `OhNo = 0u32` if that is desired outcome
`73`	`85`	`}`
`74`	`86`	`}`
`75`	`87`
`@@ -78,7 +90,9 @@ fn f_i64() {`
`78`	`90`	`enum A {`
`79`	`91`	`Ok = i64::MAX - 1,`
`80`	`92`	`Ok2,`
`81`		`- OhNo, //~ ERROR enum discriminant overflowed`
	`93`	`+ OhNo, //~ ERROR enum discriminant overflowed [E0370]`
	`94`	`+ //~\| NOTE overflowed on value after 9223372036854775807i64`
	`95`	+ //~\| NOTE explicitly set `OhNo = -9223372036854775808i64` if that is desired outcome
`82`	`96`	`}`
`83`	`97`	`}`
`84`	`98`
`@@ -87,7 +101,9 @@ fn f_u64() {`
`87`	`101`	`enum A {`
`88`	`102`	`Ok = u64::MAX - 1,`
`89`	`103`	`Ok2,`
`90`		`- OhNo, //~ ERROR enum discriminant overflowed`
	`104`	`+ OhNo, //~ ERROR enum discriminant overflowed [E0370]`
	`105`	`+ //~\| NOTE overflowed on value after 18446744073709551615u64`
	`106`	+ //~\| NOTE explicitly set `OhNo = 0u64` if that is desired outcome
`91`	`107`	`}`
`92`	`108`	`}`
`93`	`109`