Stop creating ctor def ids for unions and move the ctor def id creation into the brg

Author: oli-obk

compiler/rustc_resolve/src/build_reduced_graph.rs

@@ -902,7 +902,7 @@ impl<'a, 'ra, 'tcx> DefCollector<'a, 'ra, 'tcx> {
 
                 // If this is a tuple or unit struct, define a name
                 // in the value namespace as well.
-                if let Some(ctor_node_id) = vdata.ctor_node_id() {
+                if let Some((ctor_kind, ctor_node_id)) = CtorKind::from_ast(vdata) {
                     // If the structure is marked as non_exhaustive then lower the visibility
                     // to within the crate.
                     let mut ctor_vis = if vis.is_public()
@@ -927,6 +927,14 @@ impl<'a, 'ra, 'tcx> DefCollector<'a, 'ra, 'tcx> {
                         }
                         field_visibilities.push(field_vis.to_def_id());
                     }
+                    // If this is a unit or tuple-like struct, register the constructor.
+                    self.create_def(
+                        ctor_node_id,
+                        None,
+                        DefKind::Ctor(CtorOf::Struct, ctor_kind),
+                        item.span,
+                    );
+
                     let feed = self.r.feed(ctor_node_id);
                     let ctor_def_id = feed.key();
                     let ctor_res = self.res(ctor_def_id);

compiler/rustc_resolve/src/def_collector.rs

@@ -191,24 +191,7 @@ impl<'a, 'ra, 'tcx> visit::Visitor<'a> for DefCollector<'a, 'ra, 'tcx> {
         }
 
         self.with_parent(def_id, |this| {
-            this.with_impl_trait(ImplTraitContext::Existential, |this| {
-                match i.kind {
-                    ItemKind::Struct(_, _, ref struct_def)
-                    | ItemKind::Union(_, _, ref struct_def) => {
-                        // If this is a unit or tuple-like struct, register the constructor.
-                        if let Some((ctor_kind, ctor_node_id)) = CtorKind::from_ast(struct_def) {
-                            this.create_def(
-                                ctor_node_id,
-                                None,
-                                DefKind::Ctor(CtorOf::Struct, ctor_kind),
-                                i.span,
-                            );
-                        }
-                    }
-                    _ => {}
-                }
-                this.brg_visit_item(i);
-            })
+            this.with_impl_trait(ImplTraitContext::Existential, |this| this.brg_visit_item(i))
         });
     }