Skip to content

Commit 2681098

Browse files
committed
---
yaml --- r: 150719 b: refs/heads/try2 c: 1f2c18a h: refs/heads/master i: 150717: 6892428 150715: bf23bd6 150711: fe3d739 150703: 5b13392 150687: 1e3d11f 150655: eeff596 v: v3
1 parent d31c0a5 commit 2681098

File tree

4 files changed

+35
-2
lines changed

4 files changed

+35
-2
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ refs/heads/snap-stage3: 78a7676898d9f80ab540c6df5d4c9ce35bb50463
55
refs/heads/try: 519addf6277dbafccbb4159db4b710c37eaa2ec5
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
8-
refs/heads/try2: df533c6e87f5052667b0c03c918f95b51439fdba
8+
refs/heads/try2: 1f2c18a0afd55bf3a5319d9e3810ec1ac6b3e1bb
99
refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
1010
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
1111
refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1982,6 +1982,7 @@ impl<'a> Resolver<'a> {
19821982
// the source of this name is different now
19831983
resolution.type_id.set(id);
19841984
resolution.value_id.set(id);
1985+
resolution.is_public.set(is_public);
19851986
}
19861987
None => {
19871988
debug!("(building import directive) creating new");

branches/try2/src/libstd/io/test.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@ macro_rules! iotest (
3939
use io::process::*;
4040
use unstable::running_on_valgrind;
4141
use str;
42-
use util;
4342

4443
fn f() $b
4544

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
2+
// file at the top-level directory of this distribution and at
3+
// http://rust-lang.org/COPYRIGHT.
4+
//
5+
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
6+
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
7+
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
8+
// option. This file may not be copied, modified, or distributed
9+
// except according to those terms.
10+
11+
mod a {
12+
pub fn foobar() -> int { 1 }
13+
}
14+
15+
mod b {
16+
pub fn foobar() -> int { 2 }
17+
}
18+
19+
mod c {
20+
// Technically the second use shadows the first, but in theory it should
21+
// only be shadowed for this module. The implementation of resolve currently
22+
// doesn't implement this, so this test is ensuring that using "c::foobar"
23+
// is *not* getting b::foobar. Today it's an error, but perhaps one day it
24+
// can correctly get a::foobar instead.
25+
pub use a::foobar;
26+
use b::foobar;
27+
}
28+
29+
fn main() {
30+
assert_eq!(c::foobar(), 1);
31+
//~^ ERROR: unresolved name `c::foobar`
32+
}
33+

0 commit comments

Comments
 (0)