Extract ast TraitImplHeader

1 files changed, 31 insertions, 14 deletions

diff --git a/compiler/rustc_ast_lowering/src/item.rs b/compiler/rustc_ast_lowering/src/item.rs
index ac6fac4c08e..231752700ba 100644
--- a/compiler/rustc_ast_lowering/src/item.rs
+++ b/compiler/rustc_ast_lowering/src/item.rs
@@ -340,13 +340,9 @@ impl<'hir> LoweringContext<'_, 'hir> {
                 );
                 hir::ItemKind::Union(ident, generics, vdata)
             }
-            ItemKind::Impl(box Impl {
-                safety,
-                polarity,
-                defaultness,
-                constness,
+            ItemKind::Impl(Impl {
                 generics: ast_generics,
-                of_trait: trait_ref,
+                of_trait,
                 self_ty: ty,
                 items: impl_items,
             }) => {
@@ -373,10 +369,10 @@ impl<'hir> LoweringContext<'_, 'hir> {
                             polarity: BoundPolarity::Positive,
                         };
 
-                        let trait_ref = trait_ref.as_ref().map(|trait_ref| {
+                        let trait_ref = of_trait.as_ref().map(|of_trait| {
                             this.lower_trait_ref(
                                 modifiers,
-                                trait_ref,
+                                &of_trait.trait_ref,
                                 ImplTraitContext::Disallowed(ImplTraitPosition::Trait),
                             )
                         });
@@ -396,14 +392,35 @@ impl<'hir> LoweringContext<'_, 'hir> {
                 // `defaultness.has_value()` is never called for an `impl`, always `true` in order
                 // to not cause an assertion failure inside the `lower_defaultness` function.
                 let has_val = true;
-                let (defaultness, defaultness_span) = self.lower_defaultness(*defaultness, has_val);
-                let polarity = match polarity {
-                    ImplPolarity::Positive => ImplPolarity::Positive,
-                    ImplPolarity::Negative(s) => ImplPolarity::Negative(self.lower_span(*s)),
+                let (constness, safety, polarity, defaultness, defaultness_span) = match *of_trait {
+                    Some(box TraitImplHeader {
+                        constness,
+                        safety,
+                        polarity,
+                        defaultness,
+                        trait_ref: _,
+                    }) => {
+                        let constness = self.lower_constness(constness);
+                        let safety = self.lower_safety(safety, hir::Safety::Safe);
+                        let polarity = match polarity {
+                            ImplPolarity::Positive => ImplPolarity::Positive,
+                            ImplPolarity::Negative(s) => ImplPolarity::Negative(self.lower_span(s)),
+                        };
+                        let (defaultness, defaultness_span) =
+                            self.lower_defaultness(defaultness, has_val);
+                        (constness, safety, polarity, defaultness, defaultness_span)
+                    }
+                    None => (
+                        hir::Constness::NotConst,
+                        hir::Safety::Safe,
+                        ImplPolarity::Positive,
+                        hir::Defaultness::Final,
+                        None,
+                    ),
                 };
                 hir::ItemKind::Impl(self.arena.alloc(hir::Impl {
-                    constness: self.lower_constness(*constness),
-                    safety: self.lower_safety(*safety, hir::Safety::Safe),
+                    constness,
+                    safety,
                     polarity,
                     defaultness,
                     defaultness_span,