Skip to content

Commit 4924c86

Browse files
committed
---
yaml --- r: 34326 b: refs/heads/snap-stage3 c: 57c5999 h: refs/heads/master v: v3
1 parent fef9f9e commit 4924c86

File tree

264 files changed

+2537
-787
lines changed

Some content is hidden

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

264 files changed

+2537
-787
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
refs/heads/master: cd6f24f9d14ac90d167386a56e7a6ac1f0318195
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
4-
refs/heads/snap-stage3: 6b659392ea4a7a15226519f26d081431f624c466
4+
refs/heads/snap-stage3: 57c599914a19861686030b238a0edc7ebb996068
55
refs/heads/try: d324a424d8f84b1eb049b12cf34182bda91b0024
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

branches/snap-stage3/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() }

branches/snap-stage3/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
}

branches/snap-stage3/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

branches/snap-stage3/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

branches/snap-stage3/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

branches/snap-stage3/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> {

branches/snap-stage3/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;

branches/snap-stage3/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> = @{

branches/snap-stage3/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

branches/snap-stage3/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]

branches/snap-stage3/src/libcore/extfmt.rs

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ debug!("hello, %s!", "world");
8282

8383
use cmp::Eq;
8484
use option::{Some, None};
85-
85+
use str;
8686

8787
/*
8888
* We have a 'ct' (compile-time) module that parses format strings into a
@@ -98,6 +98,10 @@ use option::{Some, None};
9898
// Functions used by the fmt extension at compile time
9999
#[doc(hidden)]
100100
pub mod ct {
101+
use char;
102+
use str;
103+
use vec;
104+
101105
pub enum Signedness { Signed, Unsigned, }
102106
pub enum Caseness { CaseUpper, CaseLower, }
103107
pub enum Ty {
@@ -332,6 +336,12 @@ pub mod ct {
332336
// implement it 0this way, I think.
333337
#[doc(hidden)]
334338
pub mod rt {
339+
use float;
340+
use str;
341+
use sys;
342+
use uint;
343+
use vec;
344+
335345
pub const flag_none : u32 = 0u32;
336346
pub const flag_left_justify : u32 = 0b00000000000001u32;
337347
pub const flag_left_zero_pad : u32 = 0b00000000000010u32;

branches/snap-stage3/src/libcore/f32.rs

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

1515
//! Operations and constants for `f32`
1616
17+
use cmp;
18+
use num;
19+
1720
pub use cmath::c_float_utils::*;
1821
pub use cmath::c_float_targ_consts::*;
1922

branches/snap-stage3/src/libcore/f64.rs

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

1515
//! Operations and constants for `f64`
1616
17+
use cmath;
18+
use cmp;
19+
use libc;
20+
use num;
21+
1722
pub use cmath::c_double_utils::*;
1823
pub use cmath::c_double_targ_consts::*;
1924

branches/snap-stage3/src/libcore/flate.rs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,10 @@ Simple compression
1818
#[forbid(deprecated_mode)];
1919
#[forbid(deprecated_pattern)];
2020

21+
use libc;
2122
use libc::{c_void, size_t, c_int};
23+
use ptr;
24+
use vec;
2225

2326
extern mod rustrt {
2427
fn tdefl_compress_mem_to_heap(psrc_buf: *const c_void,

branches/snap-stage3/src/libcore/float.rs

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,13 @@
2626

2727
use m_float = f64;
2828

29+
use cmp::{Eq, Ord};
30+
use f64;
31+
use num;
32+
use num::Num::from_int;
33+
use str;
34+
use uint;
35+
2936
pub use f64::{add, sub, mul, div, rem, lt, le, eq, ne, ge, gt};
3037
pub use f64::logarithm;
3138
pub use f64::{acos, asin, atan2, cbrt, ceil, copysign, cosh, floor};
@@ -35,8 +42,6 @@ pub use f64::{lgamma, ln, log_radix, ln1p, log10, log2, ilog_radix};
3542
pub use f64::{modf, pow, round, sinh, tanh, tgamma, trunc};
3643
pub use f64::signbit;
3744
pub use f64::{j0, j1, jn, y0, y1, yn};
38-
use cmp::{Eq, Ord};
39-
use num::Num::from_int;
4045

4146
pub const NaN: float = 0.0/0.0;
4247

branches/snap-stage3/src/libcore/gc.rs

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,15 @@ with destructors.
3939
#[forbid(deprecated_mode)];
4040
#[forbid(deprecated_pattern)];
4141

42-
pub use stackwalk::Word;
43-
use libc::size_t;
44-
use libc::uintptr_t;
42+
use cast;
43+
use io;
44+
use libc::{size_t, uintptr_t};
45+
use ptr;
4546
use send_map::linear::LinearMap;
47+
use stackwalk;
48+
use sys;
49+
50+
pub use stackwalk::Word;
4651

4752
// Mirrors rust_stack.h stk_seg
4853
struct StackSegment {

branches/snap-stage3/src/libcore/hash.rs

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,12 @@
2323
* CPRNG like rand::rng.
2424
*/
2525

26-
use io::Writer;
27-
use io::WriterUtil;
26+
use io;
27+
use io::{Writer, WriterUtil};
28+
use os;
2829
use to_bytes::IterBytes;
30+
use uint;
31+
use vec;
2932

3033
/**
3134
* Types that can meaningfully be hashed should implement this.

branches/snap-stage3/src/libcore/int-template.rs

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,15 @@
1414

1515
use T = self::inst::T;
1616

17+
use char;
1718
use cmp::{Eq, Ord};
1819
use from_str::FromStr;
20+
use iter;
21+
use num;
1922
use num::Num::from_int;
23+
use str;
24+
use uint;
25+
use vec;
2026

2127
pub const bits : uint = inst::bits;
2228
pub const bytes : uint = (inst::bits / 8);

branches/snap-stage3/src/libcore/int-template/i16.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,5 @@
1212
1313
mod inst {
1414
pub type T = i16;
15-
pub const bits: uint = u16::bits;
16-
}
15+
pub const bits: uint = ::u16::bits;
16+
}

branches/snap-stage3/src/libcore/int-template/i32.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,5 @@
1212
1313
mod inst {
1414
pub type T = i32;
15-
pub const bits: uint = u32::bits;
15+
pub const bits: uint = ::u32::bits;
1616
}

branches/snap-stage3/src/libcore/int-template/i64.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,5 @@
1212
1313
mod inst {
1414
pub type T = i64;
15-
pub const bits: uint = u64::bits;
16-
}
15+
pub const bits: uint = ::u64::bits;
16+
}

branches/snap-stage3/src/libcore/int-template/i8.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,5 @@
1212
1313
mod inst {
1414
pub type T = i8;
15-
pub const bits: uint = u8::bits;
16-
}
15+
pub const bits: uint = ::u8::bits;
16+
}

branches/snap-stage3/src/libcore/int-template/int.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ pub use self::inst::pow;
1414

1515
mod inst {
1616
pub type T = int;
17-
pub const bits: uint = uint::bits;
17+
pub const bits: uint = ::uint::bits;
1818

1919
/// Returns `base` raised to the power of `exponent`
2020
pub pure fn pow(base: int, exponent: uint) -> int {

branches/snap-stage3/src/libcore/io.rs

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,18 @@ use result::Result;
2121

2222
use cmp::Eq;
2323
use dvec::DVec;
24+
use int;
25+
use libc;
2426
use libc::{c_int, c_long, c_uint, c_void, size_t, ssize_t};
2527
use libc::consts::os::posix88::*;
2628
use libc::consts::os::extra::*;
29+
use option;
30+
use os;
31+
use ptr;
32+
use result;
33+
use str;
34+
use uint;
35+
use vec;
2736

2837
#[allow(non_camel_case_types)] // not sure what to do about this
2938
type fd_t = c_int;
@@ -1019,6 +1028,9 @@ pub fn read_whole_file(file: &Path) -> Result<~[u8], ~str> {
10191028
// fsync related
10201029

10211030
pub mod fsync {
1031+
use libc;
1032+
use option;
1033+
use os;
10221034

10231035
pub enum Level {
10241036
// whatever fsync does on that platform

branches/snap-stage3/src/libcore/iter-trait.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
#[forbid(deprecated_pattern)];
1717

1818
use cmp::{Eq, Ord};
19+
use iter;
1920

2021
use self::inst::{IMPL_T, EACH, SIZE_HINT};
2122

branches/snap-stage3/src/libcore/iter-trait/dlist.rs

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,10 @@
99
// except according to those terms.
1010

1111
mod inst {
12+
use dlist;
13+
use managed;
14+
use option;
15+
1216
#[allow(non_camel_case_types)]
1317
pub type IMPL_T<A> = dlist::DList<A>;
1418

@@ -45,4 +49,4 @@ mod inst {
4549
pub pure fn SIZE_HINT<A>(self: &IMPL_T<A>) -> Option<uint> {
4650
Some(self.len())
4751
}
48-
}
52+
}

0 commit comments

Comments
 (0)