Skip to content

Bump version to 0.10-pre #11442

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Makefile.in
Original file line number Diff line number Diff line change
Expand Up @@ -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"\ ")
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.9" kateversion="2.4" section="Sources" extensions="*.rs;*.rc" mimetype="text/x-rust" priority="15">
<language name="Rust" version="0.10-pre" kateversion="2.4" section="Sources" extensions="*.rs;*.rc" mimetype="text/x-rust" priority="15">
<highlighting>
<list name="fn">
<item> fn </item>
Expand Down
2 changes: 1 addition & 1 deletion src/libextra/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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"];
Expand Down
1 change: 1 addition & 0 deletions src/libgreen/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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"];
Expand Down
2 changes: 1 addition & 1 deletion src/libnative/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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"];
Expand Down
11 changes: 3 additions & 8 deletions src/librustc/front/std_inject.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down Expand Up @@ -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,
Expand All @@ -70,17 +67,15 @@ 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,
span: DUMMY_SP
});
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,
Expand Down
4 changes: 1 addition & 3 deletions src/librustc/front/test.rs
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@

use driver::session;
use front::config;
use front::std_inject::VERSION;

use std::cell::RefCell;
use std::vec;
Expand Down Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion src/librustc/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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"];
Expand Down
2 changes: 1 addition & 1 deletion src/librustdoc/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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"];
Expand Down
2 changes: 1 addition & 1 deletion src/librustpkg/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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"];

Expand Down
1 change: 1 addition & 0 deletions src/librustuv/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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"];
Expand Down
1 change: 1 addition & 0 deletions src/libstd/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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"];
Expand Down
2 changes: 1 addition & 1 deletion src/libsyntax/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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"];
Expand Down
2 changes: 1 addition & 1 deletion src/test/run-make/crate-data-smoke/Makefile
Original file line number Diff line number Diff line change
@@ -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" ]
Expand Down
2 changes: 1 addition & 1 deletion src/test/run-make/crate-data-smoke/crate.rs
Original file line number Diff line number Diff line change
@@ -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
Expand Down