diff --git a/clippy_lints/src/transmute/missing_transmute_annotations.rs b/clippy_lints/src/transmute/missing_transmute_annotations.rs index 4321eff7be63..b12ea059dc54 100644 --- a/clippy_lints/src/transmute/missing_transmute_annotations.rs +++ b/clippy_lints/src/transmute/missing_transmute_annotations.rs @@ -49,8 +49,7 @@ pub(super) fn check<'tcx>( expr_hir_id: HirId, ) -> bool { let last = path.segments.last().unwrap(); - if last.ident.span.in_external_macro(cx.tcx.sess.source_map()) { - // If it comes from a non-local macro, we ignore it. + if last.ident.span.from_expansion() { return false; } let args = last.args; diff --git a/tests/ui/missing_transmute_annotations.fixed b/tests/ui/missing_transmute_annotations.fixed index a719d793cc78..232604ec7715 100644 --- a/tests/ui/missing_transmute_annotations.fixed +++ b/tests/ui/missing_transmute_annotations.fixed @@ -8,8 +8,8 @@ extern crate macro_rules; macro_rules! local_bad_transmute { ($e:expr) => { - std::mem::transmute::<[u16; 2], i32>($e) - //~^ missing_transmute_annotations + // Should not warn! + std::mem::transmute($e) }; } diff --git a/tests/ui/missing_transmute_annotations.rs b/tests/ui/missing_transmute_annotations.rs index ac0724244cff..9e27c4a3ea7b 100644 --- a/tests/ui/missing_transmute_annotations.rs +++ b/tests/ui/missing_transmute_annotations.rs @@ -8,8 +8,8 @@ extern crate macro_rules; macro_rules! local_bad_transmute { ($e:expr) => { + // Should not warn! std::mem::transmute($e) - //~^ missing_transmute_annotations }; } diff --git a/tests/ui/missing_transmute_annotations.stderr b/tests/ui/missing_transmute_annotations.stderr index d4854c122da5..38e4054eab40 100644 --- a/tests/ui/missing_transmute_annotations.stderr +++ b/tests/ui/missing_transmute_annotations.stderr @@ -37,17 +37,6 @@ error: transmute used without annotations LL | bar(std::mem::transmute::<[u16; 2], _>([1u16, 2u16])); | ^^^^^^^^^^^^^^^^^^^^^^^^ help: consider adding missing annotations: `transmute::<[u16; 2], i32>` -error: transmute used without annotations - --> tests/ui/missing_transmute_annotations.rs:11:19 - | -LL | std::mem::transmute($e) - | ^^^^^^^^^ help: consider adding missing annotations: `transmute::<[u16; 2], i32>` -... -LL | i = local_bad_transmute!([1u16, 2u16]); - | ---------------------------------- in this macro invocation - | - = note: this error originates in the macro `local_bad_transmute` (in Nightly builds, run with -Z macro-backtrace for more info) - error: transmute used without annotations --> tests/ui/missing_transmute_annotations.rs:57:23 | @@ -78,5 +67,5 @@ error: transmute used without annotations LL | let x: _ = std::mem::transmute::<_, i32>([1u16, 2u16]); | ^^^^^^^^^^^^^^^^^^^ help: consider adding missing annotations: `transmute::<[u16; 2], i32>` -error: aborting due to 12 previous errors +error: aborting due to 11 previous errors