From 36aca677b05251c696e4c5c7207caab64990bc97 Mon Sep 17 00:00:00 2001 From: Brian Anderson Date: Fri, 26 Aug 2016 17:07:32 -0700 Subject: [PATCH 1/3] Pin builds to nightly-2016-08-10. rust-lang/rust#36023 --- .travis.yml | 2 +- appveyor.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index af043b2846..0786101fc9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -90,7 +90,7 @@ install: - sudo pip install awscli - aws configure set preview.cloudfront true - curl https://static.rust-lang.org/rustup.sh | - sh -s -- --prefix=$HOME/rust --spec=nightly --with-target=$TARGET + sh -s -- --prefix=$HOME/rust --spec=nightly-2016-08-10 --with-target=$TARGET script: - mkdir target diff --git a/appveyor.yml b/appveyor.yml index ab36081d18..d83855edb2 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -24,7 +24,7 @@ install: - curl -sSf -o rustup-init.exe https://dev-static.rust-lang.org/rustup/dist/i686-pc-windows-gnu/rustup-init.exe - rustup-init.exe -y - set PATH=%PATH%;C:\Users\appveyor\.cargo\bin - - rustup default nightly-x86_64-pc-windows-msvc + - rustup default nightly-2016-08-10-x86_64-pc-windows-msvc # Install the target we're compiling for - if NOT "%TARGET%" == "x86_64-pc-windows-msvc" rustup target add %TARGET% From 0a762a9e09ac4c4585abbbdcead8bddcb9fa8c7a Mon Sep 17 00:00:00 2001 From: Brian Anderson Date: Fri, 26 Aug 2016 17:17:52 -0700 Subject: [PATCH 2/3] Bump version to 0.6.2 --- Cargo.lock | 61 ++++++++++++++++++----------- Cargo.toml | 8 ++-- src/rustup-dist/Cargo.toml | 6 +-- src/rustup-mock/Cargo.toml | 4 +- src/rustup-utils/Cargo.toml | 2 +- src/rustup-win-installer/Cargo.toml | 4 +- 6 files changed, 51 insertions(+), 34 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 8095375b8e..44c0de2f03 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1,8 +1,8 @@ [root] name = "rustup-win-installer" -version = "0.6.1" +version = "0.6.2" dependencies = [ - "rustup 0.6.1", + "rustup 0.6.2", "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -87,14 +87,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "clap" -version = "2.10.2" +version = "2.10.4" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "ansi_term 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", "bitflags 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)", - "strsim 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", + "strsim 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", "term_size 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "unicode-segmentation 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "unicode-width 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", "vec_map 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -541,9 +542,9 @@ dependencies = [ [[package]] name = "rustup" -version = "0.6.1" +version = "0.6.2" dependencies = [ - "clap 2.10.2 (registry+https://github.com/rust-lang/crates.io-index)", + "clap 2.10.4 (registry+https://github.com/rust-lang/crates.io-index)", "download 0.3.0", "error-chain 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", "itertools 0.4.18 (registry+https://github.com/rust-lang/crates.io-index)", @@ -554,9 +555,9 @@ dependencies = [ "rand 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)", "regex 0.1.73 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)", - "rustup-dist 0.6.1", - "rustup-mock 0.6.1", - "rustup-utils 0.6.1", + "rustup-dist 0.6.2", + "rustup-mock 0.6.2", + "rustup-utils 0.6.2", "scopeguard 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "sha2 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "tempdir 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", @@ -572,7 +573,7 @@ dependencies = [ [[package]] name = "rustup-dist" -version = "0.6.1" +version = "0.6.2" dependencies = [ "error-chain 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", "flate2 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)", @@ -582,10 +583,10 @@ dependencies = [ "libc 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)", "ole32-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "regex 0.1.73 (registry+https://github.com/rust-lang/crates.io-index)", - "rustup-mock 0.6.1", - "rustup-utils 0.6.1", + "rustup-mock 0.6.2", + "rustup-utils 0.6.2", "sha2 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", - "tar 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", + "tar 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "tempdir 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", "toml 0.1.30 (registry+https://github.com/rust-lang/crates.io-index)", "url 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -597,15 +598,15 @@ dependencies = [ [[package]] name = "rustup-mock" -version = "0.6.1" +version = "0.6.2" dependencies = [ "flate2 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)", "itertools 0.4.18 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)", - "rustup-utils 0.6.1", + "rustup-utils 0.6.2", "scopeguard 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "sha2 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", - "tar 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", + "tar 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "tempdir 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", "toml 0.1.30 (registry+https://github.com/rust-lang/crates.io-index)", "url 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -617,7 +618,7 @@ dependencies = [ [[package]] name = "rustup-utils" -version = "0.6.1" +version = "0.6.2" dependencies = [ "advapi32-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "download 0.3.0", @@ -735,16 +736,17 @@ dependencies = [ [[package]] name = "strsim" -version = "0.4.1" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "tar" -version = "0.4.6" +version = "0.4.8" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "filetime 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)", + "xattr 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -850,6 +852,11 @@ name = "unicode-normalization" version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" +[[package]] +name = "unicode-segmentation" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" + [[package]] name = "unicode-width" version = "0.1.3" @@ -956,6 +963,14 @@ dependencies = [ "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", ] +[[package]] +name = "xattr" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "libc 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)", +] + [metadata] "checksum advapi32-sys 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "307c92332867e586720c0222ee9d890bbe8431711efed8a1b06bc5b40fc66bd7" "checksum advapi32-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e06588080cb19d0acb6739808aafa5f26bfb2ca015b2b6370028b44cf7cb8a9a" @@ -966,7 +981,7 @@ dependencies = [ "checksum base64 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3ce110e5c96df1817009271c910626fa4b79c2f178d70f9857d768c3886ba6a0" "checksum bitflags 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "aad18937a628ec6abcd26d1489012cc0e18c21798210f491af69ded9b881106d" "checksum cfg-if 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "de1e760d7b6535af4241fca8bd8adf68e2e7edacc6b29f5d399050c5e48cf88c" -"checksum clap 2.10.2 (registry+https://github.com/rust-lang/crates.io-index)" = "374838ae35860add8e78a7ac769bebe3d53b0ae1031c11a3246742752c6f3a66" +"checksum clap 2.10.4 (registry+https://github.com/rust-lang/crates.io-index)" = "3df6dcb3122b085b96399062f4fa59d69f4d0af50519944f2d76b7a7686629e3" "checksum cookie 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)" = "0e3d6405328b6edb412158b3b7710e2634e23f3614b9bb1c412df7952489a626" "checksum core-foundation 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "20a6d0448d3a99d977ae4a2aa5a98d886a923e863e81ad9ff814645b6feb3bbd" "checksum core-foundation-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "05eed248dc504a5391c63794fe4fb64f46f071280afaa1b73308f3c0ce4574c5" @@ -1029,8 +1044,8 @@ dependencies = [ "checksum sha2 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "e0cd9505afe45df2b8bdda585776281c7b29eb9d0e34b1e6dd2b12cba5d4ae1e" "checksum shell32-sys 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "72f20b8f3c060374edb8046591ba28f62448c369ccbdc7b02075103fb3a9e38d" "checksum solicit 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)" = "172382bac9424588d7840732b250faeeef88942e37b6e35317dce98cafdd75b2" -"checksum strsim 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)" = "0d5f575d5ced6634a5c4cb842163dab907dc7e9148b28dc482d81b8855cbe985" -"checksum tar 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "59a5014d9493d6c2799dff5da5d780c2f159bf368c54f115dbc421d02f1d5496" +"checksum strsim 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "50c069df92e4b01425a8bf3576d5d417943a6a7272fbabaf5bd80b1aaa76442e" +"checksum tar 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)" = "12e1b959f637c2e4c69dbdbf4d7dc609edbaada9b8c35d0c2fc9802d02383b65" "checksum tempdir 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "0b62933a3f96cd559700662c34f8bab881d9e3540289fb4f368419c7f13a5aa9" "checksum tempfile 2.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "9270837a93bad1b1dac18fe67e786b3c960513af86231f6f4f57fddd594ff0c8" "checksum term 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)" = "3deff8a2b3b6607d6d7cc32ac25c0b33709453ca9cceac006caac51e963cf94a" @@ -1044,6 +1059,7 @@ dependencies = [ "checksum unicase 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "13a5906ca2b98c799f4b1ab4557b76367ebd6ae5ef14930ec841c74aed5f3764" "checksum unicode-bidi 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "c1f7ceb96afdfeedee42bade65a0d585a6a0106f681b6749c8ff4daa8df30b3f" "checksum unicode-normalization 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "26643a2f83bac55f1976fb716c10234485f9202dcd65cfbdf9da49867b271172" +"checksum unicode-segmentation 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "b905d0fc2a1f0befd86b0e72e31d1787944efef9d38b9358a9e92a69757f7e3b" "checksum unicode-width 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "2d6722facc10989f63ee0e20a83cd4e1714a9ae11529403ac7e0afd069abc39e" "checksum untrusted 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7db5c188172b56840e937612d81bc6859c52f2fb2898d6cba443fb64b5160abd" "checksum url 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "8ab4ca6f0107350f41a59a51cb0e71a04d905bc6a29181d2cb42fa4f040c65c9" @@ -1058,3 +1074,4 @@ dependencies = [ "checksum winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a" "checksum winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "2d315eee3b34aca4797b2da6b13ed88266e6d612562a0c46390af8299fc699bc" "checksum winreg 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)" = "e63857fb213f619b4c4fff86b158285c76766aac7e7474967e92fb6dbbfeefe9" +"checksum xattr 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)" = "06d6f0e8fd6536f3c623afab15488d87cf3a5dbb907361a22c05d739881136d7" diff --git a/Cargo.toml b/Cargo.toml index 72aae3e1b3..9331ae0cb4 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "rustup" -version = "0.6.1" +version = "0.6.2" authors = [ "Diggory Blake " ] description = "multirust in rust - manage multiple rust installations with ease" @@ -32,8 +32,8 @@ no-self-update = [] msi-installed = [] [dependencies] -rustup-dist = { path = "src/rustup-dist", version = "0.6.1" } -rustup-utils = { path = "src/rustup-utils", version = "0.6.1" } +rustup-dist = { path = "src/rustup-dist", version = "0.6.2" } +rustup-utils = { path = "src/rustup-utils", version = "0.6.2" } download = { path = "src/download" } error-chain = "0.4.0" clap = "2.2.4" @@ -59,7 +59,7 @@ user32-sys = "0.1.2" kernel32-sys = "0.2.1" [dev-dependencies] -rustup-mock = { path = "src/rustup-mock", version = "0.6.1" } +rustup-mock = { path = "src/rustup-mock", version = "0.6.2" } lazy_static = "0.1.15" [workspace] diff --git a/src/rustup-dist/Cargo.toml b/src/rustup-dist/Cargo.toml index ddf6ea9148..bee59fa4e9 100644 --- a/src/rustup-dist/Cargo.toml +++ b/src/rustup-dist/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "rustup-dist" -version = "0.6.1" +version = "0.6.2" authors = [ "Diggory Blake " ] 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.6.1" } +rustup-utils = { path = "../rustup-utils", version = "0.6.2" } error-chain = "0.4.0" -rustup-mock = { path = "../rustup-mock", version = "0.6.1" } +rustup-mock = { path = "../rustup-mock", version = "0.6.2" } [target."cfg(windows)".dependencies] winapi = "0.2.8" diff --git a/src/rustup-mock/Cargo.toml b/src/rustup-mock/Cargo.toml index e34a299ba2..e090487687 100644 --- a/src/rustup-mock/Cargo.toml +++ b/src/rustup-mock/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "rustup-mock" -version = "0.6.1" +version = "0.6.2" authors = [ "Diggory Blake " ] 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.6.1" } +rustup-utils = { path = "../rustup-utils", version = "0.6.2" } sha2 = "0.1.2" wait-timeout = "0.1.3" diff --git a/src/rustup-utils/Cargo.toml b/src/rustup-utils/Cargo.toml index 99b2653427..2ce09a76d2 100644 --- a/src/rustup-utils/Cargo.toml +++ b/src/rustup-utils/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "rustup-utils" -version = "0.6.1" +version = "0.6.2" authors = [ "Diggory Blake " ] description = "multirust in rust - manage multiple rust installations with ease" diff --git a/src/rustup-win-installer/Cargo.toml b/src/rustup-win-installer/Cargo.toml index 31e1ee40e6..f794499846 100644 --- a/src/rustup-win-installer/Cargo.toml +++ b/src/rustup-win-installer/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "rustup-win-installer" -version = "0.6.1" +version = "0.6.2" authors = ["Patrick Reisert"] build = "build.rs" @@ -10,4 +10,4 @@ crate-type = ["cdylib"] [dependencies] winapi = "0.2" -rustup = { path = "../../", version = "0.6.1" } +rustup = { path = "../../", version = "0.6.2" } From bef88792dac288a9b118c3e0f1e15585b74b2345 Mon Sep 17 00:00:00 2001 From: Brian Anderson Date: Fri, 26 Aug 2016 17:20:23 -0700 Subject: [PATCH 3/3] Add changelog for 0.6.2 --- CHANGELOG.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 768038b1eb..506536dffb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,10 @@ +# 0.6.2 + +* [Add basic autocompletion for Zsh](https://github.com/rust-lang-nursery/rustup.rs/pull/689) +* [Sort toolchains by semantic version](https://github.com/rust-lang-nursery/rustup.rs/pull/688) + +Contributors: Brian Anderson, Diggory Blake, Knight, Marco A L Barbosa + # 0.6.1 * [Fix mysterious crash on OS X 10.10+](https://github.com/rust-lang-nursery/rustup.rs/pull/684)