diff --git a/Makefile.in b/Makefile.in index c2a562967d6..723496f5f38 100644 --- a/Makefile.in +++ b/Makefile.in @@ -154,11 +154,11 @@ endif # version-string calculation CFG_GIT_DIR := $(CFG_SRC_DIR).git -CFG_RELEASE = 0.9 +CFG_RELEASE = 0.10-pre CFG_VERSION = $(CFG_RELEASE) # windows exe's need numeric versions - don't use anything but # numbers and dots here -CFG_VERSION_WIN = 0.9 +CFG_VERSION_WIN = 0.10 # since $(CFG_GIT) may contain spaces (especially on Windows), # we need to escape them. (" " to r"\ ") diff --git a/src/etc/kate/rust.xml b/src/etc/kate/rust.xml index 0ccab9b2400..db479e468d5 100644 --- a/src/etc/kate/rust.xml +++ b/src/etc/kate/rust.xml @@ -7,7 +7,7 @@ ]> - + fn diff --git a/src/libextra/lib.rs b/src/libextra/lib.rs index 44b01caac26..fc0cc045175 100644 --- a/src/libextra/lib.rs +++ b/src/libextra/lib.rs @@ -20,7 +20,7 @@ Rust extras are part of the standard Rust distribution. */ -#[crate_id = "extra#0.9"]; +#[crate_id = "extra#0.10-pre"]; #[comment = "Rust extras"]; #[license = "MIT/ASL2"]; #[crate_type = "rlib"]; diff --git a/src/libgreen/lib.rs b/src/libgreen/lib.rs index d7e94c6d48e..990ca9f80b5 100644 --- a/src/libgreen/lib.rs +++ b/src/libgreen/lib.rs @@ -17,6 +17,7 @@ //! This can be optionally linked in to rust programs in order to provide M:N //! functionality inside of 1:1 programs. +// NOTE: Change to 0.10-pre after snapshot #[crate_id = "green#0.9"]; #[license = "MIT/ASL2"]; #[crate_type = "rlib"]; diff --git a/src/libnative/lib.rs b/src/libnative/lib.rs index 5acd34955ca..91c5e505178 100644 --- a/src/libnative/lib.rs +++ b/src/libnative/lib.rs @@ -14,7 +14,7 @@ //! runtime. In addition, all I/O provided by this crate is the thread blocking //! version of I/O. -#[crate_id = "native#0.9"]; +#[crate_id = "native#0.10-pre"]; #[license = "MIT/ASL2"]; #[crate_type = "rlib"]; #[crate_type = "dylib"]; diff --git a/src/librustc/front/std_inject.rs b/src/librustc/front/std_inject.rs index ae593783213..c301318047c 100644 --- a/src/librustc/front/std_inject.rs +++ b/src/librustc/front/std_inject.rs @@ -21,8 +21,6 @@ use syntax::fold; use syntax::opt_vec; use syntax::util::small_vector::SmallVector; -pub static VERSION: &'static str = "0.9"; - pub fn maybe_inject_libstd_ref(sess: Session, crate: ast::Crate) -> ast::Crate { if use_std(&crate) { @@ -59,8 +57,7 @@ impl fold::Folder for StandardLibraryInjector { fn fold_crate(&mut self, crate: ast::Crate) -> ast::Crate { let mut vis = ~[ast::ViewItem { node: ast::ViewItemExternMod(self.sess.ident_of("std"), - Some((format!("std\\#{}", VERSION).to_managed(), - ast::CookedStr)), + None, ast::DUMMY_NODE_ID), attrs: ~[], vis: ast::Private, @@ -70,8 +67,7 @@ impl fold::Folder for StandardLibraryInjector { if use_uv(&crate) && !self.sess.building_library.get() { vis.push(ast::ViewItem { node: ast::ViewItemExternMod(self.sess.ident_of("green"), - Some((format!("green\\#{}", VERSION).to_managed(), - ast::CookedStr)), + None, ast::DUMMY_NODE_ID), attrs: ~[], vis: ast::Private, @@ -79,8 +75,7 @@ impl fold::Folder for StandardLibraryInjector { }); vis.push(ast::ViewItem { node: ast::ViewItemExternMod(self.sess.ident_of("rustuv"), - Some((format!("rustuv\\#{}", VERSION).to_managed(), - ast::CookedStr)), + None, ast::DUMMY_NODE_ID), attrs: ~[], vis: ast::Private, diff --git a/src/librustc/front/test.rs b/src/librustc/front/test.rs index f78f1b2407d..26d6c5cf9e7 100644 --- a/src/librustc/front/test.rs +++ b/src/librustc/front/test.rs @@ -13,7 +13,6 @@ use driver::session; use front::config; -use front::std_inject::VERSION; use std::cell::RefCell; use std::vec; @@ -293,8 +292,7 @@ fn mk_std(cx: &TestCtxt) -> ast::ViewItem { ast::DUMMY_NODE_ID))]) } else { ast::ViewItemExternMod(id_extra, - Some((format!("extra\\#{}", VERSION).to_managed(), - ast::CookedStr)), + None, ast::DUMMY_NODE_ID) }; ast::ViewItem { diff --git a/src/librustc/lib.rs b/src/librustc/lib.rs index f997c69b159..eb4623d554b 100644 --- a/src/librustc/lib.rs +++ b/src/librustc/lib.rs @@ -18,7 +18,7 @@ This API is completely unstable and subject to change. */ -#[crate_id = "rustc#0.9"]; +#[crate_id = "rustc#0.10-pre"]; #[comment = "The Rust compiler"]; #[license = "MIT/ASL2"]; #[crate_type = "dylib"]; diff --git a/src/librustdoc/lib.rs b/src/librustdoc/lib.rs index 5940fc731c4..125af757dc7 100644 --- a/src/librustdoc/lib.rs +++ b/src/librustdoc/lib.rs @@ -8,7 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -#[crate_id = "rustdoc#0.9"]; +#[crate_id = "rustdoc#0.10-pre"]; #[desc = "rustdoc, the Rust documentation extractor"]; #[license = "MIT/ASL2"]; #[crate_type = "dylib"]; diff --git a/src/librustpkg/lib.rs b/src/librustpkg/lib.rs index 3a5c79a62ab..5f86fa0e213 100644 --- a/src/librustpkg/lib.rs +++ b/src/librustpkg/lib.rs @@ -10,7 +10,7 @@ // rustpkg - a package manager and build system for Rust -#[crate_id = "rustpkg#0.9"]; +#[crate_id = "rustpkg#0.10-pre"]; #[license = "MIT/ASL2"]; #[crate_type = "dylib"]; diff --git a/src/librustuv/lib.rs b/src/librustuv/lib.rs index 675e852ebae..96ac975d567 100644 --- a/src/librustuv/lib.rs +++ b/src/librustuv/lib.rs @@ -34,6 +34,7 @@ via `close` and `delete` methods. */ +// NOTE: Change to 0.10-pre after snapshot #[crate_id = "rustuv#0.9"]; #[license = "MIT/ASL2"]; #[crate_type = "rlib"]; diff --git a/src/libstd/lib.rs b/src/libstd/lib.rs index 8a4d102e7be..b99de70ea07 100644 --- a/src/libstd/lib.rs +++ b/src/libstd/lib.rs @@ -43,6 +43,7 @@ //! //! use std::prelude::*; +// NOTE: Upgrade to 0.10-pre after snapshot #[crate_id = "std#0.9"]; #[comment = "The Rust standard library"]; #[license = "MIT/ASL2"]; diff --git a/src/libsyntax/lib.rs b/src/libsyntax/lib.rs index 0fd4c5c193c..7eebbc75f94 100644 --- a/src/libsyntax/lib.rs +++ b/src/libsyntax/lib.rs @@ -18,7 +18,7 @@ This API is completely unstable and subject to change. */ -#[crate_id = "syntax#0.9"]; +#[crate_id = "syntax#0.10-pre"]; #[license = "MIT/ASL2"]; #[crate_type = "dylib"]; #[crate_type = "rlib"]; diff --git a/src/test/run-make/crate-data-smoke/Makefile b/src/test/run-make/crate-data-smoke/Makefile index 35ae4accb27..09ae0998202 100644 --- a/src/test/run-make/crate-data-smoke/Makefile +++ b/src/test/run-make/crate-data-smoke/Makefile @@ -1,7 +1,7 @@ -include ../tools.mk all: - [ `$(RUSTC) --crate-id crate.rs` = "foo#0.9" ] + [ `$(RUSTC) --crate-id crate.rs` = "foo#0.10-pre" ] [ `$(RUSTC) --crate-name crate.rs` = "foo" ] [ `$(RUSTC) --crate-file-name crate.rs` = "foo" ] [ `$(RUSTC) --crate-file-name --lib --test crate.rs` = "foo" ] diff --git a/src/test/run-make/crate-data-smoke/crate.rs b/src/test/run-make/crate-data-smoke/crate.rs index 840f346a601..6fef49ac8da 100644 --- a/src/test/run-make/crate-data-smoke/crate.rs +++ b/src/test/run-make/crate-data-smoke/crate.rs @@ -1,4 +1,4 @@ -#[crate_id = "foo#0.9"]; +#[crate_id = "foo#0.10-pre"]; // Querying about the crate metadata should *not* parse the entire crate, it // only needs the crate attributes (which are guaranteed to be at the top) be