Merge pull request #611 from brson/next

Bump version
rust-lang · Jul 22, 2016 · 3171903 · 3171903
2 parents ff82309 + dcd0671
commit 3171903
Show file tree

Hide file tree

Showing 6 changed files with 39 additions and 20 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,22 @@
+# 0.4.0
+
+* [Improve rustls CA certificate loading](https://github.com/rust-lang-nursery/rustup.rs/pull/585)
+* [Detect ARMv7 CPUs without NEON extensions and treat as ARMv6](https://github.com/rust-lang-nursery/rustup.rs/pull/593)
+* [Allow any toolchain to be specified as the default during rustup installation](https://github.com/rust-lang-nursery/rustup.rs/pull/586)
+* [Add details about updating rustup to README](https://github.com/rust-lang-nursery/rustup.rs/pull/590)
+* [Update libbacktrace to generate less filesystem thrashing on Windows](https://github.com/rust-lang-nursery/rustup.rs/pull/604)
+* [Update gcc dep to fix building on MSVC](https://github.com/rust-lang-nursery/rustup.rs/pull/605)
+* [Remove the multirust binary](https://github.com/rust-lang-nursery/rustup.rs/pull/606)
+* [Use the env_proxy crate for proxy environment variable handling](https://github.com/rust-lang-nursery/rustup.rs/pull/598)
+* [Set system-specific dynamic loader env var for command execution](https://github.com/rust-lang-nursery/rustup.rs/pull/600)
+* [Hide telemetry command from top level help](https://github.com/rust-lang-nursery/rustup.rs/pull/601)
+* [Add the "no-self-update" feature](https://github.com/rust-lang-nursery/rustup.rs/pull/602)
+* [Update to error-chain 0.2.2](https://github.com/rust-lang-nursery/rustup.rs/pull/602)
+* [Add HTTP proxy documentation to README](https://github.com/rust-lang-nursery/rustup.rs/pull/610)
+
+Contributors: Alex Crichton, Brian Anderson, Ivan Nejgebauer, Jimmy
+Cuadra, Martin Pool, Wesley Moore
+
 # 0.3.0
 
 * [Teach rustup to download manifests from the `/staging/` directory](https://github.com/rust-lang-nursery/rustup.rs/pull/579).

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 
 name = "rustup"
-version = "0.3.0"
+version = "0.4.0"
 authors = [ "Diggory Blake <diggsey@googlemail.com>" ]
 description = "multirust in rust - manage multiple rust installations with ease"
 
@@ -29,8 +29,8 @@ rustls-backend = ["download/rustls-backend"]
 no-self-update = []
 
 [dependencies]
-rustup-dist = { path = "src/rustup-dist", version = "0.3.0" }
-rustup-utils = { path = "src/rustup-utils", version = "0.3.0" }
+rustup-dist = { path = "src/rustup-dist", version = "0.4.0" }
+rustup-utils = { path = "src/rustup-utils", version = "0.4.0" }
 download = { path = "src/download" }
 error-chain = "0.2.1"
 clap = "2.2.4"
@@ -55,7 +55,7 @@ user32-sys = "0.1.2"
 kernel32-sys = "0.2.1"
 
 [dev-dependencies]
-rustup-mock = { path = "src/rustup-mock", version = "0.3.0" }
+rustup-mock = { path = "src/rustup-mock", version = "0.4.0" }
 lazy_static = "0.1.15"
 
 [lib]

diff --git a/src/rustup-dist/Cargo.toml b/src/rustup-dist/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 
 name = "rustup-dist"
-version = "0.3.0"
+version = "0.4.0"
 authors = [ "Diggory Blake <diggsey@googlemail.com>" ]
 description = "Installation from a Rust distribution server"
 build = "build.rs"
@@ -23,9 +23,9 @@ tempdir = "0.3.4"
 walkdir = "0.1.5"
 toml = "0.1.27"
 sha2 = "0.1.2"
-rustup-utils = { path = "../rustup-utils", version = "0.3.0" }
+rustup-utils = { path = "../rustup-utils", version = "0.4.0" }
 error-chain = "0.2.1"
-rustup-mock = { path = "../rustup-mock", version = "0.3.0" }
+rustup-mock = { path = "../rustup-mock", version = "0.4.0" }
 
 [target."cfg(windows)".dependencies]
 winapi = "0.2.8"

diff --git a/src/rustup-mock/Cargo.toml b/src/rustup-mock/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 
 name = "rustup-mock"
-version = "0.3.0"
+version = "0.4.0"
 authors = [ "Diggory Blake <diggsey@googlemail.com>" ]
 description = "Test mocks for multirust"
 
@@ -19,7 +19,7 @@ tempdir = "0.3.4"
 itertools = "0.4.1"
 tar = "0.4.0"
 toml = "0.1.27"
-rustup-utils = { path = "../rustup-utils", version = "0.3.0" }
+rustup-utils = { path = "../rustup-utils", version = "0.4.0" }
 sha2 = "0.1.2"
 
 [target."cfg(windows)".dependencies]

diff --git a/src/rustup-utils/Cargo.toml b/src/rustup-utils/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 
 name = "rustup-utils"
-version = "0.3.0"
+version = "0.4.0"
 authors = [ "Diggory Blake <diggsey@googlemail.com>" ]
 description = "multirust in rust - manage multiple rust installations with ease"