---

yaml
---
r: 35039
b: refs/heads/master
c: b223c9c
h: refs/heads/master
i:
  35037: 7e184f5
  35035: 712b0ba
  35031: 89099d2
  35023: 25c3e8c
  35007: d41e1c4
v: v3

Author: pcwalton

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 13c01dd48a06fdec167955a2b39d830d3bbdff16
+refs/heads/master: b223c9c4651ee2f4b8fe2af0136e657a0893caa4
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: eb8fd119c65c67f3b1b8268cc7341c22d39b7b61
 refs/heads/try: d324a424d8f84b1eb049b12cf34182bda91b0024

trunk/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();