fix

Author: ABouttefeux

compiler/rustc_middle/src/hir/map/collector.rs

@@ -242,7 +242,7 @@ impl<'a, 'hir> NodeCollector<'a, 'hir> {
     fn insert_nested(&mut self, item: HirOwner) {
         #[cfg(debug_assertions)]
         {
-            let dk_parent = self.definitions.def_key(item).parent.unwrap();
+            let dk_parent = self.definitions.def_key(item.def_id).parent.unwrap();
             let dk_parent = LocalDefId { local_def_index: dk_parent };
             let dk_parent = self.definitions.local_def_id_to_hir_id(dk_parent);
             debug_assert_eq!(

compiler/rustc_middle/src/hir/mod.rs

@@ -13,7 +13,7 @@ use rustc_ast::Attribute;
 use rustc_data_structures::fingerprint::Fingerprint;
 use rustc_data_structures::fx::FxHashMap;
 use rustc_data_structures::stable_hasher::{HashStable, StableHasher};
-use rustc_hir::def_id::{LocalDefId};
+use rustc_hir::def_id::LocalDefId;
 use rustc_hir::hir_id::HirOwner;
 use rustc_hir::*;
 use rustc_index::vec::IndexVec;

compiler/rustc_passes/src/diagnostic_items.rs

@@ -95,11 +95,7 @@ fn collect_item(
 /// Extract the first `rustc_diagnostic_item = "$name"` out of a list of attributes.
 fn extract(sess: &Session, attrs: &[ast::Attribute]) -> Option<Symbol> {
     attrs.iter().find_map(|attr| {
-        if sess.check_name(attr, sym::rustc_diagnostic_item) {
-            attr.value_str()
-        } else {
-            None
-        }
+        if sess.check_name(attr, sym::rustc_diagnostic_item) { attr.value_str() } else { None }
     })
 }