Skip to content

Commit

Permalink
auto merge of #9395 : brson/rust/0.8, r=alexcrichton
Browse files Browse the repository at this point in the history
  • Loading branch information
bors committed Sep 22, 2013
2 parents eabcb39 + 695cb9f commit 0716782
Show file tree
Hide file tree
Showing 33 changed files with 46 additions and 46 deletions.
2 changes: 1 addition & 1 deletion Makefile.in
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ endif

# version-string calculation
CFG_GIT_DIR := $(CFG_SRC_DIR).git
CFG_RELEASE = 0.8-pre
CFG_RELEASE = 0.8
CFG_VERSION = $(CFG_RELEASE)
# windows exe's need numeric versions - don't use anything but
# numbers and dots here
Expand Down
12 changes: 6 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ documentation.
[tutorial]: http://static.rust-lang.org/doc/tutorial.html
[wiki-start]: https://github.com/mozilla/rust/wiki/Note-getting-started-developing-Rust
[win-exe]: http://static.rust-lang.org/dist/rust-0.7-install.exe
[win-exe]: http://static.rust-lang.org/dist/rust-0.8-install.exe

### Linux / OS X

Expand All @@ -33,9 +33,9 @@ documentation.

To build from the [tarball] do:

$ curl -O http://static.rust-lang.org/dist/rust-0.7.tar.gz
$ tar -xzf rust-0.7.tar.gz
$ cd rust-0.7
$ curl -O http://static.rust-lang.org/dist/rust-0.8.tar.gz
$ tar -xzf rust-0.8.tar.gz
$ cd rust-0.8

Or to build from the [repo] do:

Expand All @@ -60,8 +60,8 @@ documentation.
4. Enjoy!

[repo]: https://github.com/mozilla/rust
[tarball]: http://static.rust-lang.org/dist/rust-0.7.tar.gz
[tutorial]: http://static.rust-lang.org/doc/0.7/tutorial.html
[tarball]: http://static.rust-lang.org/dist/rust-0.8.tar.gz
[tutorial]: http://static.rust-lang.org/doc/0.8/tutorial.html

## Notes

