---

yaml
---
r: 40327
b: refs/heads/dist-snap
c: b223c9c
h: refs/heads/master
i:
  40325: a9aa6db
  40323: 521b474
  40319: fb77847
v: v3

Author: pcwalton

[refs]

@@ -7,7 +7,7 @@ refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: a810c03263670238bccd64cabb12a23a46e3a278
 refs/heads/incoming: e90142e536c150df0d9b4b2f11352152177509b5
-refs/heads/dist-snap: 13c01dd48a06fdec167955a2b39d830d3bbdff16
+refs/heads/dist-snap: b223c9c4651ee2f4b8fe2af0136e657a0893caa4
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
 refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0

branches/dist-snap/src/librustc/middle/resolve.rs

@@ -1738,15 +1738,30 @@ impl Resolver {
                 match child_name_bindings.type_def {
                     None => {
                         debug!("(building reduced graph for external crate) \
-                                autovivifying %s", *ident_str);
+                                autovivifying missing type def %s",
+                                *ident_str);
                         let parent_link = self.get_parent_link(new_parent,
                                                                ident);
                         (*child_name_bindings).define_module(Public,
                                                              parent_link,
-                                                             None, false,
+                                                             None,
+                                                             false,
+                                                             dummy_sp());
+                    }
+                    Some(copy type_ns_def)
+                            if type_ns_def.module_def.is_none() => {
+                        debug!("(building reduced graph for external crate) \
+                                autovivifying missing module def %s",
+                                *ident_str);
+                        let parent_link = self.get_parent_link(new_parent,
+                                                               ident);
+                        (*child_name_bindings).define_module(Public,
+                                                             parent_link,
+                                                             None,
+                                                             false,
                                                              dummy_sp());
                     }
-                    Some(_) => { /* Fall through. */ }
+                    _ => {} // Fall through.
                 }
 
                 current_module = (*child_name_bindings).get_module();