Skip to content

Commit deb3f7b

Browse files
cpetersocpeterso
committed
---
yaml --- r: 39569 b: refs/heads/incoming c: 6d8621a h: refs/heads/master i: 39567: 0ea68bf v: v3
1 parent 5b2a2ed commit deb3f7b

File tree

28 files changed

+535
-436
lines changed

28 files changed

+535
-436
lines changed

‎[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ refs/heads/try: 3d5418789064fdb463e872a4e651af1c628a3650
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
88
refs/heads/try2: a810c03263670238bccd64cabb12a23a46e3a278
9-
refs/heads/incoming: cd6960edf071053237e4608a3bf2a423d75ff6dc
9+
refs/heads/incoming: 6d8621ae7f0df0bc3878c256b98a6483fc3d9a32
1010
refs/heads/dist-snap: 22efa39382d41b084fde1719df7ae8ce5697d8c9
1111
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
1212
refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

‎branches/incoming/AUTHORS.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,6 @@ Jeff Balogh <[email protected]>
6969
Jeff Muizelaar <[email protected]>
7070
Jeff Olson <[email protected]>
7171
Jeffrey Yasskin <[email protected]>
72-
Jens Nockert <[email protected]>
7372
Jesse Ruderman <[email protected]>
7473
Jim Blandy <[email protected]>
7574
Jimmy Lu <[email protected]>

‎branches/incoming/Makefile.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ LIBRUSTI_DSYM_GLOB :=$(call CFG_LIB_DSYM_GLOB,rusti)
154154

155155
# version-string calculation
156156
CFG_GIT_DIR := $(CFG_SRC_DIR).git
157-
CFG_RELEASE = 0.6
157+
CFG_RELEASE = 0.5
158158
CFG_VERSION = $(CFG_RELEASE)
159159

160160
ifneq ($(wildcard $(CFG_GIT)),)

‎branches/incoming/README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ packages:
4242
Assuming you're on a relatively modern *nix system and have met the
4343
prerequisites, something along these lines should work.
4444

45-
$ wget http://static.rust-lang.org/dist/rust-0.5.tar.gz
45+
$ wget http://dl.rust-lang.org/dist/rust-0.5.tar.gz
4646
$ tar -xzf rust-0.5.tar.gz
4747
$ cd rust-0.5
4848
$ ./configure
@@ -59,8 +59,8 @@ When complete, `make install` will place several programs into
5959
API-documentation tool, and `cargo`, the Rust package manager.
6060

6161
[wiki-start]: https://github.com/mozilla/rust/wiki/Note-getting-started-developing-Rust
62-
[tarball]: http://static.rust-lang.org/dist/rust-0.5.tar.gz
63-
[win-exe]: http://static.rust-lang.org/dist/rust-0.5-install.exe
62+
[tarball]: http://dl.rust-lang.org/dist/rust-0.5.tar.gz
63+
[win-exe]: http://dl.rust-lang.org/dist/rust-0.5-install.exe
6464

6565

6666
## License
@@ -74,4 +74,4 @@ See LICENSE.txt for details.
7474

7575
The [tutorial] is a good starting point.
7676

77-
[tutorial]: http://static.rust-lang.org/doc/tutorial.html
77+
[tutorial]: http://dl.rust-lang.org/doc/tutorial.html

‎branches/incoming/doc/tutorial.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ If you've fulfilled those prerequisites, something along these lines
9999
should work.
100100

101101
~~~~ {.notrust}
102-
$ curl -O http://static.rust-lang.org/dist/rust-0.5.tar.gz
102+
$ curl -O http://dl.rust-lang.org/dist/rust-0.5.tar.gz
103103
$ tar -xzf rust-0.5.tar.gz
104104
$ cd rust-0.5
105105
$ ./configure
@@ -118,8 +118,8 @@ API-documentation tool, `cargo`, the Rust package manager,
118118
and `rusti`, the Rust REPL.
119119

120120
[wiki-start]: https://github.com/mozilla/rust/wiki/Note-getting-started-developing-Rust
121-
[tarball]: http://static.rust-lang.org/dist/rust-0.5.tar.gz
122-
[win-exe]: http://static.rust-lang.org/dist/rust-0.5-install.exe
121+
[tarball]: http://dl.rust-lang.org/dist/rust-0.5.tar.gz
122+
[win-exe]: http://dl.rust-lang.org/dist/rust-0.5-install.exe
123123

124124
## Compiling your first program
125125

‎branches/incoming/src/compiletest/compiletest.rc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818
#[allow(deprecated_mode)];
1919
#[allow(deprecated_pattern)];
2020

21-
extern mod core(vers = "0.6");
22-
extern mod std(vers = "0.6");
21+
extern mod core(vers = "0.5");
22+
extern mod std(vers = "0.5");
2323

2424
use core::*;
2525

‎branches/incoming/src/driver/driver.rs

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

1111
#[no_core];
12-
extern mod core(vers = "0.6");
12+
extern mod core(vers = "0.5");
1313

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

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

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

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

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

2929
fn main() { self::main() }

‎branches/incoming/src/etc/vim/after/syntax/rust.vim

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,10 @@ if exists('g:rust_conceal_mod_path')
77
syn match rustNiceOperator "::" conceal cchar=ㆍ
88
endif
99

10+
syn match rustLeftArrowHead contained "-" conceal cchar= 
11+
syn match rustLeftArrowTail contained "<" conceal cchar=⟵
12+
syn match rustNiceOperator "<-" contains=rustLeftArrowHead,rustLeftArrowTail
13+
1014
syn match rustRightArrowHead contained ">" conceal cchar= 
1115
syn match rustRightArrowTail contained "-" conceal cchar=⟶
1216
syn match rustNiceOperator "->" contains=rustRightArrowHead,rustRightArrowTail

‎branches/incoming/src/libcargo/cargo.rc

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
// End:
2121

2222
#[link(name = "cargo",
23-
vers = "0.6",
23+
vers = "0.5",
2424
uuid = "9ff87a04-8fed-4295-9ff8-f99bb802650b",
2525
url = "https://github.com/mozilla/rust/tree/master/src/cargo")];
2626