Expand Down
2 changes: 1 addition & 1 deletion doc/po/ja/rust.md.po
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
#
msgid ""
msgstr ""
"Project-Id-Version: Rust 0.8-pre\n"
"Project-Id-Version: Rust 0.8\n"
"POT-Creation-Date: 2013-08-12 02:06+0900\n"
"PO-Revision-Date: 2013-08-05 19:40+0900\n"
"Last-Translator: Automatically generated\n"
Expand Down
2 changes: 1 addition & 1 deletion doc/po/ja/rustpkg.md.po
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
#
msgid ""
msgstr ""
"Project-Id-Version: Rust 0.8-pre\n"
"Project-Id-Version: Rust 0.8\n"
"POT-Creation-Date: 2013-07-30 07:07+0900\n"
"PO-Revision-Date: 2013-07-28 20:32+0900\n"
"Last-Translator: Automatically generated\n"
Expand Down
2 changes: 1 addition & 1 deletion doc/po/ja/tutorial-borrowed-ptr.md.po
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
#
msgid ""
msgstr ""
"Project-Id-Version: Rust 0.8-pre\n"
"Project-Id-Version: Rust 0.8\n"
"POT-Creation-Date: 2013-07-22 23:37+0900\n"
"PO-Revision-Date: 2013-07-28 20:32+0900\n"
"Last-Translator: Automatically generated\n"
Expand Down
2 changes: 1 addition & 1 deletion doc/po/ja/tutorial-container.md.po
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
#
msgid ""
msgstr ""
"Project-Id-Version: Rust 0.8-pre\n"
"Project-Id-Version: Rust 0.8\n"
"POT-Creation-Date: 2013-08-05 19:40+0900\n"
"PO-Revision-Date: 2013-07-28 20:32+0900\n"
"Last-Translator: Automatically generated\n"
Expand Down
2 changes: 1 addition & 1 deletion doc/po/ja/tutorial-ffi.md.po
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
#
msgid ""
msgstr ""
"Project-Id-Version: Rust 0.8-pre\n"
"Project-Id-Version: Rust 0.8\n"
"POT-Creation-Date: 2013-08-10 07:44+0900\n"
"PO-Revision-Date: 2013-07-22 23:37+0900\n"
"Last-Translator: Automatically generated\n"
Expand Down
2 changes: 1 addition & 1 deletion doc/po/ja/tutorial-macros.md.po
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
#
msgid ""
msgstr ""
"Project-Id-Version: Rust 0.8-pre\n"
"Project-Id-Version: Rust 0.8\n"
"POT-Creation-Date: 2013-07-28 20:32+0900\n"
"PO-Revision-Date: 2013-07-28 20:32+0900\n"
"Last-Translator: Automatically generated\n"
Expand Down
2 changes: 1 addition & 1 deletion doc/po/ja/tutorial-tasks.md.po
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
#
msgid ""
msgstr ""
"Project-Id-Version: Rust 0.8-pre\n"
"Project-Id-Version: Rust 0.8\n"
"POT-Creation-Date: 2013-08-08 22:27+0900\n"
"PO-Revision-Date: 2013-07-28 20:32+0900\n"
"Last-Translator: Automatically generated\n"
Expand Down
2 changes: 1 addition & 1 deletion doc/po/ja/tutorial.md.po
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
#
msgid ""
msgstr ""
"Project-Id-Version: Rust 0.8-pre\n"
"Project-Id-Version: Rust 0.8\n"
"POT-Creation-Date: 2013-08-12 02:06+0900\n"
"PO-Revision-Date: 2013-08-08 22:27+0900\n"
"Last-Translator: Automatically generated\n"
Expand Down
2 changes: 1 addition & 1 deletion doc/po/rust.md.pot
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: Rust 0.8-pre\n"
"Project-Id-Version: Rust 0.8\n"
"POT-Creation-Date: 2013-08-12 02:06+0900\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
Expand Down
2 changes: 1 addition & 1 deletion doc/po/rustpkg.md.pot
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: Rust 0.8-pre\n"
"Project-Id-Version: Rust 0.8\n"
"POT-Creation-Date: 2013-07-30 07:07+0900\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
Expand Down
2 changes: 1 addition & 1 deletion doc/po/tutorial-borrowed-ptr.md.pot
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: Rust 0.8-pre\n"
"Project-Id-Version: Rust 0.8\n"
"POT-Creation-Date: 2013-07-22 23:37+0900\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
Expand Down
2 changes: 1 addition & 1 deletion doc/po/tutorial-container.md.pot
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: Rust 0.8-pre\n"
"Project-Id-Version: Rust 0.8\n"
"POT-Creation-Date: 2013-08-05 19:40+0900\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
Expand Down
2 changes: 1 addition & 1 deletion doc/po/tutorial-ffi.md.pot
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: Rust 0.8-pre\n"
"Project-Id-Version: Rust 0.8\n"
"POT-Creation-Date: 2013-08-10 07:44+0900\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
Expand Down
2 changes: 1 addition & 1 deletion doc/po/tutorial-macros.md.pot
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: Rust 0.8-pre\n"
"Project-Id-Version: Rust 0.8\n"
"POT-Creation-Date: 2013-07-22 23:37+0900\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
Expand Down
2 changes: 1 addition & 1 deletion doc/po/tutorial-tasks.md.pot
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: Rust 0.8-pre\n"
"Project-Id-Version: Rust 0.8\n"
"POT-Creation-Date: 2013-08-08 22:27+0900\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
Expand Down
10 changes: 5 additions & 5 deletions doc/po/tutorial.md.pot
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: Rust 0.8-pre\n"
"Project-Id-Version: Rust 0.8\n"
"POT-Creation-Date: 2013-08-12 02:06+0900\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
Expand Down Expand Up @@ -271,8 +271,8 @@ msgstr ""
#. type: Plain text
#: doc/tutorial.md:108
msgid ""
"~~~~ {.notrust} $ curl -O http://static.rust-lang.org/dist/rust-0.7.tar.gz $ "
"tar -xzf rust-0.7.tar.gz $ cd rust-0.7 $ ./configure $ make && make install "
"~~~~ {.notrust} $ curl -O http://static.rust-lang.org/dist/rust-0.8.tar.gz $ "
"tar -xzf rust-0.8.tar.gz $ cd rust-0.8 $ ./configure $ make && make install "
"~~~~"
msgstr ""

Expand All @@ -298,8 +298,8 @@ msgstr ""
#. type: Plain text
#: doc/tutorial.md:123
msgid ""
"[tarball]: http://static.rust-lang.org/dist/rust-0.7.tar.gz [win-exe]: "
"http://static.rust-lang.org/dist/rust-0.7-install.exe"
"[tarball]: http://static.rust-lang.org/dist/rust-0.8.tar.gz [win-exe]: "
"http://static.rust-lang.org/dist/rust-0.8-install.exe"
msgstr ""

#. type: Plain text
Expand Down
10 changes: 5 additions & 5 deletions doc/tutorial.md
Original file line number Diff line number Diff line change
Expand Up @@ -98,9 +98,9 @@ If you've fulfilled those prerequisites, something along these lines
should work.

~~~~ {.notrust}
$ curl -O http://static.rust-lang.org/dist/rust-0.7.tar.gz
$ tar -xzf rust-0.7.tar.gz
$ cd rust-0.7
$ curl -O http://static.rust-lang.org/dist/rust-0.8.tar.gz
$ tar -xzf rust-0.8.tar.gz
$ cd rust-0.8
$ ./configure
$ make && make install
~~~~
Expand All @@ -117,8 +117,8 @@ API-documentation tool; `rustpkg`, the Rust package manager;
`rusti`, the Rust REPL; and `rust`, a tool which acts both as a unified
interface for them, and for a few common command line scenarios.

