Skip to content

Commit 1f2c18a

Browse files
committed
rustc: Don't allow priv use to shadow pub use
Previously, a private use statement would shadow a public use statement, all of a sudden publicly exporting the privately used item. The correct behavior here is to only shadow the use for the module in question, but for now it just reverts the entire name to private so the pub use doesn't have much effect. The behavior isn't exactly what we want, but this no longer has backwards compatibility hazards.
1 parent df533c6 commit 1f2c18a

File tree

3 files changed

+34
-1
lines changed

3 files changed

+34
-1
lines changed

src/librustc/middle/resolve.rs

+1
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");

src/libstd/io/test.rs

-1
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

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)