@@ -37,10 +37,10 @@
3737
#[allow(deprecated_mode)];
3838
#[allow(deprecated_pattern)];
3939

40-
extern mod core(vers = "0.6");
41-
extern mod std(vers = "0.6");
42-
extern mod rustc(vers = "0.6");
43-
extern mod syntax(vers = "0.6");
40+
extern mod core(vers = "0.5");
41+
extern mod std(vers = "0.5");
42+
extern mod rustc(vers = "0.5");
43+
extern mod syntax(vers = "0.5");
4444

4545
#[legacy_exports]
4646
mod pgp;

‎branches/incoming/src/libcore/core.rc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ Implicitly, all crates behave as if they included the following prologue:
3636

3737

3838
#[link(name = "core",
39-
vers = "0.6",
39+
vers = "0.5",
4040
uuid = "c70c24a7-5551-4f73-8e37-380b11d80be8",
4141
url = "https://github.com/mozilla/rust/tree/master/src/libcore")];
4242

@@ -103,7 +103,7 @@ pub mod owned;
103103
#[cfg(notest)] pub mod cmp;
104104

105105
// Make core testable by not duplicating lang items. See #2912
106-
#[cfg(test)] extern mod realcore(name = "core", vers = "0.6");
106+
#[cfg(test)] extern mod realcore(name = "core", vers = "0.5");
107107
#[cfg(test)] pub use kinds = realcore::kinds;
108108
#[cfg(test)] pub use ops = realcore::ops;
109109
#[cfg(test)] pub use cmp = realcore::cmp;
@@ -249,7 +249,7 @@ mod core {
249249
// Similar to above. Some magic to make core testable.
250250
#[cfg(test)]
251251
mod std {
252-
extern mod std(vers = "0.6");
252+
extern mod std(vers = "0.5");
253253
pub use std::std::test;
254254
}
255255

‎branches/incoming/src/libcore/dvec.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -67,17 +67,17 @@ pub pure fn DVec<A>() -> DVec<A> {
6767
}
6868

6969
/// Creates a new dvec with a single element
70-
pub fn from_elem<A>(e: A) -> DVec<A> {
70+
pub pure fn from_elem<A>(e: A) -> DVec<A> {
7171
DVec {mut data: ~[move e]}
7272
}
7373

7474
/// Creates a new dvec with the contents of a vector
75-
pub fn from_vec<A>(v: ~[A]) -> DVec<A> {
75+
pub pure fn from_vec<A>(v: ~[A]) -> DVec<A> {
7676
DVec {mut data: move v}
7777
}
7878

7979
/// Consumes the vector and returns its contents
80-
pub fn unwrap<A>(d: DVec<A>) -> ~[A] {
80+
pub pure fn unwrap<A>(d: DVec<A>) -> ~[A] {
8181
let DVec {data: v} = move d;
8282
move v
8383
}

‎branches/incoming/src/libcore/float.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@ pub pure fn to_str_common(num: float, digits: uint, exact: bool) -> ~str {
188188
* * num - The float value
189189
* * digits - The number of significant digits
190190
*/
191-
pub fn to_str_exact(num: float, digits: uint) -> ~str {
191+
pub pure fn to_str_exact(num: float, digits: uint) -> ~str {
192192
to_str_common(num, digits, true)
193193
}
194194

@@ -238,7 +238,7 @@ pub pure fn to_str(num: float, digits: uint) -> ~str {
238238
* `none` if the string did not represent a valid number. Otherwise,
239239
* `Some(n)` where `n` is the floating-point number represented by `[num]`.
240240
*/
241-
pub fn from_str(num: &str) -> Option<float> {
241+
pub pure fn from_str(num: &str) -> Option<float> {
242242
if num == "inf" {
243243
return Some(infinity as float);
244244
} else if num == "-inf" {
@@ -466,9 +466,9 @@ pub fn test_from_str() {
466466
assert from_str(~".e-1") == Some(0.);
467467
assert from_str(~"5.") == Some(5.);
468468
assert from_str(~".5") == Some(0.5);
469-
assert from_str(~"0.6") == Some(0.5);
470-
assert from_str(~"0.6") == Some(0.5);
471-
assert from_str(~"0.6") == Some(0.5);
469+
assert from_str(~"0.5") == Some(0.5);
470+
assert from_str(~"0.5") == Some(0.5);
471+
assert from_str(~"0.5") == Some(0.5);
472472
assert from_str(~"-.5") == Some(-0.5);
473473
assert from_str(~"-.5") == Some(-0.5);
474474
assert from_str(~"-5") == Some(-5.);

‎branches/incoming/src/libcore/int-template/int.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,12 @@ mod inst {
1717
pub const bits: uint = uint::bits;
1818

1919
/// Returns `base` raised to the power of `exponent`
20-
pub fn pow(base: int, exponent: uint) -> int {
20+
pub pure fn pow(base: int, exponent: uint) -> int {
2121
if exponent == 0u {
2222
//Not mathemtically true if ~[base == 0]
2323
return 1;
2424
}
25-
if base == 0 { return 0; }
25+
if base == 0 { return 0; }
2626
let mut my_pow = exponent;
2727
let mut acc = 1;
2828
let mut multiplier = base;

‎branches/incoming/src/libcore/ptr.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -170,13 +170,13 @@ pub pure fn to_mut_unsafe_ptr<T>(thing: &mut T) -> *mut T {
170170
(I couldn't think of a cutesy name for this one.)
171171
*/
172172
#[inline(always)]
173-
pub fn to_uint<T>(thing: &T) -> uint unsafe {
173+
pub pure fn to_uint<T>(thing: &T) -> uint unsafe {
174174
cast::reinterpret_cast(&thing)
175175
}
176176

177177
/// Determine if two borrowed pointers point to the same thing.
178178
#[inline(always)]
179-
pub fn ref_eq<T>(thing: &a/T, other: &b/T) -> bool {
179+
pub pure fn ref_eq<T>(thing: &a/T, other: &b/T) -> bool {
180180
to_uint(thing) == to_uint(other)
181181
}
182182

‎branches/incoming/src/libcore/rand.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -309,12 +309,12 @@ impl XorShiftState: Rng {
309309
}
310310
}
311311

312-
pub fn xorshift() -> Rng {
312+
pub pure fn xorshift() -> Rng {
313313
// constants taken from http://en.wikipedia.org/wiki/Xorshift
314314
seeded_xorshift(123456789u32, 362436069u32, 521288629u32, 88675123u32)
315315
}
316316

317-
pub fn seeded_xorshift(x: u32, y: u32, z: u32, w: u32) -> Rng {
317+
pub pure fn seeded_xorshift(x: u32, y: u32, z: u32, w: u32) -> Rng {
318318
{mut x: x, mut y: y, mut z: z, mut w: w} as Rng
319319
}
320320

‎branches/incoming/src/libcore/result.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -234,7 +234,7 @@ impl<T, E> Result<T, E> {
234234
pure fn unwrap(self) -> T { unwrap(self) }
235235

236236
#[inline(always)]
237-
pure fn unwrap_err(self) -> E { unwrap_err(self) }
237+
pure fn unwrap_err(self) -> T { unwrap(self) }
238238

239239
#[inline(always)]
240240
pure fn chain<U>(self, op: fn(T) -> Result<U,E>) -> Result<U,E> {

‎branches/incoming/src/libcore/str.rs

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -214,7 +214,7 @@ pub pure fn connect(v: &[~str], sep: &str) -> ~str {
214214
}
215215

216216
/// Given a string, make a new string with repeated copies of it
217-
pub fn repeat(ss: &str, nn: uint) -> ~str {
217+
pub pure fn repeat(ss: &str, nn: uint) -> ~str {
218218
let mut acc = ~"";
219219
for nn.times { acc += ss; }
220220
acc
@@ -1684,9 +1684,7 @@ pub struct CharRange {
16841684
*
16851685
* This function can be used to iterate over a unicode string in reverse.
16861686
*/
1687-
pure fn char_range_at_reverse(ss: &str, start: uint)
1688-
-> CharRange {
1689-
1687+
pure fn char_range_at_reverse(ss: &str, start: uint) -> CharRange {
16901688
let mut prev = start;
16911689

16921690
// while there is a previous byte == 10......

‎branches/incoming/src/libcore/uint-template/uint.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ mod inst {
104104

105105
/// Returns the smallest power of 2 greater than or equal to `n`
106106
#[inline(always)]
107-
pub fn next_power_of_two(n: uint) -> uint {
107+
pub pure fn next_power_of_two(n: uint) -> uint {
108108
let halfbits: uint = sys::size_of::<uint>() * 4u;
109109
let mut tmp: uint = n - 1u;
110110
let mut shift: uint = 1u;

‎branches/incoming/src/libfuzzer/fuzzer.rc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212

1313
#[link(name = "fuzzer",
14-
vers = "0.6",
14+
vers = "0.5",
1515
uuid = "d6418797-2736-4833-bd82-d3c684b7c1b0",
1616
url = "https://github.com/mozilla/rust/tree/master/src/libfuzzer")];
1717

@@ -28,9 +28,9 @@
2828
#[allow(deprecated_mode)];
2929
#[allow(deprecated_pattern)];
3030

31-
extern mod core(vers = "0.6");
32-
extern mod std(vers = "0.6");
33-
extern mod syntax(vers = "0.6");
31+
extern mod core(vers = "0.5");
32+
extern mod std(vers = "0.5");
33+
extern mod syntax(vers = "0.5");
3434

3535
use core::*;
3636

‎branches/incoming/src/librustc/rustc.rc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212

1313
#[link(name = "rustc",
14-
vers = "0.6",
14+
vers = "0.5",
1515
uuid = "0ce89b41-2f92-459e-bbc1-8f5fe32f16cf",
1616
url = "https://github.com/mozilla/rust/tree/master/src/rustc")];
1717

@@ -29,9 +29,9 @@
2929
#[allow(deprecated_mode)];
3030
#[warn(deprecated_pattern)];
3131

32-
extern mod core(vers = "0.6");
33-
extern mod std(vers = "0.6");
34-
extern mod syntax(vers = "0.6");
32+
extern mod core(vers = "0.5");
33+
extern mod std(vers = "0.5");
34+
extern mod syntax(vers = "0.5");
3535

3636
use core::*;
3737

‎branches/incoming/src/librustdoc/rustdoc.rc

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
//! Rustdoc - The Rust documentation generator
1212

1313
#[link(name = "rustdoc",
14-
vers = "0.6",
14+
vers = "0.5",
1515
uuid = "f8abd014-b281-484d-a0c3-26e3de8e2412",
1616
url = "https://github.com/mozilla/rust/tree/master/src/rustdoc")];
1717

@@ -27,10 +27,10 @@
2727
#[allow(deprecated_mode)];
2828
#[allow(deprecated_pattern)];
2929

30-
extern mod core(vers = "0.6");
31-
extern mod std(vers = "0.6");
32-
extern mod rustc(vers = "0.6");
33-
extern mod syntax(vers = "0.6");
30+
extern mod core(vers = "0.5");
31+
extern mod std(vers = "0.5");
32+
extern mod rustc(vers = "0.5");
33+
extern mod syntax(vers = "0.5");
3434

3535
use core::*;
3636
use std::par;

0 commit comments

Comments
 (0)