Skip to content

Commit 57c5999

Browse files
committed
librustc: Terminate name searches at the nearest module scope for paths that contain at least two components. r=graydon
1 parent 6b65939 commit 57c5999

File tree

263 files changed

+2536
-786
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

263 files changed

+2536
-786
lines changed

src/driver/driver.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,18 +12,18 @@
1212
extern mod core(vers = "0.6");
1313

1414
#[cfg(cargo)]
15-
extern mod self(name = "cargo", vers = "0.6");
15+
extern mod this(name = "cargo", vers = "0.6");
1616

1717
#[cfg(fuzzer)]
18-
extern mod self(name = "fuzzer", vers = "0.6");
18+
extern mod this(name = "fuzzer", vers = "0.6");
1919

2020
#[cfg(rustdoc)]
21-
extern mod self(name = "rustdoc", vers = "0.6");
21+
extern mod this(name = "rustdoc", vers = "0.6");
2222

2323
#[cfg(rusti)]
24-
extern mod self(name = "rusti", vers = "0.6");
24+
extern mod this(name = "rusti", vers = "0.6");
2525

2626
#[cfg(rustc)]
27-
extern mod self(name = "rustc", vers = "0.6");
27+
extern mod this(name = "rustc", vers = "0.6");
2828

29-
fn main() { self::main() }
29+
fn main() { this::main() }

src/libcargo/pgp.rs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,9 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11+
use core::os;
12+
use core::run;
13+
1114
fn gpgv(args: ~[~str]) -> { status: int, out: ~str, err: ~str } {
1215
return run::program_output(~"gpgv", args);
1316
}

src/libcore/at_vec.rs

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,21 +15,26 @@
1515
#[forbid(deprecated_pattern)];
1616

1717
use cast::transmute;
18+
use iter;
19+
use libc;
1820
use ptr::addr_of;
21+
use sys;
22+
use uint;
23+
use vec;
1924

2025
/// Code for dealing with @-vectors. This is pretty incomplete, and
2126
/// contains a bunch of duplication from the code for ~-vectors.
2227
2328
#[abi = "cdecl"]
24-
extern mod rustrt {
29+
pub extern mod rustrt {
2530
#[legacy_exports];
2631
fn vec_reserve_shared_actual(++t: *sys::TypeDesc,
2732
++v: **vec::raw::VecRepr,
2833
++n: libc::size_t);
2934
}
3035

3136
#[abi = "rust-intrinsic"]
32-
extern mod rusti {
37+
pub extern mod rusti {
3338
#[legacy_exports];
3439
fn move_val_init<T>(dst: &mut T, -src: T);
3540
}
@@ -157,6 +162,13 @@ pub mod traits {
157162
pub mod traits {}
158163

159164
pub mod raw {
165+
use at_vec::{rusti, rustrt};
166+
use libc;
167+
use ptr;
168+
use sys;
169+
use uint;
170+
use vec;
171+
160172
pub type VecRepr = vec::raw::VecRepr;
161173
pub type SliceRepr = vec::raw::SliceRepr;
162174

src/libcore/bool.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616

1717
//! Boolean logic
1818
19+
use cmp;
1920
use cmp::Eq;
2021

2122
/// Negation / inverse

src/libcore/char.rs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,10 @@
1515
#[forbid(deprecated_pattern)];
1616

1717
use cmp::Eq;
18+
use str;
19+
use u32;
20+
use uint;
21+
use unicode;
1822

1923
/*
2024
Lu Uppercase_Letter an uppercase letter

src/libcore/condition.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11+
use task;
12+
1113
// helper for transmutation, shown below.
1214
type RustClosure = (int,int);
1315
pub struct Handler<T, U> {

src/libcore/core.rc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -235,7 +235,7 @@ mod stackwalk;
235235
// 'core' so that macro-expanded references to core::error and such
236236
// can be resolved within libcore.
237237
#[doc(hidden)] // FIXME #3538
238-
mod core {
238+
pub mod core {
239239
pub const error : u32 = 1_u32;
240240
pub const warn : u32 = 2_u32;
241241
pub const info : u32 = 3_u32;

src/libcore/dlist.rs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,10 @@ Do not use ==, !=, <, etc on doubly-linked lists -- it may not terminate.
2222
#[forbid(deprecated_mode)];
2323
#[forbid(deprecated_pattern)];
2424

25+
use managed;
26+
use option;
27+
use vec;
28+
2529
type DListLink<T> = Option<DListNode<T>>;
2630

2731
enum DListNode<T> = @{

src/libcore/dvec.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,10 @@ Note that recursive use is not permitted.
2323
#[forbid(deprecated_mode)];
2424
#[forbid(deprecated_pattern)];
2525

26+
use cast;
2627
use cast::reinterpret_cast;
2728
use ptr::null;
29+
use vec;
2830

2931
/**
3032
* A growable, modifiable vector type that accumulates elements into a

src/libcore/either.rs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,11 @@
1414

1515
//! A type that represents one of two alternatives
1616
17+
use cmp;
1718
use cmp::Eq;
19+
use result;
1820
use result::Result;
21+
use vec;
1922

2023
/// The either type
2124
#[deriving_eq]

0 commit comments

Comments
 (0)