Skip to content

Commit b1b0c29

Browse files
committed
Merge pull request #4249 from graydon/0.6-bump
bump 0.5 => 0.6, redirect some URLs in docs.
2 parents 0e35391 + dbd3611 commit b1b0c29

File tree

15 files changed

+51
-51
lines changed

15 files changed

+51
-51
lines changed

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.5
157+
CFG_RELEASE = 0.6
158158
CFG_VERSION = $(CFG_RELEASE)
159159

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

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://dl.rust-lang.org/dist/rust-0.5.tar.gz
45+
$ wget http://static.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://dl.rust-lang.org/dist/rust-0.5.tar.gz
63-
[win-exe]: http://dl.rust-lang.org/dist/rust-0.5-install.exe
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
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://dl.rust-lang.org/doc/tutorial.html
77+
[tutorial]: http://static.rust-lang.org/doc/tutorial.html

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://dl.rust-lang.org/dist/rust-0.5.tar.gz
102+
$ curl -O http://static.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://dl.rust-lang.org/dist/rust-0.5.tar.gz
122-
[win-exe]: http://dl.rust-lang.org/dist/rust-0.5-install.exe
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
123123

124124
## Compiling your first program
125125

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.5");
22-
extern mod std(vers = "0.5");
21+
extern mod core(vers = "0.6");
22+
extern mod std(vers = "0.6");
2323

2424
use core::*;
2525

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.5");
12+
extern mod core(vers = "0.6");
1313

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

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

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

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

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

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

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.5",
23+
vers = "0.6",
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.5");
41-
extern mod std(vers = "0.5");
42-
extern mod rustc(vers = "0.5");
43-
extern mod syntax(vers = "0.5");
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");
4444

4545
#[legacy_exports]
4646
mod pgp;

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.5",
39+
vers = "0.6",
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.5");
106+
#[cfg(test)] extern mod realcore(name = "core", vers = "0.6");
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.5");
252+
extern mod std(vers = "0.6");
253253
pub use std::std::test;
254254
}
255255

src/libcore/float.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -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.5") == Some(0.5);
470-
assert from_str(~"0.5") == Some(0.5);
471-
assert from_str(~"0.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);
472472
assert from_str(~"-.5") == Some(-0.5);
473473
assert from_str(~"-.5") == Some(-0.5);
474474
assert from_str(~"-5") == Some(-5.);

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.5",
14+
vers = "0.6",
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.5");
32-
extern mod std(vers = "0.5");
33-
extern mod syntax(vers = "0.5");
31+
extern mod core(vers = "0.6");
32+
extern mod std(vers = "0.6");
33+
extern mod syntax(vers = "0.6");
3434

3535
use core::*;
3636

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.5",
14+
vers = "0.6",
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.5");
33-
extern mod std(vers = "0.5");
34-
extern mod syntax(vers = "0.5");
32+
extern mod core(vers = "0.6");
33+
extern mod std(vers = "0.6");
34+
extern mod syntax(vers = "0.6");
3535

3636
use core::*;
3737

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.5",
14+
vers = "0.6",
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.5");
31-
extern mod std(vers = "0.5");
32-
extern mod rustc(vers = "0.5");
33-
extern mod syntax(vers = "0.5");
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");
3434

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

src/librusti/rusti.rc

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
// rusti - REPL using the JIT backend
1212

1313
#[link(name = "rusti",
14-
vers = "0.5",
14+
vers = "0.6",
1515
uuid = "7fb5bf52-7d45-4fee-8325-5ad3311149fc",
1616
url = "https://github.com/mozilla/rust/tree/master/src/rusti")];
1717

@@ -22,10 +22,10 @@
2222
#[allow(vecs_implicitly_copyable,
2323
non_implicitly_copyable_typarams)];
2424

25-
extern mod core(vers = "0.5");
26-
extern mod std(vers = "0.5");
27-
extern mod rustc(vers = "0.5");
28-
extern mod syntax(vers = "0.5");
25+
extern mod core(vers = "0.6");
26+
extern mod std(vers = "0.6");
27+
extern mod rustc(vers = "0.6");
28+
extern mod syntax(vers = "0.6");
2929

3030
use core::*;
3131
use core::io::{ReaderUtil, WriterUtil};

src/libstd/std.rc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ not required in or otherwise suitable for the core library.
1818
*/
1919

2020
#[link(name = "std",
21-
vers = "0.5",
21+
vers = "0.6",
2222
uuid = "122bed0b-c19b-4b82-b0b7-7ae8aead7297",
2323
url = "https://github.com/mozilla/rust/tree/master/src/libstd")];
2424

@@ -35,7 +35,7 @@ not required in or otherwise suitable for the core library.
3535
#[allow(deprecated_mode)];
3636
#[forbid(deprecated_pattern)];
3737

38-
extern mod core(vers = "0.5");
38+
extern mod core(vers = "0.6");
3939
use core::*;
4040

4141
// General io and system-services modules

src/libsyntax/syntax.rc

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

1111
#[link(name = "syntax",
12-
vers = "0.5",
12+
vers = "0.6",
1313
uuid = "9311401b-d6ea-4cd9-a1d9-61f89499c645")];
1414

1515

@@ -26,8 +26,8 @@
2626
#[allow(deprecated_mode)];
2727
#[warn(deprecated_pattern)];
2828

29-
extern mod core(vers = "0.5");
30-
extern mod std(vers = "0.5");
29+
extern mod core(vers = "0.6");
30+
extern mod std(vers = "0.6");
3131

3232
use core::*;
3333

src/test/run-pass/use.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
#[no_core];
1414
extern mod core;
1515
extern mod zed(name = "core");
16-
extern mod bar(name = "core", vers = "0.5");
16+
extern mod bar(name = "core", vers = "0.6");
1717

1818

1919
use core::str;

0 commit comments

Comments
 (0)