[tarball]: http://static.rust-lang.org/dist/rust-0.7.tar.gz
[win-exe]: http://static.rust-lang.org/dist/rust-0.7-install.exe
[tarball]: http://static.rust-lang.org/dist/rust-0.8.tar.gz
[win-exe]: http://static.rust-lang.org/dist/rust-0.8-install.exe

## Compiling your first program

Expand Down
2 changes: 1 addition & 1 deletion src/etc/kate/rust.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<!ENTITY rustIdent "[a-zA-Z_][a-zA-Z_0-9]*">
<!ENTITY rustIntSuf "([iu](8|16|32|64)?)?">
]>
<language name="Rust" version="0.8-pre" kateversion="2.4" section="Sources" extensions="*.rs;*.rc" mimetype="text/x-rust" priority="15">
<language name="Rust" version="0.8" kateversion="2.4" section="Sources" extensions="*.rs;*.rc" mimetype="text/x-rust" priority="15">
<highlighting>
<list name="fn">
<item> fn </item>
Expand Down
Binary file modified src/etc/pkg/rust-logo.ico
Binary file not shown.
2 changes: 1 addition & 1 deletion src/libextra/extra.rs
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ Rust extras are part of the standard Rust distribution.
*/

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

Expand Down
2 changes: 1 addition & 1 deletion src/librust/rust.rs
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
// FIXME #2238 Make run only accept source that emits an executable

#[link(name = "rust",
vers = "0.8-pre",
vers = "0.8",
uuid = "4a24da33-5cc8-4037-9352-2cbe9bd9d27c",
url = "https://github.com/mozilla/rust/tree/master/src/rust")];

Expand Down
2 changes: 1 addition & 1 deletion src/librustc/front/std_inject.rs
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ use syntax::codemap;
use syntax::fold;
use syntax::opt_vec;

static STD_VERSION: &'static str = "0.8-pre";
static STD_VERSION: &'static str = "0.8";

pub fn maybe_inject_libstd_ref(sess: Session, crate: @ast::Crate)
-> @ast::Crate {
Expand Down
2 changes: 1 addition & 1 deletion src/librustc/front/test.rs
Original file line number Diff line number Diff line change
Expand Up @@ -282,7 +282,7 @@ fn mk_std(cx: &TestCtxt) -> ast::view_item {
path_node(~[id_extra]),
ast::DUMMY_NODE_ID))])
} else {
let mi = attr::mk_name_value_item_str(@"vers", @"0.8-pre");
let mi = attr::mk_name_value_item_str(@"vers", @"0.8");
ast::view_item_extern_mod(id_extra, None, ~[mi], ast::DUMMY_NODE_ID)
};
ast::view_item {
Expand Down
2 changes: 1 addition & 1 deletion src/librustc/rustc.rs
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
// except according to those terms.

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

Expand Down
2 changes: 1 addition & 1 deletion src/librustdoc/rustdoc.rs
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.8-pre",
vers = "0.8",
uuid = "f8abd014-b281-484d-a0c3-26e3de8e2412",
url = "https://github.com/mozilla/rust/tree/master/src/rustdoc")];

Expand Down
2 changes: 1 addition & 1 deletion src/librusti/rusti.rs
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
*/

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

Expand Down
2 changes: 1 addition & 1 deletion src/librustpkg/rustpkg.rs
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
// rustpkg - a package manager and build system for Rust

#[link(name = "rustpkg",
vers = "0.8-pre",
vers = "0.8",
uuid = "25de5e6e-279e-4a20-845c-4cabae92daaf",
url = "https://github.com/mozilla/rust/tree/master/src/librustpkg")];

Expand Down
4 changes: 2 additions & 2 deletions src/libstd/std.rs
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ they contained the following prologue:


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

Expand All @@ -68,7 +68,7 @@ they contained the following prologue:
#[deny(missing_doc)];

// Make extra accessible for benchmarking
#[cfg(test)] extern mod extra(vers="0.8-pre");
#[cfg(test)] extern mod extra(vers="0.8");

// Make std testable by not duplicating lang items. See #2912
#[cfg(test)] extern mod realstd(name = "std");
Expand Down
2 changes: 1 addition & 1 deletion src/libsyntax/syntax.rs
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
*/

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

#[license = "MIT/ASL2"];
Expand Down
2 changes: 1 addition & 1 deletion src/rustdoc_ng/rustdoc_ng.rs
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
// except according to those terms.

#[link(name = "rustdoc_ng",
vers = "0.8-pre",
vers = "0.8",
uuid = "8c6e4598-1596-4aa5-a24c-b811914bbbc6",
url = "https://github.com/mozilla/rust/tree/master/src/rustdoc_ng")];

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 @@ -15,7 +15,7 @@
#[no_std];
extern mod std;
extern mod zed(name = "std");
extern mod bar(name = "std", vers = "0.8-pre");
extern mod bar(name = "std", vers = "0.8");


use std::str;
Expand Down

0 comments on commit 0716782

Please sign in to comment.