auto merge of #9552 : brson/rust/0.9-pre, r=alexcrichton

This commit is contained in:
bors 2013-09-27 13:51:07 -07:00
commit 67394f20eb
13 changed files with 15 additions and 15 deletions

View File

@ -141,11 +141,11 @@ endif
# version-string calculation
CFG_GIT_DIR := $(CFG_SRC_DIR).git
CFG_RELEASE = 0.8
CFG_RELEASE = 0.9-pre
CFG_VERSION = $(CFG_RELEASE)
# windows exe's need numeric versions - don't use anything but
# numbers and dots here
CFG_VERSION_WIN = 0.8
CFG_VERSION_WIN = 0.9
ifneq ($(wildcard $(CFG_GIT)),)
ifneq ($(wildcard $(CFG_GIT_DIR)),)

View File

@ -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" kateversion="2.4" section="Sources" extensions="*.rs;*.rc" mimetype="text/x-rust" priority="15">
<language name="Rust" version="0.9-pre" kateversion="2.4" section="Sources" extensions="*.rs;*.rc" mimetype="text/x-rust" priority="15">
<highlighting>
<list name="fn">
<item> fn </item>

View File

@ -21,7 +21,7 @@ Rust extras are part of the standard Rust distribution.
*/
#[link(name = "extra",
vers = "0.8",
vers = "0.9-pre",
uuid = "122bed0b-c19b-4b82-b0b7-7ae8aead7297",
url = "https://github.com/mozilla/rust/tree/master/src/libextra")];

View File

@ -13,7 +13,7 @@
// FIXME #2238 Make run only accept source that emits an executable
#[link(name = "rust",
vers = "0.8",
vers = "0.9-pre",
uuid = "4a24da33-5cc8-4037-9352-2cbe9bd9d27c",
url = "https://github.com/mozilla/rust/tree/master/src/rust")];

View File

@ -20,7 +20,7 @@ use syntax::fold::ast_fold;
use syntax::fold;
use syntax::opt_vec;
static STD_VERSION: &'static str = "0.8";
static STD_VERSION: &'static str = "0.9-pre";
pub fn maybe_inject_libstd_ref(sess: Session, crate: @ast::Crate)
-> @ast::Crate {

View File

@ -279,7 +279,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");
let mi = attr::mk_name_value_item_str(@"vers", @"0.9-pre");
ast::view_item_extern_mod(id_extra, None, ~[mi], ast::DUMMY_NODE_ID)
};
ast::view_item {

View File

@ -9,7 +9,7 @@
// except according to those terms.
#[link(name = "rustc",
vers = "0.8",
vers = "0.9-pre",
uuid = "0ce89b41-2f92-459e-bbc1-8f5fe32f16cf",
url = "https://github.com/mozilla/rust/tree/master/src/rustc")];

View File

@ -9,7 +9,7 @@
// except according to those terms.
#[link(name = "rustdoc",
vers = "0.8",
vers = "0.9-pre",
uuid = "8c6e4598-1596-4aa5-a24c-b811914bbbc6",
url = "https://github.com/mozilla/rust/tree/master/src/librustdoc")];

View File

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

View File

@ -11,7 +11,7 @@
// rustpkg - a package manager and build system for Rust
#[link(name = "rustpkg",
vers = "0.8",
vers = "0.9-pre",
uuid = "25de5e6e-279e-4a20-845c-4cabae92daaf",
url = "https://github.com/mozilla/rust/tree/master/src/librustpkg")];

View File

@ -49,7 +49,7 @@ they contained the following prologue:
#[link(name = "std",
vers = "0.8",
vers = "0.9-pre",
uuid = "c70c24a7-5551-4f73-8e37-380b11d80be8",
url = "https://github.com/mozilla/rust/tree/master/src/libstd")];
@ -67,7 +67,7 @@ they contained the following prologue:
#[deny(missing_doc)];
// Make extra accessible for benchmarking
#[cfg(test)] extern mod extra(vers="0.8");
#[cfg(test)] extern mod extra(vers="0.9-pre");
// Make std testable by not duplicating lang items. See #2912
#[cfg(test)] extern mod realstd(name = "std");

View File

@ -14,7 +14,7 @@
*/
#[link(name = "syntax",
vers = "0.8",
vers = "0.9-pre",
uuid = "9311401b-d6ea-4cd9-a1d9-61f89499c645")];
#[license = "MIT/ASL2"];

View File

@ -15,7 +15,7 @@
#[no_std];
extern mod std;
extern mod zed(name = "std");
extern mod bar(name = "std", vers = "0.8");
extern mod bar(name = "std", vers = "0.9-pre");
use std::str;