From 391ee7987dca6c5ca9ea32a4d8dfd28586d4c89a Mon Sep 17 00:00:00 2001 From: Martins Polakovs Date: Sat, 23 Feb 2019 19:29:30 +0200 Subject: [PATCH] Fix ICE #3747 [Martins Polakovs, John Firebaugh] --- clippy_lints/src/functions.rs | 6 +++--- tests/ui/crashes/ice-3747.rs | 17 +++++++++++++++++ 2 files changed, 20 insertions(+), 3 deletions(-) create mode 100644 tests/ui/crashes/ice-3747.rs diff --git a/clippy_lints/src/functions.rs b/clippy_lints/src/functions.rs index b6e0480d986..c37f45dd414 100644 --- a/clippy_lints/src/functions.rs +++ b/clippy_lints/src/functions.rs @@ -147,7 +147,7 @@ impl<'a, 'tcx> LateLintPass<'a, 'tcx> for Functions { } self.check_raw_ptr(cx, unsafety, decl, body, nodeid); - self.check_line_number(cx, span); + self.check_line_number(cx, span, body); } fn check_trait_item(&mut self, cx: &LateContext<'a, 'tcx>, item: &'tcx hir::TraitItem) { @@ -178,12 +178,12 @@ impl<'a, 'tcx> Functions { } } - fn check_line_number(self, cx: &LateContext<'_, '_>, span: Span) { + fn check_line_number(self, cx: &LateContext<'_, '_>, span: Span, body: &'tcx hir::Body) { if in_external_macro(cx.sess(), span) { return; } - let code_snippet = snippet(cx, span, ".."); + let code_snippet = snippet(cx, body.value.span, ".."); let mut line_count: u64 = 0; let mut in_comment = false; let mut code_in_line; diff --git a/tests/ui/crashes/ice-3747.rs b/tests/ui/crashes/ice-3747.rs new file mode 100644 index 00000000000..cdf018cbc88 --- /dev/null +++ b/tests/ui/crashes/ice-3747.rs @@ -0,0 +1,17 @@ +/// Test for https://github.com/rust-lang/rust-clippy/issues/3747 + +macro_rules! a { + ( $pub:tt $($attr:tt)* ) => { + $($attr)* $pub fn say_hello() {} + }; +} + +macro_rules! b { + () => { + a! { pub } + }; +} + +b! {} + +fn main() {}