diff options
| author | bors <bors@rust-lang.org> | 2021-04-08 16:04:55 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2021-04-08 16:04:55 +0000 |
| commit | c40fa0011337aa4725248e7d328ae8a2559b1a98 (patch) | |
| tree | 0b2837ecab862d75142b811c477b8938afd22fc2 | |
| parent | b40ea209e7f14c8193ddfc98143967b6a2f4f5c9 (diff) | |
| parent | c05760ff90fbf4ac677db592b2efe25fab5fac6c (diff) | |
| download | rust-c40fa0011337aa4725248e7d328ae8a2559b1a98.tar.gz rust-c40fa0011337aa4725248e7d328ae8a2559b1a98.zip | |
Auto merge of #7022 - Jarcho:macro_use_import_ice, r=flip1995
Fix `macro_use_import` ICE fixes: #7015 changelog: Fix `macro_use_import` ICE
| -rw-r--r-- | clippy_lints/src/macro_use.rs | 1 | ||||
| -rw-r--r-- | tests/ui/macro_use_imports.fixed | 6 | ||||
| -rw-r--r-- | tests/ui/macro_use_imports.rs | 6 |
3 files changed, 11 insertions, 2 deletions
diff --git a/clippy_lints/src/macro_use.rs b/clippy_lints/src/macro_use.rs index c506d52e746..ec03daff87b 100644 --- a/clippy_lints/src/macro_use.rs +++ b/clippy_lints/src/macro_use.rs @@ -112,6 +112,7 @@ impl<'tcx> LateLintPass<'tcx> for MacroUseImports { let attrs = cx.tcx.hir().attrs(item.hir_id()); if let Some(mac_attr) = attrs.iter().find(|attr| attr.has_name(sym::macro_use)); if let Res::Def(DefKind::Mod, id) = path.res; + if !id.is_local(); then { for kid in cx.tcx.item_children(id).iter() { if let Res::Def(DefKind::Macro(_mac_type), mac_id) = kid.res { diff --git a/tests/ui/macro_use_imports.fixed b/tests/ui/macro_use_imports.fixed index 91e34c62160..51c66a46368 100644 --- a/tests/ui/macro_use_imports.fixed +++ b/tests/ui/macro_use_imports.fixed @@ -4,7 +4,7 @@ // run-rustfix // ignore-32bit -#![allow(unused_imports, unreachable_code, unused_variables, dead_code)] +#![allow(unused_imports, unreachable_code, unused_variables, dead_code, unused_attributes)] #![allow(clippy::single_component_path_imports)] #![warn(clippy::macro_use_imports)] @@ -40,4 +40,8 @@ mod a { } } +// issue #7015, ICE due to calling `item_children` with local `DefId` +#[macro_use] +use a as b; + fn main() {} diff --git a/tests/ui/macro_use_imports.rs b/tests/ui/macro_use_imports.rs index 9c3c50c5d49..2011129bc94 100644 --- a/tests/ui/macro_use_imports.rs +++ b/tests/ui/macro_use_imports.rs @@ -4,7 +4,7 @@ // run-rustfix // ignore-32bit -#![allow(unused_imports, unreachable_code, unused_variables, dead_code)] +#![allow(unused_imports, unreachable_code, unused_variables, dead_code, unused_attributes)] #![allow(clippy::single_component_path_imports)] #![warn(clippy::macro_use_imports)] @@ -40,4 +40,8 @@ mod a { } } +// issue #7015, ICE due to calling `item_children` with local `DefId` +#[macro_use] +use a as b; + fn main() {} |