diff --git a/src/librustc_errors/diagnostic.rs b/src/librustc_errors/diagnostic.rs
index 6c079db3e236d..1b70cbd2a3b68 100644
--- a/src/librustc_errors/diagnostic.rs
+++ b/src/librustc_errors/diagnostic.rs
@@ -10,8 +10,6 @@
 
 use CodeSuggestion;
 use Level;
-use RenderSpan;
-use RenderSpan::{Suggestion, Guesses};
 use std::{fmt, iter};
 use syntax_pos::{MultiSpan, Span};
 use snippet::Style;
@@ -24,6 +22,19 @@ pub struct Diagnostic {
     pub code: Option<String>,
     pub span: MultiSpan,
     pub children: Vec<SubDiagnostic>,
+    pub code_hints: Option<DiagnosticCodeHint>,
+}
+
+#[derive(Clone, Debug, PartialEq)]
+pub enum DiagnosticCodeHint {
+    Suggestion {
+        msg: String,
+        sugg: CodeSuggestion,
+    },
+    Guesses {
+        msg: String,
+        guesses: Vec<CodeSuggestion>,
+    },
 }
 
 /// For example a note attached to an error.
@@ -32,7 +43,7 @@ pub struct SubDiagnostic {
     pub level: Level,
     pub message: Vec<(String, Style)>,
     pub span: MultiSpan,
-    pub render_span: Option<RenderSpan>,
+    pub render_span: Option<MultiSpan>,
 }
 
 impl Diagnostic {
@@ -47,6 +58,7 @@ impl Diagnostic {
             code: code,
             span: MultiSpan::new(),
             children: vec![],
+            code_hints: None,
         }
     }
 
@@ -109,12 +121,12 @@ impl Diagnostic {
     }
 
     pub fn note(&mut self, msg: &str) -> &mut Self {
-        self.sub(Level::Note, msg, MultiSpan::new(), None);
+        self.sub(Level::Note, msg, MultiSpan::new());
         self
     }
 
     pub fn highlighted_note(&mut self, msg: Vec<(String, Style)>) -> &mut Self {
-        self.sub_with_highlights(Level::Note, msg, MultiSpan::new(), None);
+        self.sub_with_highlights(Level::Note, msg, MultiSpan::new());
         self
     }
 
@@ -122,12 +134,12 @@ impl Diagnostic {
                                          sp: S,
                                          msg: &str)
                                          -> &mut Self {
-        self.sub(Level::Note, msg, sp.into(), None);
+        self.sub(Level::Note, msg, sp.into());
         self
     }
 
     pub fn warn(&mut self, msg: &str) -> &mut Self {
-        self.sub(Level::Warning, msg, MultiSpan::new(), None);
+        self.sub(Level::Warning, msg, MultiSpan::new());
         self
     }
 
@@ -135,12 +147,12 @@ impl Diagnostic {
                                          sp: S,
                                          msg: &str)
                                          -> &mut Self {
-        self.sub(Level::Warning, msg, sp.into(), None);
+        self.sub(Level::Warning, msg, sp.into());
         self
     }
 
     pub fn help(&mut self , msg: &str) -> &mut Self {
-        self.sub(Level::Help, msg, MultiSpan::new(), None);
+        self.sub(Level::Help, msg, MultiSpan::new());
         self
     }
 
@@ -148,7 +160,7 @@ impl Diagnostic {
                                          sp: S,
                                          msg: &str)
                                          -> &mut Self {
-        self.sub(Level::Help, msg, sp.into(), None);
+        self.sub(Level::Help, msg, sp.into());
         self
     }
 
@@ -156,13 +168,15 @@ impl Diagnostic {
     ///
     /// See `diagnostic::RenderSpan::Suggestion` for more information.
     pub fn span_suggestion(&mut self, sp: Span, msg: &str, suggestion: String) -> &mut Self {
-        self.sub(Level::Help,
-                 msg,
-                 MultiSpan::new(),
-                 Some(Suggestion(CodeSuggestion {
-                     msp: sp.into(),
-                     substitutes: vec![suggestion],
-                 })));
+        assert!(self.code_hints.is_none(),
+                "use guesses to assign multiple suggestions to an error");
+        self.code_hints = Some(DiagnosticCodeHint::Suggestion {
+            sugg: CodeSuggestion {
+                msp: sp.into(),
+                substitutes: vec![suggestion],
+            },
+            msg: msg.to_owned(),
+        });
         self
     }
 
@@ -174,13 +188,16 @@ impl Diagnostic {
     pub fn guesses<I>(&mut self, sp: Span, msg: &str, guesses: I) -> &mut Self
         where I: IntoIterator<Item = String>
     {
-        self.sub(Level::Help,
-                 msg,
-                 MultiSpan::new(),
-                 Some(Guesses(guesses.into_iter().map(|guess| CodeSuggestion {
-                     msp: sp.into(),
-                     substitutes: vec![guess],
-                 }).collect())));
+        assert!(self.code_hints.is_none(),
+                "cannot attach multiple guesses to the same error");
+        let guesses = guesses.into_iter().map(|guess| CodeSuggestion {
+            msp: sp.into(),
+            substitutes: vec![guess],
+        }).collect();
+        self.code_hints = Some(DiagnosticCodeHint::Guesses {
+            guesses: guesses,
+            msg: msg.to_owned(),
+        });
         self
     }
 
@@ -223,15 +240,12 @@ impl Diagnostic {
     fn sub(&mut self,
            level: Level,
            message: &str,
-           span: MultiSpan,
-           render_span: Option<RenderSpan>) {
-        let sub = SubDiagnostic {
-            level: level,
-            message: vec![(message.to_owned(), Style::NoStyle)],
-            span: span,
-            render_span: render_span,
-        };
-        self.children.push(sub);
+           span: MultiSpan) {
+        self.sub_with_highlights(
+            level,
+            vec![(message.to_owned(), Style::NoStyle)],
+            span,
+        );
     }
 
     /// Convenience function for internal use, clients should use one of the
@@ -239,13 +253,12 @@ impl Diagnostic {
     fn sub_with_highlights(&mut self,
                            level: Level,
                            message: Vec<(String, Style)>,
-                           span: MultiSpan,
-                           render_span: Option<RenderSpan>) {
+                           span: MultiSpan) {
         let sub = SubDiagnostic {
             level: level,
             message: message,
             span: span,
-            render_span: render_span,
+            render_span: None,
         };
         self.children.push(sub);
     }
diff --git a/src/librustc_errors/emitter.rs b/src/librustc_errors/emitter.rs
index d1c718d157e1f..d5784d32c6bb3 100644
--- a/src/librustc_errors/emitter.rs
+++ b/src/librustc_errors/emitter.rs
@@ -10,10 +10,9 @@
 
 use self::Destination::*;
 
-use syntax_pos::{COMMAND_LINE_SP, DUMMY_SP, FileMap, Span, MultiSpan, CharPos};
+use syntax_pos::{COMMAND_LINE_SP, DUMMY_SP, FileMap, Span, MultiSpan, CharPos, SpanLabel};
 
-use {Level, CodeSuggestion, DiagnosticBuilder, SubDiagnostic, CodeMapper};
-use RenderSpan::*;
+use {Level, CodeSuggestion, DiagnosticBuilder, SubDiagnostic, CodeMapper, DiagnosticCodeHint};
 use snippet::{Annotation, AnnotationType, Line, MultilineAnnotation, StyledString, Style};
 use styled_buffer::StyledBuffer;
 
@@ -37,7 +36,8 @@ impl Emitter for EmitterWriter {
                                    &db.styled_message(),
                                    &db.code,
                                    &primary_span,
-                                   &children);
+                                   &children,
+                                   db.code_hints.as_ref());
     }
 }
 
@@ -110,7 +110,10 @@ impl EmitterWriter {
         }
     }
 
