Degeneralize TopLevel notes to be only about expected/found

Author: estebank

src/librustc_errors/diagnostic.rs

@@ -95,16 +95,17 @@ impl Diagnostic {
                                      found_extra: &fmt::Display)
                                      -> &mut Self
     {
-        // For now, just attach these as notes
-        self.top_level_note(&format!("expected {} `{}`{}", label, expected, expected_extra));
-        self.top_level_note(&format!("   found {} `{}`{}", label, found, found_extra));
+        self.sub(Level::Expected,
+                 &format!("{} `{}`{}", label, expected, expected_extra),
+                 MultiSpan::new(),
+                 None);
+        self.sub(Level::Found,
+                 &format!("{} `{}`{}", label, found, found_extra),
+                 MultiSpan::new(),
+                 None);
         self
     }
 
-    pub fn top_level_note(&mut self, msg: &str) -> &mut Self {
-        self.sub(Level::TopLevel, msg, MultiSpan::new(), None);
-        self
-    }
 
     pub fn note(&mut self, msg: &str) -> &mut Self {
         self.sub(Level::Note, msg, MultiSpan::new(), None);

src/librustc_errors/diagnostic_builder.rs

@@ -91,7 +91,8 @@ impl<'a> DiagnosticBuilder<'a> {
             Level::Warning |
             Level::Note |
             Level::Help |
-            Level::TopLevel |
+            Level::Expected |
+            Level::Found |
             Level::Cancelled => {
             }
         }

src/librustc_errors/emitter.rs

@@ -720,18 +720,23 @@ impl EmitterWriter {
             }
             draw_note_separator(&mut buffer, 0, max_line_num_len + 1);
             match level {
-                &Level::TopLevel => (),
+                &Level::Expected => {
+                    buffer.append(0, &level.to_string(), Style::NoStyle);
+                    buffer.append(0, " ", Style::NoStyle);
+                }
+                &Level::Found => {
+                    buffer.append(0, "  ", Style::NoStyle);
+                    buffer.append(0, &level.to_string(), Style::NoStyle);
+                    buffer.append(0, " ", Style::NoStyle);
+                },
                 _ => {
                     buffer.append(0, &level.to_string(), Style::HeaderMsg);
                     buffer.append(0, ": ", Style::NoStyle);
                 }
             }
             buffer.append(0, msg, Style::NoStyle);
         } else {
-            match level {
-                &Level::TopLevel => (),
-                _ => buffer.append(0, &level.to_string(), Style::Level(level.clone())),
-            }
+            buffer.append(0, &level.to_string(), Style::Level(level.clone()));
             match code {
                 &Some(ref code) => {
                     buffer.append(0, "[", Style::Level(level.clone()));

src/librustc_errors/lib.rs

@@ -496,8 +496,9 @@ pub enum Level {
     Note,
     Help,
     Cancelled,
-    // A note without the `note: ` prefix in the presentation
-    TopLevel,
+    // Expected/Found type/struct/variant
+    Expected,
+    Found,
 }
 
 impl fmt::Display for Level {
@@ -517,7 +518,7 @@ impl Level {
                     term::color::YELLOW
                 }
             }
-            Note | TopLevel => term::color::BRIGHT_GREEN,
+            Note | Expected | Found => term::color::BRIGHT_GREEN,
             Help => term::color::BRIGHT_CYAN,
             Cancelled => unreachable!(),
         }
@@ -529,7 +530,8 @@ impl Level {
             Fatal | PhaseFatal | Error => "error",
             Warning => "warning",
             Note => "note",
-            TopLevel => "note",
+            Expected => "expected",
+            Found => "found",
             Help => "help",
             Cancelled => panic!("Shouldn't call on cancelled error"),
         }