auto merge of #7577 : brson/rust/vers, r=cmr

Author: bors

Makefile.in

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

src/etc/kate/rust.xml

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

src/libextra/extra.rs

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

src/librust/rust.rs

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

src/librustc/front/std_inject.rs

@@ -18,7 +18,7 @@ use syntax::codemap::dummy_sp;
 use syntax::codemap;
 use syntax::fold;
 
-static STD_VERSION: &'static str = "0.7";
+static STD_VERSION: &'static str = "0.8-pre";
 
 pub fn maybe_inject_libstd_ref(sess: Session, crate: @ast::crate)
                                -> @ast::crate {

src/librustc/front/test.rs

@@ -273,7 +273,7 @@ mod __test {
 */
 
 fn mk_std(cx: &TestCtxt) -> ast::view_item {
-    let vers = ast::lit_str(@"0.7");
+    let vers = ast::lit_str(@"0.8-pre");
     let vers = nospan(vers);
     let mi = ast::meta_name_value(@"vers", vers);
     let mi = nospan(mi);

src/librustc/rustc.rs

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

src/librustdoc/rustdoc.rs

@@ -11,7 +11,7 @@
 //! Rustdoc - The Rust documentation generator
 
 #[link(name = "rustdoc",
-       vers = "0.7",
+       vers = "0.8-pre",
        uuid = "f8abd014-b281-484d-a0c3-26e3de8e2412",
        url = "https://github.com/mozilla/rust/tree/master/src/rustdoc")];
 

src/librusti/rusti.rs

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

src/librustpkg/rustpkg.rs

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

src/libstd/std.rs

@@ -49,7 +49,7 @@ they contained the following prologue:
 
 
 #[link(name = "std",
-       vers = "0.7",
+       vers = "0.8-pre",
        uuid = "c70c24a7-5551-4f73-8e37-380b11d80be8",
        url = "https://github.com/mozilla/rust/tree/master/src/libstd")];
 

src/libsyntax/syntax.rs

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

src/test/run-pass/use.rs

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