Auto merge of rust-lang#2237 - RalfJung:ice, r=oli-obk

bors · bors · commit fa4e77c9fda4 · 2022-06-16T20:26:12.000Z
add ICE error level Fixes rust-lang/miri#2235 But I am not sure if anything else should be adjusted when adding a new error level...
diff --git a/ui_test/src/rustc_stderr.rs b/ui_test/src/rustc_stderr.rs
@@ -16,6 +16,7 @@ struct RustcMessage {
 
 #[derive(Copy, Clone, Debug, PartialOrd, Ord, PartialEq, Eq)]
 pub(crate) enum Level {
+    Ice = 5,
     Error = 4,
     Warn = 3,
     Help = 2,
@@ -52,6 +53,7 @@ impl std::str::FromStr for Level {
             "HELP" | "help" => Ok(Self::Help),
             "NOTE" | "note" => Ok(Self::Note),
             "failure-note" => Ok(Self::FailureNote),
+            "error: internal compiler error" => Ok(Self::Ice),
             _ => Err(format!("unknown level `{s}`")),
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,7 @@ struct RustcMessage {`
`16`	`16`
`17`	`17`	`#[derive(Copy, Clone, Debug, PartialOrd, Ord, PartialEq, Eq)]`
`18`	`18`	`pub(crate) enum Level {`
	`19`	`+ Ice = 5,`
`19`	`20`	`Error = 4,`
`20`	`21`	`Warn = 3,`
`21`	`22`	`Help = 2,`
`@@ -52,6 +53,7 @@ impl std::str::FromStr for Level {`
`52`	`53`	`"HELP" \| "help" => Ok(Self::Help),`
`53`	`54`	`"NOTE" \| "note" => Ok(Self::Note),`
`54`	`55`	`"failure-note" => Ok(Self::FailureNote),`
	`56`	`+ "error: internal compiler error" => Ok(Self::Ice),`
`55`	`57`	_ => Err(format!("unknown level `{s}`")),
`56`	`58`	`}`
`57`	`59`	`}`