Skip to content

Commit

Permalink
Merge pull request #458 from brson/bump
Browse files Browse the repository at this point in the history
Bump
  • Loading branch information
brson committed May 13, 2016
2 parents 2ea2a30 + dc7d247 commit c6e430a
Show file tree
Hide file tree
Showing 7 changed files with 45 additions and 41 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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).
Expand Down
54 changes: 27 additions & 27 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 5 additions & 5 deletions Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[package]

name = "rustup"
version = "0.1.11"
version = "0.1.12"
authors = [ "Diggory Blake <[email protected]>" ]
description = "multirust in rust - manage multiple rust installations with ease"

Expand All @@ -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"
Expand All @@ -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]
Expand Down
2 changes: 1 addition & 1 deletion src/error-chain/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[package]

name = "error-chain"
version = "0.1.11"
version = "0.1.12"
authors = [ "Brian Anderson <[email protected]>",
"Paul Colomiets <[email protected]>",
"Colin Kiegel <[email protected]>"]
Expand Down
8 changes: 4 additions & 4 deletions src/rustup-dist/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[package]

name = "rustup-dist"
version = "0.1.11"
version = "0.1.12"
authors = [ "Diggory Blake <[email protected]>" ]
description = "Installation from a Rust distribution server"
build = "build.rs"
Expand All @@ -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"
4 changes: 2 additions & 2 deletions src/rustup-mock/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[package]

name = "rustup-mock"
version = "0.1.11"
version = "0.1.12"
authors = [ "Diggory Blake <[email protected]>" ]
description = "Test mocks for multirust"

Expand All @@ -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]
Expand Down
4 changes: 2 additions & 2 deletions src/rustup-utils/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[package]

name = "rustup-utils"
version = "0.1.11"
version = "0.1.12"
authors = [ "Diggory Blake <[email protected]>" ]
description = "multirust in rust - manage multiple rust installations with ease"

Expand All @@ -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"
Expand Down

0 comments on commit c6e430a

Please sign in to comment.