Skip to content

Commit 67394f2

Browse files
committed
auto merge of #9552 : brson/rust/0.9-pre, r=alexcrichton
2 parents e699d91 + 99c1fb8 commit 67394f2

File tree

13 files changed

+15
-15
lines changed

13 files changed

+15
-15
lines changed

Makefile.in

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -141,11 +141,11 @@ endif
141141

142142
# version-string calculation
143143
CFG_GIT_DIR := $(CFG_SRC_DIR).git
144-
CFG_RELEASE = 0.8
144+
CFG_RELEASE = 0.9-pre
145145
CFG_VERSION = $(CFG_RELEASE)
146146
# windows exe's need numeric versions - don't use anything but
147147
# numbers and dots here
148-
CFG_VERSION_WIN = 0.8
148+
CFG_VERSION_WIN = 0.9
149149

150150
ifneq ($(wildcard $(CFG_GIT)),)
151151
ifneq ($(wildcard $(CFG_GIT_DIR)),)

src/etc/kate/rust.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<!ENTITY rustIdent "[a-zA-Z_][a-zA-Z_0-9]*">
88
<!ENTITY rustIntSuf "([iu](8|16|32|64)?)?">
99
]>
10-
<language name="Rust" version="0.8" kateversion="2.4" section="Sources" extensions="*.rs;*.rc" mimetype="text/x-rust" priority="15">
10+
<language name="Rust" version="0.9-pre" kateversion="2.4" section="Sources" extensions="*.rs;*.rc" mimetype="text/x-rust" priority="15">
1111
<highlighting>
1212
<list name="fn">
1313
<item> fn </item>

src/libextra/extra.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ Rust extras are part of the standard Rust distribution.
2121
*/
2222

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

src/librust/rust.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
// FIXME #2238 Make run only accept source that emits an executable
1414

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

src/librustc/front/std_inject.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ use syntax::fold::ast_fold;
2020
use syntax::fold;
2121
use syntax::opt_vec;
2222

23-
static STD_VERSION: &'static str = "0.8";
23+
static STD_VERSION: &'static str = "0.9-pre";
2424

2525
pub fn maybe_inject_libstd_ref(sess: Session, crate: @ast::Crate)
2626
-> @ast::Crate {

src/librustc/front/test.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -279,7 +279,7 @@ fn mk_std(cx: &TestCtxt) -> ast::view_item {
279279
path_node(~[id_extra]),
280280
ast::DUMMY_NODE_ID))])
281281
} else {
282-
let mi = attr::mk_name_value_item_str(@"vers", @"0.8");
282+
let mi = attr::mk_name_value_item_str(@"vers", @"0.9-pre");
283283
ast::view_item_extern_mod(id_extra, None, ~[mi], ast::DUMMY_NODE_ID)
284284
};
285285
ast::view_item {

src/librustc/rustc.rs

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

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

src/librustdoc/rustdoc.rs

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

1111
#[link(name = "rustdoc",
12-
vers = "0.8",
12+
vers = "0.9-pre",
1313
uuid = "8c6e4598-1596-4aa5-a24c-b811914bbbc6",
1414
url = "https://github.com/mozilla/rust/tree/master/src/librustdoc")];
1515

src/librusti/rusti.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@
5959
*/
6060

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

src/librustpkg/rustpkg.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
// rustpkg - a package manager and build system for Rust
1212

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

src/libstd/std.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ they contained the following prologue:
4949

5050

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

@@ -67,7 +67,7 @@ they contained the following prologue:
6767
#[deny(missing_doc)];
6868

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

7272
// Make std testable by not duplicating lang items. See #2912
7373
#[cfg(test)] extern mod realstd(name = "std");

src/libsyntax/syntax.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
*/
1515

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

2020
#[license = "MIT/ASL2"];

src/test/run-pass/use.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
#[no_std];
1616
extern mod std;
1717
extern mod zed(name = "std");
18-
extern mod bar(name = "std", vers = "0.8");
18+
extern mod bar(name = "std", vers = "0.9-pre");
1919

2020

2121
use std::str;

0 commit comments

Comments
 (0)