-    fn preprocess_annotations(&self, msp: &MultiSpan) -> Vec<FileWithAnnotatedLines> {
+    fn preprocess_annotations(&self,
+                              msp: &MultiSpan,
+                              code_hint: &mut Option<&DiagnosticCodeHint>)
+                              -> Vec<FileWithAnnotatedLines> {
         fn add_annotation_to_file(file_vec: &mut Vec<FileWithAnnotatedLines>,
                                   file: Rc<FileMap>,
                                   line_index: usize,
@@ -149,11 +152,49 @@ impl EmitterWriter {
         let mut output = vec![];
         let mut multiline_annotations = vec![];
 
+        let hint = code_hint.and_then(|hint| match *hint {
+            DiagnosticCodeHint::Suggestion { ref msg, ref sugg } => Some((msg, sugg)),
+            DiagnosticCodeHint::Guesses { ref msg, ref guesses} => {
+                if guesses.len() == 1 {
+                    Some((msg, &guesses[0]))
+                } else {
+                    None
+                }
+            },
+        });
+        let mut hint = hint.and_then(|(msg, sugg)| {
+            if sugg.substitutes.len() == 1 && !sugg.substitutes[0].is_empty() {
+                let prim = sugg.msp.primary_spans();
+                assert_eq!(prim.len(), 1);
+                Some(SpanLabel {
+                    span: prim[0],
+                    is_primary: true,
+                    label: Some(format!("{} `{}`", msg, sugg.substitutes[0])),
+                })
+            } else {
+                None
+            }
+        });
+
         if let Some(ref cm) = self.cm {
-            for span_label in msp.span_labels() {
+            let mut span_labels = msp.span_labels();
+            // insert the hint into the correct label
+            for mut span_label in &mut span_labels {
+                if let Some(hint_label) = hint.take() {
+                    if span_label.span == hint_label.span {
+                        span_label.label = hint_label.label;
+                        *code_hint = None;
+                    } else {
+                        hint = Some(hint_label);
+                    }
+                }
+            }
+            // if no matching label found, print hint as an extra message
+            for span_label in span_labels.into_iter().chain(hint) {
                 if span_label.span == DUMMY_SP || span_label.span == COMMAND_LINE_SP {
                     continue;
                 }
+
                 let lo = cm.lookup_char_pos(span_label.span.lo);
                 let mut hi = cm.lookup_char_pos(span_label.span.hi);
                 let mut is_minimized = false;
@@ -728,7 +769,7 @@ impl EmitterWriter {
     /// displayed, keeping the provided highlighting.
     fn msg_to_buffer(&self,
                      buffer: &mut StyledBuffer,
-                     msg: &Vec<(String, Style)>,
+                     msg: &[(String, Style)],
                      padding: usize,
                      label: &str,
                      override_style: Option<Style>) {
@@ -806,7 +847,8 @@ impl EmitterWriter {
                             code: &Option<String>,
                             level: &Level,
                             max_line_num_len: usize,
-                            is_secondary: bool)
+                            is_secondary: bool,
+                            code_hints: &mut Option<&DiagnosticCodeHint>)
                             -> io::Result<()> {
         let mut buffer = StyledBuffer::new();
 
@@ -837,7 +879,7 @@ impl EmitterWriter {
 
         // Preprocess all the annotations so that they are grouped by file and by line number
         // This helps us quickly iterate over the whole message (including secondary file spans)
-        let mut annotated_files = self.preprocess_annotations(msp);
+        let mut annotated_files = self.preprocess_annotations(msp, code_hints);
 
         // Make sure our primary file comes first
         let primary_lo = if let (Some(ref cm), Some(ref primary_span)) =
@@ -941,8 +983,8 @@ impl EmitterWriter {
     }
     fn emit_suggestion_default(&mut self,
                                suggestion: &CodeSuggestion,
+                               msg: &str,
                                level: &Level,
-                               msg: &Vec<(String, Style)>,
                                max_line_num_len: usize)
                                -> io::Result<()> {
         use std::borrow::Borrow;
@@ -954,7 +996,7 @@ impl EmitterWriter {
             buffer.append(0, &level.to_string(), Style::Level(level.clone()));
             buffer.append(0, ": ", Style::HeaderMsg);
             self.msg_to_buffer(&mut buffer,
-                               msg,
+                               &[(msg.to_owned(), Style::NoStyle)],
                                max_line_num_len,
                                "suggestion",
                                Some(Style::HeaderMsg));
@@ -989,12 +1031,27 @@ impl EmitterWriter {
                              message: &Vec<(String, Style)>,
                              code: &Option<String>,
                              span: &MultiSpan,
-                             children: &Vec<SubDiagnostic>) {
+                             children: &Vec<SubDiagnostic>,
+                             mut code_hints: Option<&DiagnosticCodeHint>) {
         let max_line_num = self.get_max_line_num(span, children);
         let max_line_num_len = max_line_num.to_string().len();
 
-        match self.emit_message_default(span, message, code, level, max_line_num_len, false) {
+        match self.emit_message_default(span, message, code, level,
+                                        max_line_num_len, false, &mut code_hints) {
             Ok(()) => {
+                if let Some(&DiagnosticCodeHint::Guesses { ref msg, ref guesses}) = code_hints {
+                    if guesses.len() > 1 {
+                        for cs in guesses {
+                            match self.emit_suggestion_default(cs,
+                                                            msg,
+                                                            &Level::Note,
+                                                            max_line_num_len) {
+                                Err(e) => panic!("failed to emit error: {}", e),
+                                _ => ()
+                            }
+                        }
+                    }
+                }
                 if !children.is_empty() {
                     let mut buffer = StyledBuffer::new();
                     draw_col_separator_no_space(&mut buffer, 0, max_line_num_len + 1);
@@ -1004,47 +1061,16 @@ impl EmitterWriter {
                     }
                 }
                 for child in children {
-                    match child.render_span {
-                        Some(FullSpan(ref msp)) => {
-                            match self.emit_message_default(msp,
-                                                            &child.styled_message(),
-                                                            &None,
-                                                            &child.level,
-                                                            max_line_num_len,
-                                                            true) {
-                                Err(e) => panic!("failed to emit error: {}", e),
-                                _ => ()
-                            }
-                        },
-                        Some(Suggestion(ref cs)) => {
-                            match self.emit_suggestion_default(cs,
-                                                               &child.level,
-                                                               &child.styled_message(),
-                                                               max_line_num_len) {
-                                Err(e) => panic!("failed to emit error: {}", e),
-                                _ => ()
-                            }
-                        },
-                        Some(Guesses(ref guesses)) => for cs in guesses {
-                            match self.emit_suggestion_default(cs,
-                                                               &child.level,
-                                                               &child.styled_message(),
-                                                               max_line_num_len) {
-                                Err(e) => panic!("failed to emit error: {}", e),
-                                _ => ()
-                            }
-                        },
-                        None => {
-                            match self.emit_message_default(&child.span,
-                                                            &child.styled_message(),
-                                                            &None,
-                                                            &child.level,
-                                                            max_line_num_len,
-                                                            true) {
-                                Err(e) => panic!("failed to emit error: {}", e),
-                                _ => (),
-                            }
-                        }
+                    let msp = child.render_span.as_ref().unwrap_or(&child.span);
+                    match self.emit_message_default(msp,
+                                                    &child.styled_message(),
+                                                    &None,
+                                                    &child.level,
+                                                    max_line_num_len,
+                                                    true,
+                                                    &mut None) {
+                        Err(e) => panic!("failed to emit error: {}", e),
+                        _ => ()
                     }
                 }
             }
diff --git a/src/librustc_errors/lib.rs b/src/librustc_errors/lib.rs
index 50b5265fc6bf6..c30bd4deb8451 100644
--- a/src/librustc_errors/lib.rs
+++ b/src/librustc_errors/lib.rs
@@ -49,27 +49,6 @@ mod lock;
 use syntax_pos::{BytePos, Loc, FileLinesResult, FileName, MultiSpan, Span, NO_EXPANSION};
 use syntax_pos::MacroBacktrace;
 
-#[derive(Clone, Debug, PartialEq)]
-pub enum RenderSpan {
-    /// A FullSpan renders with both with an initial line for the
-    /// message, prefixed by file:linenum, followed by a summary of
-    /// the source code covered by the span.
-    FullSpan(MultiSpan),
-
-    /// A suggestion renders with both with an initial line for the
-    /// message, prefixed by file:linenum, followed by a summary
-    /// of hypothetical source code, where each `String` is spliced
-    /// into the lines in place of the code covered by each span.
-    Suggestion(CodeSuggestion),
-
-    /// Guesses work just like suggestions, but there can be one or
-    /// multiple guesses that aren't guaranteed to be correct.
-    /// This allows updating `did you mean` style error messages
-    /// to automatically applicable suggestions, but notifying the
-    /// user that care must be taken when doing so.
-    Guesses(Vec<CodeSuggestion>),
-}
-
 #[derive(Clone, Debug, PartialEq)]
 pub struct CodeSuggestion {
     pub msp: MultiSpan,
@@ -210,7 +189,7 @@ impl error::Error for ExplicitBug {
     }
 }
 
-pub use diagnostic::{Diagnostic, SubDiagnostic};
+pub use diagnostic::{Diagnostic, SubDiagnostic, DiagnosticCodeHint};
 pub use diagnostic_builder::DiagnosticBuilder;
 
 /// A handler deals with errors; certain errors
diff --git a/src/libsyntax/json.rs b/src/libsyntax/json.rs
index e201b4a4f6708..48820c124402b 100644
--- a/src/libsyntax/json.rs
+++ b/src/libsyntax/json.rs
@@ -22,7 +22,7 @@
 use codemap::CodeMap;
 use syntax_pos::{self, MacroBacktrace, Span, SpanLabel, MultiSpan};
 use errors::registry::Registry;
-use errors::{DiagnosticBuilder, SubDiagnostic, RenderSpan, CodeSuggestion, CodeMapper};
+use errors::{DiagnosticBuilder, SubDiagnostic, DiagnosticCodeHint, CodeSuggestion, CodeMapper};
 use errors::emitter::Emitter;
 
 use std::rc::Rc;
@@ -95,6 +95,8 @@ struct Diagnostic {
 
 #[derive(RustcEncodable)]
 struct Guess {
+    /// A message explaining the guesses ("did you mean ...?")
+    msg: String,
     /// one or multiple spans to be replaced by this guess
     spans: Vec<DiagnosticSpan>,
 }
@@ -162,6 +164,34 @@ impl Diagnostic {
     fn from_diagnostic_builder(db: &DiagnosticBuilder,
                                je: &JsonEmitter)
                                -> Diagnostic {
+        let (suggestion, guesses) = match db.code_hints {
+            Some(DiagnosticCodeHint::Suggestion{ref msg, ref sugg}) => {
+                use std::borrow::Borrow;
+                let sugg = Diagnostic {
+                    message: msg.clone(),
+                    code: None,
+                    level: "note",
+                    spans: DiagnosticSpan::from_suggestion(sugg, je),
+                    children: Vec::new(),
+                    rendered: Some(sugg.splice_lines(je.cm.borrow())),
+                    guesses: Vec::new(),
+                };
+                (Some(sugg), Vec::new())
+            },
+            Some(DiagnosticCodeHint::Guesses{ref msg, ref guesses}) => {
+                let guesses = guesses.iter()
+                    .map(|guess| {
+                        assert_eq!(guess.msp.span_labels().len(), guess.substitutes.len());
+                        Guess {
+                            msg: msg.clone(),
+                            spans: DiagnosticSpan::from_suggestion(guess, je),
+                        }
+                    })
+                    .collect();
+                (None, guesses)
+            },
+            None => (None, Vec::new())
+        };
         Diagnostic {
             message: db.message(),
             code: DiagnosticCode::map_opt_string(db.code.clone(), je),
@@ -169,35 +199,26 @@ impl Diagnostic {
             spans: DiagnosticSpan::from_multispan(&db.span, je),
             children: db.children.iter().map(|c| {
                 Diagnostic::from_sub_diagnostic(c, je)
-            }).collect(),
+            }).chain(suggestion).collect(),
             rendered: None,
-            guesses: Vec::new(),
+            guesses: guesses,
         }
     }
 
     fn from_sub_diagnostic(db: &SubDiagnostic, je: &JsonEmitter) -> Diagnostic {
-        let SubDiagnosticParts {
-            spans, rendered, guesses,
-        } = DiagnosticSpan::from_render_span(db.render_span.as_ref(), &db.span, je);
+        let msp = db.render_span.as_ref().unwrap_or(&db.span);
         Diagnostic {
             message: db.message(),
             code: None,
             level: db.level.to_str(),
-            spans,
+            spans: DiagnosticSpan::from_multispan(msp, je),
             children: vec![],
-            rendered,
-            guesses,
+            rendered: None,
+            guesses: Vec::new(),
         }
     }
 }
 
-#[derive(Default)]
-struct SubDiagnosticParts {
-    spans: Vec<DiagnosticSpan>,
-    rendered: Option<String>,
-    guesses: Vec<Guess>,
-}
-
 impl DiagnosticSpan {
     fn from_span_label(span: SpanLabel,
                        suggestion: Option<&String>,
@@ -297,43 +318,6 @@ impl DiagnosticSpan {
                       })
                       .collect()
     }
-
-    fn from_guesses(guesses: &[CodeSuggestion], je: &JsonEmitter) -> Vec<Guess> {
-        guesses.iter()
-            .map(|guess| {
-                assert_eq!(guess.msp.span_labels().len(), guess.substitutes.len());
-                Guess {
-                    spans: DiagnosticSpan::from_suggestion(guess, je),
-                }
-            })
-            .collect()
-    }
-
-    fn from_render_span(rsp: Option<&RenderSpan>,
-                        alt_span: &MultiSpan,
-                        je: &JsonEmitter,
-                        ) -> SubDiagnosticParts {
-        use std::borrow::Borrow;
-        match rsp {
-            None => SubDiagnosticParts {
-                spans: DiagnosticSpan::from_multispan(alt_span, je),
-                .. Default::default()
-            },
-            Some(&RenderSpan::FullSpan(ref msp)) => SubDiagnosticParts {
-                spans: DiagnosticSpan::from_multispan(msp, je),
-                .. Default::default()
-            },
-            Some(&RenderSpan::Suggestion(ref suggestion)) => SubDiagnosticParts {
-                spans: DiagnosticSpan::from_suggestion(suggestion, je),
-                rendered: Some(suggestion.splice_lines(je.cm.borrow())),
-                .. Default::default()
-            },
-            Some(&RenderSpan::Guesses(ref guesses)) => SubDiagnosticParts {
-                guesses: DiagnosticSpan::from_guesses(guesses, je),
-                .. Default::default()
-            },
-        }
-    }
 }
 
 impl DiagnosticSpanLine {
diff --git a/src/test/ui/did_you_mean/issue-36798.stderr b/src/test/ui/did_you_mean/issue-36798.stderr
index 7bb8104108ee9..895a047763162 100644
--- a/src/test/ui/did_you_mean/issue-36798.stderr
+++ b/src/test/ui/did_you_mean/issue-36798.stderr
@@ -2,10 +2,7 @@ error: no field `baz` on type `Foo`
   --> $DIR/issue-36798.rs:17:7
    |
 17 |     f.baz;
-   |       ^^^
-   |
-help: did you mean
-   |     f.bar;
+   |       ^^^ did you mean `bar`
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/mismatched_types/cast-rfc0401.stderr b/src/test/ui/mismatched_types/cast-rfc0401.stderr
index e599bc3c4c23c..75711696207fb 100644
--- a/src/test/ui/mismatched_types/cast-rfc0401.stderr
+++ b/src/test/ui/mismatched_types/cast-rfc0401.stderr
@@ -228,10 +228,10 @@ error: casting `&{float}` as `f32` is invalid
   --> $DIR/cast-rfc0401.rs:81:30
    |
 81 |     vec![0.0].iter().map(|s| s as f32).collect::<Vec<f32>>();
-   |                              ^^^^^^^^ cannot cast `&{float}` as `f32`
-   |
-help: did you mean
-   |     vec![0.0].iter().map(|s| *s as f32).collect::<Vec<f32>>();
+   |                              ^^^^^^^^
+   |                              |
+   |                              cannot cast `&{float}` as `f32`
+   |                              did you mean `*s`
 
 error: aborting due to 34 previous errors
 
diff --git a/src/test/ui/resolve/issue-14254.stderr b/src/test/ui/resolve/issue-14254.stderr
index 9b377876ec175..c4ab72c0c9ba3 100644
--- a/src/test/ui/resolve/issue-14254.stderr
+++ b/src/test/ui/resolve/issue-14254.stderr
@@ -2,10 +2,7 @@ error[E0425]: cannot find function `baz` in this scope
   --> $DIR/issue-14254.rs:29:9
    |
 29 |         baz();
-   |         ^^^
-   |
-help: did you intend to call a method of the same name?
-   |         self.baz();
+   |         ^^^ did you intend to call a method of the same name? `self.baz`
 
 error[E0425]: cannot find value `a` in this scope
   --> $DIR/issue-14254.rs:32:9
@@ -17,28 +14,19 @@ error[E0425]: cannot find function `baz` in this scope
   --> $DIR/issue-14254.rs:40:9
    |
 40 |         baz();
-   |         ^^^
-   |
-help: did you intend to call a method of the same name?
-   |         self.baz();
+   |         ^^^ did you intend to call a method of the same name? `self.baz`
 
 error[E0425]: cannot find value `x` in this scope
   --> $DIR/issue-14254.rs:43:9
    |
 43 |         x;
-   |         ^
-   |
-help: did you intend to access a struct field?
-   |         self.x;
+   |         ^ did you intend to access a struct field? `self.x`
 
 error[E0425]: cannot find value `y` in this scope
   --> $DIR/issue-14254.rs:46:9
    |
 46 |         y;
-   |         ^
-   |
-help: did you intend to access a struct field?
-   |         self.y;
+   |         ^ did you intend to access a struct field? `self.y`
 
 error[E0425]: cannot find value `a` in this scope
   --> $DIR/issue-14254.rs:49:9
@@ -50,10 +38,7 @@ error[E0425]: cannot find value `bah` in this scope
   --> $DIR/issue-14254.rs:52:9
    |
 52 |         bah;
-   |         ^^^
-   |
-help: did you mean an associated item of the same name?
-   |         Self::bah;
+   |         ^^^ did you mean an associated item of the same name? `Self::bah`
 
 error[E0425]: cannot find value `b` in this scope
   --> $DIR/issue-14254.rs:55:9
@@ -65,28 +50,19 @@ error[E0425]: cannot find function `baz` in this scope
   --> $DIR/issue-14254.rs:63:9
    |
 63 |         baz();
-   |         ^^^
-   |
-help: did you intend to call a method of the same name?
-   |         self.baz();
+   |         ^^^ did you intend to call a method of the same name? `self.baz`
 
 error[E0425]: cannot find value `x` in this scope
   --> $DIR/issue-14254.rs:66:9
    |
 66 |         x;
-   |         ^
-   |
-help: did you intend to access a struct field?
-   |         self.x;
+   |         ^ did you intend to access a struct field? `self.x`
 
 error[E0425]: cannot find value `y` in this scope
   --> $DIR/issue-14254.rs:69:9
    |
 69 |         y;
-   |         ^
-   |
-help: did you intend to access a struct field?
-   |         self.y;
+   |         ^ did you intend to access a struct field? `self.y`
 
 error[E0425]: cannot find value `a` in this scope
   --> $DIR/issue-14254.rs:72:9
@@ -98,10 +74,7 @@ error[E0425]: cannot find value `bah` in this scope
   --> $DIR/issue-14254.rs:75:9
    |
 75 |         bah;
-   |         ^^^
-   |
-help: did you mean an associated item of the same name?
-   |         Self::bah;
+   |         ^^^ did you mean an associated item of the same name? `Self::bah`
 
 error[E0425]: cannot find value `b` in this scope
   --> $DIR/issue-14254.rs:78:9
@@ -113,91 +86,61 @@ error[E0425]: cannot find function `baz` in this scope
   --> $DIR/issue-14254.rs:86:9
    |
 86 |         baz();
-   |         ^^^
-   |
-help: did you intend to call a method of the same name?
-   |         self.baz();
+   |         ^^^ did you intend to call a method of the same name? `self.baz`
 
 error[E0425]: cannot find value `bah` in this scope
   --> $DIR/issue-14254.rs:89:9
    |
 89 |         bah;
-   |         ^^^
-   |
-help: did you mean an associated item of the same name?
-   |         Self::bah;
+   |         ^^^ did you mean an associated item of the same name? `Self::bah`
 
 error[E0425]: cannot find function `baz` in this scope
   --> $DIR/issue-14254.rs:97:9
    |
 97 |         baz();
-   |         ^^^
-   |
-help: did you intend to call a method of the same name?
-   |         self.baz();
+   |         ^^^ did you intend to call a method of the same name? `self.baz`
 
 error[E0425]: cannot find value `bah` in this scope
    --> $DIR/issue-14254.rs:100:9
     |
 100 |         bah;
-    |         ^^^
-    |
-help: did you mean an associated item of the same name?
-    |         Self::bah;
+    |         ^^^ did you mean an associated item of the same name? `Self::bah`
 
 error[E0425]: cannot find function `baz` in this scope
    --> $DIR/issue-14254.rs:108:9
     |
 108 |         baz();
-    |         ^^^
-    |
-help: did you intend to call a method of the same name?
-    |         self.baz();
+    |         ^^^ did you intend to call a method of the same name? `self.baz`
 
 error[E0425]: cannot find value `bah` in this scope
    --> $DIR/issue-14254.rs:111:9
     |
 111 |         bah;
-    |         ^^^
-    |
-help: did you mean an associated item of the same name?
-    |         Self::bah;
+    |         ^^^ did you mean an associated item of the same name? `Self::bah`
 
 error[E0425]: cannot find function `baz` in this scope
    --> $DIR/issue-14254.rs:119:9
     |
 119 |         baz();
-    |         ^^^
-    |
-help: did you intend to call a method of the same name?
-    |         self.baz();
+    |         ^^^ did you intend to call a method of the same name? `self.baz`
 
 error[E0425]: cannot find value `bah` in this scope
    --> $DIR/issue-14254.rs:122:9
     |
 122 |         bah;
-    |         ^^^
-    |
-help: did you mean an associated item of the same name?
-    |         Self::bah;
+    |         ^^^ did you mean an associated item of the same name? `Self::bah`
 
 error[E0425]: cannot find function `baz` in this scope
    --> $DIR/issue-14254.rs:130:9
     |
 130 |         baz();
-    |         ^^^
-    |
-help: did you intend to call a method of the same name?
-    |         self.baz();
+    |         ^^^ did you intend to call a method of the same name? `self.baz`
 
 error[E0425]: cannot find value `bah` in this scope
    --> $DIR/issue-14254.rs:133:9
     |
 133 |         bah;
-    |         ^^^
-    |
-help: did you mean an associated item of the same name?
-    |         Self::bah;
+    |         ^^^ did you mean an associated item of the same name? `Self::bah`
 
 error: main function not found
 
diff --git a/src/test/ui/resolve/issue-2356.stderr b/src/test/ui/resolve/issue-2356.stderr
index 0d7c72679f539..943355dcf91d3 100644
--- a/src/test/ui/resolve/issue-2356.stderr
+++ b/src/test/ui/resolve/issue-2356.stderr
@@ -8,37 +8,25 @@ error[E0425]: cannot find function `clone` in this scope
   --> $DIR/issue-2356.rs:35:5
    |
 35 |     clone();
-   |     ^^^^^
-   |
-help: did you intend to call a method of the same name?
-   |     self.clone();
+   |     ^^^^^ did you intend to call a method of the same name? `self.clone`
 
 error[E0425]: cannot find function `default` in this scope
   --> $DIR/issue-2356.rs:43:5
    |
 43 |     default();
-   |     ^^^^^^^
-   |
-help: did you mean an associated item of the same name?
-   |     Self::default();
+   |     ^^^^^^^ did you mean an associated item of the same name? `Self::default`
 
 error[E0425]: cannot find value `whiskers` in this scope
   --> $DIR/issue-2356.rs:52:5
    |
 52 |     whiskers -= other;
-   |     ^^^^^^^^ `self` value is only available in methods with `self` parameter
-   |
-help: did you intend to access a struct field?
-   |     self.whiskers -= other;
+   |     ^^^^^^^^ did you intend to access a struct field? `self.whiskers`
 
 error[E0425]: cannot find function `shave` in this scope
   --> $DIR/issue-2356.rs:57:5
    |
 57 |     shave(4);
-   |     ^^^^^
-   |
-help: did you mean an associated item of the same name?
-   |     Self::shave(4);
+   |     ^^^^^ did you mean an associated item of the same name? `Self::shave`
 
 error[E0425]: cannot find function `purr` in this scope
   --> $DIR/issue-2356.rs:60:5
@@ -92,19 +80,13 @@ error[E0425]: cannot find value `whiskers` in this scope
    --> $DIR/issue-2356.rs:104:5
     |
 104 |     whiskers = 0;
-    |     ^^^^^^^^
-    |
-help: did you intend to access a struct field?
-    |     self.whiskers = 0;
+    |     ^^^^^^^^ did you intend to access a struct field? `self.whiskers`
 
 error[E0425]: cannot find value `whiskers` in this scope
    --> $DIR/issue-2356.rs:110:5
     |
 110 |     whiskers = 4;
-    |     ^^^^^^^^ `self` value is only available in methods with `self` parameter
-    |
-help: did you intend to access a struct field?
-    |     self.whiskers = 4;
+    |     ^^^^^^^^ did you intend to access a struct field? `self.whiskers`
 
 error[E0425]: cannot find function `purr_louder` in this scope
    --> $DIR/issue-2356.rs:115:5
diff --git a/src/test/ui/resolve/levenshtein.stderr b/src/test/ui/resolve/levenshtein.stderr
index 7909a2f487e14..729e3a9e5d7d2 100644
--- a/src/test/ui/resolve/levenshtein.stderr
+++ b/src/test/ui/resolve/levenshtein.stderr
@@ -2,28 +2,19 @@ error[E0412]: cannot find type `esize` in this scope
   --> $DIR/levenshtein.rs:15:11
    |
 15 | fn foo(c: esize) {} // Misspelled primitive type name.
-   |           ^^^^^
-   |
-help: did you mean
-   | fn foo(c: isize) {} // Misspelled primitive type name.
+   |           ^^^^^ did you mean `isize`
 
 error[E0412]: cannot find type `Baz` in this scope
   --> $DIR/levenshtein.rs:19:10
    |
 19 | type A = Baz; // Misspelled type name.
-   |          ^^^
-   |
-help: did you mean
-   | type A = Bar; // Misspelled type name.
+   |          ^^^ did you mean `Bar`
 
 error[E0412]: cannot find type `Opiton` in this scope
   --> $DIR/levenshtein.rs:20:10
    |
 20 | type B = Opiton<u8>; // Misspelled type name from the prelude.
-   |          ^^^^^^^^^^
-   |
-help: did you mean
-   | type B = Option; // Misspelled type name from the prelude.
+   |          ^^^^^^^^^^ did you mean `Option`
 
 error[E0412]: cannot find type `Baz` in this scope
   --> $DIR/levenshtein.rs:23:14
@@ -35,37 +26,25 @@ error[E0425]: cannot find value `MAXITEM` in this scope
   --> $DIR/levenshtein.rs:30:20
    |
 30 |     let v = [0u32; MAXITEM]; // Misspelled constant name.
-   |                    ^^^^^^^
-   |
-help: did you mean
-   |     let v = [0u32; MAX_ITEM]; // Misspelled constant name.
+   |                    ^^^^^^^ did you mean `MAX_ITEM`
 
 error[E0425]: cannot find function `foobar` in this scope
   --> $DIR/levenshtein.rs:31:5
    |
 31 |     foobar(); // Misspelled function name.
-   |     ^^^^^^
-   |
-help: did you mean
-   |     foo_bar(); // Misspelled function name.
+   |     ^^^^^^ did you mean `foo_bar`
 
 error[E0412]: cannot find type `first` in module `m`
   --> $DIR/levenshtein.rs:32:12
    |
 32 |     let b: m::first = m::second; // Misspelled item in module.
-   |            ^^^^^^^^
-   |
-help: did you mean
-   |     let b: m::First = m::second; // Misspelled item in module.
+   |            ^^^^^^^^ did you mean `m::First`
 
 error[E0425]: cannot find value `second` in module `m`
   --> $DIR/levenshtein.rs:32:23
    |
 32 |     let b: m::first = m::second; // Misspelled item in module.
-   |                       ^^^^^^^^^
-   |
-help: did you mean
-   |     let b: m::first = m::Second; // Misspelled item in module.
+   |                       ^^^^^^^^^ did you mean `m::Second`
 
 error[E0080]: constant evaluation error
   --> $DIR/levenshtein.rs:30:20
diff --git a/src/test/ui/resolve/resolve-assoc-suggestions.stderr b/src/test/ui/resolve/resolve-assoc-suggestions.stderr
index 4638a5e4e9bf1..ad4f5a0adf57c 100644
--- a/src/test/ui/resolve/resolve-assoc-suggestions.stderr
+++ b/src/test/ui/resolve/resolve-assoc-suggestions.stderr
@@ -14,19 +14,13 @@ error[E0425]: cannot find value `field` in this scope
   --> $DIR/resolve-assoc-suggestions.rs:32:9
    |
 32 |         field;
-   |         ^^^^^
-   |
-help: did you intend to access a struct field?
-   |         self.field;
+   |         ^^^^^ did you intend to access a struct field? `self.field`
 
 error[E0412]: cannot find type `Type` in this scope
   --> $DIR/resolve-assoc-suggestions.rs:36:16
    |
 36 |         let _: Type;
-   |                ^^^^
-   |
-help: did you mean an associated item of the same name?
-   |         let _: Self::Type;
+   |                ^^^^ did you mean an associated item of the same name? `Self::Type`
 
 error[E0531]: cannot find tuple struct/variant `Type` in this scope
   --> $DIR/resolve-assoc-suggestions.rs:39:13
@@ -56,10 +50,7 @@ error[E0425]: cannot find value `method` in this scope
   --> $DIR/resolve-assoc-suggestions.rs:52:9
    |
 52 |         method;
-   |         ^^^^^^
-   |
-help: did you intend to call a method of the same name?
-   |         self.method;
+   |         ^^^^^^ did you intend to call a method of the same name? `self.method`
 
 error: aborting due to 9 previous errors
 
diff --git a/src/test/ui/resolve/resolve-hint-macro.stderr b/src/test/ui/resolve/resolve-hint-macro.stderr
index e528592bd4cd1..514ac9a163a08 100644
--- a/src/test/ui/resolve/resolve-hint-macro.stderr
+++ b/src/test/ui/resolve/resolve-hint-macro.stderr
@@ -2,10 +2,7 @@ error[E0423]: expected function, found macro `assert`
   --> $DIR/resolve-hint-macro.rs:12:5
    |
 12 |     assert(true);
-   |     ^^^^^^
-   |
-help: did you intend to invoke a macro of the same name?
-   |     assert!(true);
+   |     ^^^^^^ did you intend to invoke a macro of the same name? `assert!`
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/resolve/resolve-speculative-adjustment.stderr b/src/test/ui/resolve/resolve-speculative-adjustment.stderr
index 0d1c356ed742a..cd9c74ff2ef9f 100644
--- a/src/test/ui/resolve/resolve-speculative-adjustment.stderr
+++ b/src/test/ui/resolve/resolve-speculative-adjustment.stderr
@@ -14,19 +14,13 @@ error[E0425]: cannot find value `field` in this scope
   --> $DIR/resolve-speculative-adjustment.rs:35:9
    |
 35 |         field;
-   |         ^^^^^
-   |
-help: did you intend to access a struct field?
-   |         self.field;
+   |         ^^^^^ did you intend to access a struct field? `self.field`
 
 error[E0425]: cannot find function `method` in this scope
   --> $DIR/resolve-speculative-adjustment.rs:38:9
    |
 38 |         method();
-   |         ^^^^^^
-   |
-help: did you intend to call a method of the same name?
-   |         self.method();
+   |         ^^^^^^ did you intend to call a method of the same name? `self.method`
 
 error: aborting due to 4 previous errors
 
diff --git a/src/test/ui/resolve/suggest-path-instead-of-mod-dot-item.stderr b/src/test/ui/resolve/suggest-path-instead-of-mod-dot-item.stderr
index 27adfc77061f5..75ce05ba51e87 100644
--- a/src/test/ui/resolve/suggest-path-instead-of-mod-dot-item.stderr
+++ b/src/test/ui/resolve/suggest-path-instead-of-mod-dot-item.stderr
@@ -2,82 +2,67 @@ error[E0423]: expected value, found module `a`
   --> $DIR/suggest-path-instead-of-mod-dot-item.rs:27:5
    |
 27 |     a.I
-   |     ^
-   |
-help: did you mean
-   |     a::I
+   |     ^^^
+   |     |
+   |     did you mean `a::I`
 
 error[E0423]: expected value, found module `a`
   --> $DIR/suggest-path-instead-of-mod-dot-item.rs:33:5
    |
 33 |     a.g()
-   |     ^
-   |
-help: did you mean
-   |     a::g()
+   |     ^^^
+   |     |
+   |     did you mean `a::g`
 
 error[E0423]: expected value, found module `a`
   --> $DIR/suggest-path-instead-of-mod-dot-item.rs:39:5
    |
 39 |     a.b.J
-   |     ^
-   |
-help: did you mean
-   |     a::b.J
+   |     ^^^
+   |     |
+   |     did you mean `a::b`
 
 error[E0423]: expected value, found module `a::b`
   --> $DIR/suggest-path-instead-of-mod-dot-item.rs:45:5
    |
 45 |     a::b.J
-   |     ^^^^
-   |
-help: did you mean
-   |     a::b::J
+   |     ^^^^^^
+   |     |
+   |     did you mean `a::b::J`
 
 error[E0423]: expected value, found module `a`
   --> $DIR/suggest-path-instead-of-mod-dot-item.rs:51:5
    |
 51 |     a.b.f();
-   |     ^
-   |
-help: did you mean
-   |     a::b.f();
+   |     ^^^
+   |     |
+   |     did you mean `a::b`
 
 error[E0423]: expected value, found module `a::b`
   --> $DIR/suggest-path-instead-of-mod-dot-item.rs:55:12
    |
 55 |     v.push(a::b);
-   |            ^^^^
-   |
-help: did you mean
-   |     v.push(a::I);
+   |            ^^^^ did you mean `a::I`
 
 error[E0423]: expected value, found module `a::b`
   --> $DIR/suggest-path-instead-of-mod-dot-item.rs:61:5
    |
 61 |     a::b.f()
-   |     ^^^^
-   |
-help: did you mean
-   |     a::b::f()
+   |     ^^^^^^
+   |     |
+   |     did you mean `a::b::f`
 
 error[E0423]: expected value, found module `a::b`
   --> $DIR/suggest-path-instead-of-mod-dot-item.rs:67:5
    |
 67 |     a::b
-   |     ^^^^
-   |
-help: did you mean
-   |     a::I
+   |     ^^^^ did you mean `a::I`
 
 error[E0423]: expected function, found module `a::b`
   --> $DIR/suggest-path-instead-of-mod-dot-item.rs:73:5
    |
 73 |     a::b()
-   |     ^^^^
-   |
-help: did you mean
-   |     a::I()
+   |     ^^^^ did you mean `a::I`
 
 error: main function not found
 
diff --git a/src/test/ui/resolve/unresolved_static_type_field.stderr b/src/test/ui/resolve/unresolved_static_type_field.stderr
index 7a2e63d684a25..9c0bf03f41e5c 100644
--- a/src/test/ui/resolve/unresolved_static_type_field.stderr
+++ b/src/test/ui/resolve/unresolved_static_type_field.stderr
@@ -2,10 +2,7 @@ error[E0425]: cannot find value `cx` in this scope
   --> $DIR/unresolved_static_type_field.rs:19:11
    |
 19 |         f(cx);
-   |           ^^ `self` value is only available in methods with `self` parameter
-   |
-help: did you intend to access a struct field?
-   |         f(self.cx);
+   |           ^^ did you intend to access a struct field? `self.cx`
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/span/typo-suggestion.stderr b/src/test/ui/span/typo-suggestion.stderr
index b80cc1ea9b5a9..b2486d5410905 100644
--- a/src/test/ui/span/typo-suggestion.stderr
+++ b/src/test/ui/span/typo-suggestion.stderr
@@ -8,10 +8,7 @@ error[E0425]: cannot find value `fob` in this scope
   --> $DIR/typo-suggestion.rs:18:26
    |
 18 |     println!("Hello {}", fob);
-   |                          ^^^
-   |
-help: did you mean
-   |     println!("Hello {}", foo);
+   |                          ^^^ did you mean `foo`
 
 error: aborting due to 2 previous errors