From 99ae898c575ddaa3a17ae51f651abddf606f99aa Mon Sep 17 00:00:00 2001 From: nxnfufunezn Date: Sat, 17 Oct 2015 01:50:33 +0530 Subject: [PATCH 1/2] Add span_lint_note and span_lint_help to the LintContext --- src/librustc/lint/context.rs | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/src/librustc/lint/context.rs b/src/librustc/lint/context.rs index f5c6cfe2437..e3eac2e6068 100644 --- a/src/librustc/lint/context.rs +++ b/src/librustc/lint/context.rs @@ -435,6 +435,28 @@ pub trait LintContext: Sized { self.lookup_and_emit(lint, Some(span), msg); } + /// Emit a lint and note at the appropriate level, for a particular span. + fn span_lint_note(&self, lint: &'static Lint, span: Span, msg: &str, + note_span: Span, note: &str) { + self.span_lint(lint, span, msg); + if self.current_level(lint) != Level::Allow { + if note_span == span { + self.sess().fileline_note(note_span, note) + } else { + self.sess().span_note(note_span, note) + } + } + } + + /// Emit a lint and help at the appropriate level, for a particular span. + fn span_lint_help(&self, lint: &'static Lint, span: Span, + msg: &str, help: &str) { + self.span_lint(lint, span, msg); + if self.current_level(lint) != Level::Allow { + self.sess().span_help(span, help) + } + } + /// Emit a lint at the appropriate level, with no associated span. fn lint(&self, lint: &'static Lint, msg: &str) { self.lookup_and_emit(lint, None, msg); From 72e0e59574a6b1abfdeb723e844d425c893647de Mon Sep 17 00:00:00 2001 From: nxnfufunezn Date: Sat, 17 Oct 2015 02:14:26 +0530 Subject: [PATCH 2/2] Updated librustc_lint/builtin.rs to use span_lint_note --- src/librustc_lint/builtin.rs | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/src/librustc_lint/builtin.rs b/src/librustc_lint/builtin.rs index f5a58656080..0726d9ca259 100644 --- a/src/librustc_lint/builtin.rs +++ b/src/librustc_lint/builtin.rs @@ -1255,15 +1255,12 @@ impl LateLintPass for DropWithReprExtern { codemap::DUMMY_SP); let self_defn_span = ctx.tcx.map.def_id_span(self_type_did, codemap::DUMMY_SP); - ctx.span_lint(DROP_WITH_REPR_EXTERN, - drop_impl_span, - "implementing Drop adds hidden state to types, \ - possibly conflicting with `#[repr(C)]`"); - // FIXME #19668: could be span_lint_note instead of manual guard. - if ctx.current_level(DROP_WITH_REPR_EXTERN) != Level::Allow { - ctx.sess().span_note(self_defn_span, - "the `#[repr(C)]` attribute is attached here"); - } + ctx.span_lint_note(DROP_WITH_REPR_EXTERN, + drop_impl_span, + "implementing Drop adds hidden state to types, \ + possibly conflicting with `#[repr(C)]`", + self_defn_span, + "the `#[repr(C)]` attribute is attached here"); } } _ => {}