Skip to content

bump 0.5 => 0.6, redirect some URLs in docs. #4249

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 23, 2012
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Makefile.in
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ LIBRUSTI_DSYM_GLOB :=$(call CFG_LIB_DSYM_GLOB,rusti)

# version-string calculation
CFG_GIT_DIR := $(CFG_SRC_DIR).git
CFG_RELEASE = 0.5
CFG_RELEASE = 0.6
CFG_VERSION = $(CFG_RELEASE)

ifneq ($(wildcard $(CFG_GIT)),)
Expand Down
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ packages:
Assuming you're on a relatively modern *nix system and have met the
prerequisites, something along these lines should work.

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

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


## License
Expand All @@ -74,4 +74,4 @@ See LICENSE.txt for details.

The [tutorial] is a good starting point.

[tutorial]: http://dl.rust-lang.org/doc/tutorial.html
[tutorial]: http://static.rust-lang.org/doc/tutorial.html
6 changes: 3 additions & 3 deletions doc/tutorial.md
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ If you've fulfilled those prerequisites, something along these lines
should work.

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

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

## Compiling your first program

Expand Down
4 changes: 2 additions & 2 deletions src/compiletest/compiletest.rc
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@
#[allow(deprecated_mode)];
#[allow(deprecated_pattern)];

extern mod core(vers = "0.5");
extern mod std(vers = "0.5");
extern mod core(vers = "0.6");
extern mod std(vers = "0.6");

use core::*;

Expand Down
12 changes: 6 additions & 6 deletions src/driver/driver.rs
Original file line number Diff line number Diff line change
Expand Up @@ -9,21 +9,21 @@
// except according to those terms.

#[no_core];
extern mod core(vers = "0.5");
extern mod core(vers = "0.6");

#[cfg(cargo)]
extern mod self(name = "cargo", vers = "0.5");
extern mod self(name = "cargo", vers = "0.6");

#[cfg(fuzzer)]
extern mod self(name = "fuzzer", vers = "0.5");
extern mod self(name = "fuzzer", vers = "0.6");

#[cfg(rustdoc)]
extern mod self(name = "rustdoc", vers = "0.5");
extern mod self(name = "rustdoc", vers = "0.6");

#[cfg(rusti)]
extern mod self(name = "rusti", vers = "0.5");
extern mod self(name = "rusti", vers = "0.6");

#[cfg(rustc)]
extern mod self(name = "rustc", vers = "0.5");
extern mod self(name = "rustc", vers = "0.6");

fn main() { self::main() }
10 changes: 5 additions & 5 deletions src/libcargo/cargo.rc
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
// End:

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

Expand All @@ -37,10 +37,10 @@
#[allow(deprecated_mode)];
#[allow(deprecated_pattern)];

extern mod core(vers = "0.5");
extern mod std(vers = "0.5");
extern mod rustc(vers = "0.5");
extern mod syntax(vers = "0.5");
extern mod core(vers = "0.6");
extern mod std(vers = "0.6");
extern mod rustc(vers = "0.6");
extern mod syntax(vers = "0.6");

#[legacy_exports]
mod pgp;
Expand Down
6 changes: 3 additions & 3 deletions src/libcore/core.rc
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ Implicitly, all crates behave as if they included the following prologue:


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

Expand Down Expand Up @@ -103,7 +103,7 @@ pub mod owned;
#[cfg(notest)] pub mod cmp;

