Skip to content

Commit ff42247

Browse files
committed
---
yaml --- r: 37513 b: refs/heads/try c: b223c9c h: refs/heads/master i: 37511: 15f21a0 v: v3
1 parent d328f1d commit ff42247

File tree

2 files changed

+19
-4
lines changed

2 files changed

+19
-4
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
refs/heads/master: 09bb07bed9166105ea961a42b5fff7739ae0d2e9
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: eb8fd119c65c67f3b1b8268cc7341c22d39b7b61
5-
refs/heads/try: 13c01dd48a06fdec167955a2b39d830d3bbdff16
5+
refs/heads/try: b223c9c4651ee2f4b8fe2af0136e657a0893caa4
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
88
refs/heads/try2: a810c03263670238bccd64cabb12a23a46e3a278

branches/try/src/librustc/middle/resolve.rs

Lines changed: 18 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1738,15 +1738,30 @@ impl Resolver {
17381738
match child_name_bindings.type_def {
17391739
None => {
17401740
debug!("(building reduced graph for external crate) \
1741-
autovivifying %s", *ident_str);
1741+
autovivifying missing type def %s",
1742+
*ident_str);
17421743
let parent_link = self.get_parent_link(new_parent,
17431744
ident);
17441745
(*child_name_bindings).define_module(Public,
17451746
parent_link,
1746-
None, false,
1747+
None,
1748+
false,
1749+
dummy_sp());
1750+
}
1751+
Some(copy type_ns_def)
1752+
if type_ns_def.module_def.is_none() => {
1753+
debug!("(building reduced graph for external crate) \
1754+
autovivifying missing module def %s",
1755+
*ident_str);
1756+
let parent_link = self.get_parent_link(new_parent,
1757+
ident);
1758+
(*child_name_bindings).define_module(Public,
1759+
parent_link,
1760+
None,
1761+
false,
17471762
dummy_sp());
17481763
}
1749-
Some(_) => { /* Fall through. */ }
1764+
_ => {} // Fall through.
17501765
}
17511766

17521767
current_module = (*child_name_bindings).get_module();

0 commit comments

Comments
 (0)