Merge pull request #458 from brson/bump

Bump
rust-lang · May 13, 2016 · c6e430a · c6e430a
2 parents 2ea2a30 + dc7d247
commit c6e430a
Show file tree

Hide file tree

Showing 7 changed files with 45 additions and 41 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+# 0.1.12
+
+* [Don't install when multirust metadata exists](https://github.com/rust-lang-nursery/rustup.rs/pull/456).
+
 # 0.1.11
 
 * [Actually dispatch the `rustup install` command](https://github.com/rust-lang-nursery/rustup.rs/pull/444).

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.1.11"
+version = "0.1.12"
 authors = [ "Diggory Blake <diggsey@googlemail.com>" ]
 description = "multirust in rust - manage multiple rust installations with ease"
 
@@ -18,9 +18,9 @@ license = "MIT OR Apache-2.0"
 build = "build.rs"
 
 [dependencies]
-rustup-dist = { path = "src/rustup-dist", version = "0.1.11" }
-rustup-utils = { path = "src/rustup-utils", version = "0.1.11" }
-error-chain = { path = "src/error-chain", version = "0.1.11" }
+rustup-dist = { path = "src/rustup-dist", version = "0.1.12" }
+rustup-utils = { path = "src/rustup-utils", version = "0.1.12" }
+error-chain = { path = "src/error-chain", version = "0.1.12" }
 clap = "2.2.4"
 regex = "0.1.41"
 url = "1.1.0"
@@ -42,7 +42,7 @@ user32-sys = "0.1.2"
 kernel32-sys = "0.2.1"
 
 [dev-dependencies]
-rustup-mock = { path = "src/rustup-mock", version = "0.1.11" }
+rustup-mock = { path = "src/rustup-mock", version = "0.1.12" }
 lazy_static = "0.1.15"
 
 [lib]

diff --git a/src/error-chain/Cargo.toml b/src/error-chain/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 
 name = "error-chain"
-version = "0.1.11"
+version = "0.1.12"
 authors = [ "Brian Anderson <banderson@mozilla.com>",
             "Paul Colomiets <paul@colomiets.name>",
             "Colin Kiegel <kiegel@gmx.de>"]

diff --git a/src/rustup-dist/Cargo.toml b/src/rustup-dist/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 
 name = "rustup-dist"
-version = "0.1.11"
+version = "0.1.12"
 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.1.11" }
-error-chain = { path = "../error-chain", version = "0.1.11" }
-rustup-mock = { path = "../rustup-mock", version = "0.1.11" }
+rustup-utils = { path = "../rustup-utils", version = "0.1.12" }
+error-chain = { path = "../error-chain", version = "0.1.12" }
+rustup-mock = { path = "../rustup-mock", version = "0.1.12" }
 
 [lib]
 name = "rustup_dist"
diff --git a/src/rustup-mock/Cargo.toml b/src/rustup-mock/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 
 name = "rustup-mock"
-version = "0.1.11"
+version = "0.1.12"
 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.1.11" }
+rustup-utils = { path = "../rustup-utils", version = "0.1.12" }
 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.1.11"
+version = "0.1.12"
 authors = [ "Diggory Blake <diggsey@googlemail.com>" ]
 description = "multirust in rust - manage multiple rust installations with ease"
 
@@ -14,7 +14,7 @@ license = "MIT OR Apache-2.0"
 [dependencies]
 rand = "0.3.11"
 scopeguard = "0.1.2"
-error-chain = { path = "../error-chain", version = "0.1.11" }
+error-chain = { path = "../error-chain", version = "0.1.12" }
 libc = "0.2.0"
 rustc-serialize = "0.3.19"
 sha2 = "0.1.2"