Skip to content

Commit b22b6b1

Browse files
committed
---
yaml --- r: 22615 b: refs/heads/master c: 3119afc h: refs/heads/master i: 22613: a73495e 22611: 3aa93f5 22607: ecc1735 v: v3
1 parent 6d80214 commit b22b6b1

File tree

3 files changed

+21
-1
lines changed

3 files changed

+21
-1
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
refs/heads/master: de5d5e6eebbfdd660b2587763b122bc9df3eeb8f
2+
refs/heads/master: 3119afc6e844fea76512e45c392bdcbeeeec2c00
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: cd6f24f9d14ac90d167386a56e7a6ac1f0318195
55
refs/heads/try: ffbe0e0e00374358b789b0037bcb3a577cd218be

trunk/src/rustc/middle/resolve3.rs

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1904,6 +1904,16 @@ class Resolver {
19041904
}
19051905
}
19061906

1907+
let i = import_resolution;
1908+
alt (i.module_target, i.value_target, i.type_target, i.impl_target) {
1909+
/*
1910+
If this name wasn't found in any of the four namespaces, it's
1911+
definitely unresolved
1912+
*/
1913+
(none, none, none, v) if v.len() == 0 { ret Failed; }
1914+
_ {}
1915+
}
1916+
19071917
assert import_resolution.outstanding_references >= 1u;
19081918
import_resolution.outstanding_references -= 1u;
19091919

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
// error-pattern:failed to resolve imports
2+
// n.b. Can't use a //~ ERROR because there's a non-spanned error
3+
// message.
4+
import x = m::f;
5+
6+
mod m {
7+
}
8+
9+
fn main() {
10+
}

0 commit comments

Comments
 (0)