From 8896f12c8f47ad183b0e7bb0a2511cb0df2f0561 Mon Sep 17 00:00:00 2001 From: Diggory Blake Date: Sun, 10 Jun 2018 00:07:19 +0100 Subject: [PATCH 1/4] Bump version number --- CHANGELOG.md | 32 +++++++++++++++++++++++++++++ Cargo.toml | 2 +- src/rustup-dist/Cargo.toml | 2 +- src/rustup-mock/Cargo.toml | 2 +- src/rustup-utils/Cargo.toml | 2 +- src/rustup-win-installer/Cargo.toml | 2 +- 6 files changed, 37 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 131733f16a..634d80376a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,35 @@ +# 1.12.0 + +* [Update Visual C++ Build Tools URL][pr1428] +* [Fix download indicator on OSes with newer ncurses package][pr1422] +* [Remove components if they don't exist anymore during update][pr1419] +* [Make sure rustup uses `utils::rename*` consistently][pr1389] +* [Do not try to get CWD if not required][pr1379] +* [Give correct error message if user tries to install an unavailable toolchain][pr1380] +* [Fall back to wget if curl is not installed][pr1373] +* [Added a link to all installers to the homepage][pr1370] +* [Display helpful advice even with -y][pr1290] +* [Use browser in BROWSER env if present for `doc` command][pr1289] +* [Update shebang to reflect bashisms][pr1269] + +[pr1428]: https://github.com/rust-lang-nursery/rustup.rs/pull/1428 +[pr1422]: https://github.com/rust-lang-nursery/rustup.rs/pull/1422 +[pr1419]: https://github.com/rust-lang-nursery/rustup.rs/pull/1419 +[pr1389]: https://github.com/rust-lang-nursery/rustup.rs/pull/1389 +[pr1379]: https://github.com/rust-lang-nursery/rustup.rs/pull/1379 +[pr1380]: https://github.com/rust-lang-nursery/rustup.rs/pull/1380 +[pr1373]: https://github.com/rust-lang-nursery/rustup.rs/pull/1373 +[pr1370]: https://github.com/rust-lang-nursery/rustup.rs/pull/1370 +[pr1290]: https://github.com/rust-lang-nursery/rustup.rs/pull/1290 +[pr1289]: https://github.com/rust-lang-nursery/rustup.rs/pull/1289 +[pr1269]: https://github.com/rust-lang-nursery/rustup.rs/pull/1269 + +Contributors: Andrew Pennebaker, Who? Me?!, Matteo Bertini, mog422, +Kasper Møller Andersen, Thibault Delor, Justin Worthe, TitanSnow, +aimileus, Antonio Murdaca, Cyryl Płotnicki, Nick Cameron, Alex Crichton, +Kornel, Stuart Dootson, Pietro Albini, Diggory Blake, Yuji Nakao, +Johannes Hofmann + # 1.11.0 * [windows: detect architecture on website, update to matching arch][pr1354] diff --git a/Cargo.toml b/Cargo.toml index da36b9fec2..8aed5e86d2 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "rustup" -version = "1.11.0" +version = "1.12.0" authors = [ "Diggory Blake " ] description = "Manage multiple rust installations with ease" diff --git a/src/rustup-dist/Cargo.toml b/src/rustup-dist/Cargo.toml index dd6299be87..b072ce2892 100644 --- a/src/rustup-dist/Cargo.toml +++ b/src/rustup-dist/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "rustup-dist" -version = "1.11.0" +version = "1.12.0" authors = [ "Diggory Blake " ] description = "Installation from a Rust distribution server" build = "build.rs" diff --git a/src/rustup-mock/Cargo.toml b/src/rustup-mock/Cargo.toml index 9b1208dab7..236801dbc3 100644 --- a/src/rustup-mock/Cargo.toml +++ b/src/rustup-mock/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "rustup-mock" -version = "1.11.0" +version = "1.12.0" authors = [ "Diggory Blake " ] description = "Test mocks for rustup" diff --git a/src/rustup-utils/Cargo.toml b/src/rustup-utils/Cargo.toml index 51fc32834f..f409caee92 100644 --- a/src/rustup-utils/Cargo.toml +++ b/src/rustup-utils/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "rustup-utils" -version = "1.11.0" +version = "1.12.0" authors = [ "Diggory Blake " ] description = "Utility functions for rustup" diff --git a/src/rustup-win-installer/Cargo.toml b/src/rustup-win-installer/Cargo.toml index 9ae1c1581a..3b763957d8 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 = "1.11.0" +version = "1.12.0" authors = ["Patrick Reisert"] build = "build.rs" From 7fd823aef7799c4c896e6b6ea40ec9459d97f806 Mon Sep 17 00:00:00 2001 From: Diggory Blake Date: Sun, 10 Jun 2018 00:10:12 +0100 Subject: [PATCH 2/4] Add PR --- CHANGELOG.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 634d80376a..bbf068808c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,6 @@ # 1.12.0 +* [Add "rustup doc --reference"][pr1430] * [Update Visual C++ Build Tools URL][pr1428] * [Fix download indicator on OSes with newer ncurses package][pr1422] * [Remove components if they don't exist anymore during update][pr1419] @@ -12,6 +13,7 @@ * [Use browser in BROWSER env if present for `doc` command][pr1289] * [Update shebang to reflect bashisms][pr1269] +[pr1430]: https://github.com/rust-lang-nursery/rustup.rs/pull/1430 [pr1428]: https://github.com/rust-lang-nursery/rustup.rs/pull/1428 [pr1422]: https://github.com/rust-lang-nursery/rustup.rs/pull/1422 [pr1419]: https://github.com/rust-lang-nursery/rustup.rs/pull/1419 @@ -28,7 +30,7 @@ Contributors: Andrew Pennebaker, Who? Me?!, Matteo Bertini, mog422, Kasper Møller Andersen, Thibault Delor, Justin Worthe, TitanSnow, aimileus, Antonio Murdaca, Cyryl Płotnicki, Nick Cameron, Alex Crichton, Kornel, Stuart Dootson, Pietro Albini, Diggory Blake, Yuji Nakao, -Johannes Hofmann +Johannes Hofmann, CrLF0710 # 1.11.0 From 1086892efdf61a828aa319229fb772dc9251b01f Mon Sep 17 00:00:00 2001 From: Diggory Blake Date: Sat, 16 Jun 2018 12:53:51 +0100 Subject: [PATCH 3/4] Add PR --- CHANGELOG.md | 4 +++- Cargo.lock | 22 +++++++++++----------- 2 files changed, 14 insertions(+), 12 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index bbf068808c..d43e7f6695 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,6 @@ # 1.12.0 +* [Add caret after first installation question][pr1435] * [Add "rustup doc --reference"][pr1430] * [Update Visual C++ Build Tools URL][pr1428] * [Fix download indicator on OSes with newer ncurses package][pr1422] @@ -13,6 +14,7 @@ * [Use browser in BROWSER env if present for `doc` command][pr1289] * [Update shebang to reflect bashisms][pr1269] +[pr1435]: https://github.com/rust-lang-nursery/rustup.rs/pull/1435 [pr1430]: https://github.com/rust-lang-nursery/rustup.rs/pull/1430 [pr1428]: https://github.com/rust-lang-nursery/rustup.rs/pull/1428 [pr1422]: https://github.com/rust-lang-nursery/rustup.rs/pull/1422 @@ -30,7 +32,7 @@ Contributors: Andrew Pennebaker, Who? Me?!, Matteo Bertini, mog422, Kasper Møller Andersen, Thibault Delor, Justin Worthe, TitanSnow, aimileus, Antonio Murdaca, Cyryl Płotnicki, Nick Cameron, Alex Crichton, Kornel, Stuart Dootson, Pietro Albini, Diggory Blake, Yuji Nakao, -Johannes Hofmann, CrLF0710 +Johannes Hofmann, CrLF0710, Aaron Lee # 1.11.0 diff --git a/Cargo.lock b/Cargo.lock index 371e1c77b8..a49824f1ca 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -815,7 +815,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "rustup" -version = "1.11.0" +version = "1.12.0" dependencies = [ "clap 2.30.0 (registry+https://github.com/rust-lang/crates.io-index)", "download 0.4.0", @@ -828,9 +828,9 @@ dependencies = [ "rand 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", "regex 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", "remove_dir_all 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rustup-dist 1.11.0", - "rustup-mock 1.11.0", - "rustup-utils 1.11.0", + "rustup-dist 1.12.0", + "rustup-mock 1.12.0", + "rustup-utils 1.12.0", "same-file 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", "scopeguard 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.27 (registry+https://github.com/rust-lang/crates.io-index)", @@ -850,7 +850,7 @@ dependencies = [ [[package]] name = "rustup-dist" -version = "1.11.0" +version = "1.12.0" dependencies = [ "error-chain 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", "flate2 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -859,8 +859,8 @@ dependencies = [ "ole32-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "regex 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", "remove_dir_all 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rustup-mock 1.11.0", - "rustup-utils 1.11.0", + "rustup-mock 1.12.0", + "rustup-utils 1.12.0", "sha2 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", "tar 0.4.14 (registry+https://github.com/rust-lang/crates.io-index)", "tempdir 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", @@ -874,7 +874,7 @@ dependencies = [ [[package]] name = "rustup-mock" -version = "1.11.0" +version = "1.12.0" dependencies = [ "flate2 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -892,7 +892,7 @@ dependencies = [ [[package]] name = "rustup-utils" -version = "1.11.0" +version = "1.12.0" dependencies = [ "download 0.4.0", "error-chain 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -910,10 +910,10 @@ dependencies = [ [[package]] name = "rustup-win-installer" -version = "1.11.0" +version = "1.12.0" dependencies = [ "gcc 0.3.54 (registry+https://github.com/rust-lang/crates.io-index)", - "rustup 1.11.0", + "rustup 1.12.0", "winapi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", ] From 4bbd51ebb7a2fe85d6fbe0f57c0110b616032ad6 Mon Sep 17 00:00:00 2001 From: Diggory Blake Date: Sat, 7 Jul 2018 15:23:32 +0100 Subject: [PATCH 4/4] Add new PRs --- CHANGELOG.md | 9 ++++++++- Cargo.lock | 22 +++++++++++----------- 2 files changed, 19 insertions(+), 12 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d43e7f6695..9e44c2b51f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,8 @@ # 1.12.0 +* [Add --path flag to 'rustup doc'][pr1453] +* [Add flag to "rustup show" for active-toolchain][pr1449] +* [Bring rustup.js and markup into alignment with rust-www][pr1437] * [Add caret after first installation question][pr1435] * [Add "rustup doc --reference"][pr1430] * [Update Visual C++ Build Tools URL][pr1428] @@ -14,6 +17,9 @@ * [Use browser in BROWSER env if present for `doc` command][pr1289] * [Update shebang to reflect bashisms][pr1269] +[pr1453]: https://github.com/rust-lang-nursery/rustup.rs/pull/1453 +[pr1449]: https://github.com/rust-lang-nursery/rustup.rs/pull/1449 +[pr1437]: https://github.com/rust-lang-nursery/rustup.rs/pull/1437 [pr1435]: https://github.com/rust-lang-nursery/rustup.rs/pull/1435 [pr1430]: https://github.com/rust-lang-nursery/rustup.rs/pull/1430 [pr1428]: https://github.com/rust-lang-nursery/rustup.rs/pull/1428 @@ -32,7 +38,8 @@ Contributors: Andrew Pennebaker, Who? Me?!, Matteo Bertini, mog422, Kasper Møller Andersen, Thibault Delor, Justin Worthe, TitanSnow, aimileus, Antonio Murdaca, Cyryl Płotnicki, Nick Cameron, Alex Crichton, Kornel, Stuart Dootson, Pietro Albini, Diggory Blake, Yuji Nakao, -Johannes Hofmann, CrLF0710, Aaron Lee +Johannes Hofmann, CrLF0710, Aaron Lee, Brian Anderson, Mateusz Mikuła, +Segev Finer, Dan Aloni, Joeri van Ruth # 1.11.0 diff --git a/Cargo.lock b/Cargo.lock index 3bd10beb27..257e5f8efb 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -910,7 +910,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "rustup" -version = "1.11.0" +version = "1.12.0" dependencies = [ "clap 2.32.0 (registry+https://github.com/rust-lang/crates.io-index)", "download 0.4.0", @@ -923,9 +923,9 @@ dependencies = [ "rand 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", "regex 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", "remove_dir_all 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", - "rustup-dist 1.11.0", - "rustup-mock 1.11.0", - "rustup-utils 1.11.0", + "rustup-dist 1.12.0", + "rustup-mock 1.12.0", + "rustup-utils 1.12.0", "same-file 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", "scopeguard 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.69 (registry+https://github.com/rust-lang/crates.io-index)", @@ -945,7 +945,7 @@ dependencies = [ [[package]] name = "rustup-dist" -version = "1.11.0" +version = "1.12.0" dependencies = [ "error-chain 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)", "flate2 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -954,8 +954,8 @@ dependencies = [ "ole32-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "regex 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", "remove_dir_all 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", - "rustup-mock 1.11.0", - "rustup-utils 1.11.0", + "rustup-mock 1.12.0", + "rustup-utils 1.12.0", "sha2 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", "tar 0.4.16 (registry+https://github.com/rust-lang/crates.io-index)", "tempdir 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", @@ -969,7 +969,7 @@ dependencies = [ [[package]] name = "rustup-mock" -version = "1.11.0" +version = "1.12.0" dependencies = [ "flate2 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -987,7 +987,7 @@ dependencies = [ [[package]] name = "rustup-utils" -version = "1.11.0" +version = "1.12.0" dependencies = [ "download 0.4.0", "error-chain 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1005,10 +1005,10 @@ dependencies = [ [[package]] name = "rustup-win-installer" -version = "1.11.0" +version = "1.12.0" dependencies = [ "gcc 0.3.54 (registry+https://github.com/rust-lang/crates.io-index)", - "rustup 1.11.0", + "rustup 1.12.0", "winapi 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", ]