Group "macro expansion" notes per call span

1 files changed, 5 insertions, 3 deletions

diff --git a/src/librustc_errors/lib.rs b/src/librustc_errors/lib.rs
index 06aafa05052..db8c9ac306b 100644
--- a/src/librustc_errors/lib.rs
+++ b/src/librustc_errors/lib.rs
@@ -388,11 +388,13 @@ impl Handler {
     pub fn span_note_without_error<S: Into<MultiSpan>>(&self, sp: S, msg: &str) {
         self.emit(&sp.into(), msg, Note);
     }
-    pub fn span_label_without_error(&self, sp: Span, msg: &str, lbl: &str) {
+    pub fn span_note_diag<'a>(&'a self,
+                              sp: Span,
+                              msg: &str)
+                              -> DiagnosticBuilder<'a> {
         let mut db = DiagnosticBuilder::new(self, Note, msg);
         db.set_span(sp);
-        db.span_label(sp, &lbl);
-        db.emit();
+        db
     }
     pub fn span_unimpl<S: Into<MultiSpan>>(&self, sp: S, msg: &str) -> ! {
         self.span_bug(sp, &format!("unimplemented {}", msg));