// Make core testable by not duplicating lang items. See #2912
#[cfg(test)] extern mod realcore(name = "core", vers = "0.5");
#[cfg(test)] extern mod realcore(name = "core", vers = "0.6");
#[cfg(test)] pub use kinds = realcore::kinds;
#[cfg(test)] pub use ops = realcore::ops;
#[cfg(test)] pub use cmp = realcore::cmp;
Expand Down Expand Up @@ -249,7 +249,7 @@ mod core {
// Similar to above. Some magic to make core testable.
#[cfg(test)]
mod std {
extern mod std(vers = "0.5");
extern mod std(vers = "0.6");
pub use std::std::test;
}

Expand Down
6 changes: 3 additions & 3 deletions src/libcore/float.rs
Original file line number Diff line number Diff line change
Expand Up @@ -466,9 +466,9 @@ pub fn test_from_str() {
assert from_str(~".e-1") == Some(0.);
assert from_str(~"5.") == Some(5.);
assert from_str(~".5") == Some(0.5);
assert from_str(~"0.5") == Some(0.5);
assert from_str(~"0.5") == Some(0.5);
assert from_str(~"0.5") == Some(0.5);
assert from_str(~"0.6") == Some(0.5);
assert from_str(~"0.6") == Some(0.5);
assert from_str(~"0.6") == Some(0.5);
assert from_str(~"-.5") == Some(-0.5);
assert from_str(~"-.5") == Some(-0.5);
assert from_str(~"-5") == Some(-5.);
Expand Down
8 changes: 4 additions & 4 deletions src/libfuzzer/fuzzer.rc
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@


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

Expand All @@ -28,9 +28,9 @@
#[allow(deprecated_mode)];
#[allow(deprecated_pattern)];

extern mod core(vers = "0.5");
extern mod std(vers = "0.5");
extern mod syntax(vers = "0.5");
extern mod core(vers = "0.6");
extern mod std(vers = "0.6");
extern mod syntax(vers = "0.6");

use core::*;

Expand Down
8 changes: 4 additions & 4 deletions src/librustc/rustc.rc
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@


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

Expand All @@ -29,9 +29,9 @@
#[allow(deprecated_mode)];
#[warn(deprecated_pattern)];

extern mod core(vers = "0.5");
extern mod std(vers = "0.5");
extern mod syntax(vers = "0.5");
extern mod core(vers = "0.6");
extern mod std(vers = "0.6");
extern mod syntax(vers = "0.6");

use core::*;

Expand Down
10 changes: 5 additions & 5 deletions src/librustdoc/rustdoc.rc
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
//! Rustdoc - The Rust documentation generator

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

Expand All @@ -27,10 +27,10 @@
#[allow(deprecated_mode)];
#[allow(deprecated_pattern)];

extern mod core(vers = "0.5");
extern mod std(vers = "0.5");
extern mod rustc(vers = "0.5");
extern mod syntax(vers = "0.5");
extern mod core(vers = "0.6");
extern mod std(vers = "0.6");
extern mod rustc(vers = "0.6");
extern mod syntax(vers = "0.6");

use core::*;
use std::par;
Expand Down
10 changes: 5 additions & 5 deletions src/librusti/rusti.rc
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
// rusti - REPL using the JIT backend

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

Expand All @@ -22,10 +22,10 @@
#[allow(vecs_implicitly_copyable,
non_implicitly_copyable_typarams)];

extern mod core(vers = "0.5");
extern mod std(vers = "0.5");
extern mod rustc(vers = "0.5");
extern mod syntax(vers = "0.5");
extern mod core(vers = "0.6");
extern mod std(vers = "0.6");
extern mod rustc(vers = "0.6");
extern mod syntax(vers = "0.6");

use core::*;
use core::io::{ReaderUtil, WriterUtil};
Expand Down
4 changes: 2 additions & 2 deletions src/libstd/std.rc
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ not required in or otherwise suitable for the core library.
*/

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

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

extern mod core(vers = "0.5");
extern mod core(vers = "0.6");
use core::*;

// General io and system-services modules
Expand Down
6 changes: 3 additions & 3 deletions src/libsyntax/syntax.rc
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
// except according to those terms.

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


Expand All @@ -26,8 +26,8 @@
#[allow(deprecated_mode)];
#[warn(deprecated_pattern)];

extern mod core(vers = "0.5");
extern mod std(vers = "0.5");
extern mod core(vers = "0.6");
extern mod std(vers = "0.6");

use core::*;

Expand Down
2 changes: 1 addition & 1 deletion src/test/run-pass/use.rs
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
#[no_core];
extern mod core;
extern mod zed(name = "core");
extern mod bar(name = "core", vers = "0.5");
extern mod bar(name = "core", vers = "0.6");


use core::str;
Expand Down