Merge branch 'master' into db-show-manifest-version

Author: Diggsey

.travis.yml

@@ -91,6 +91,10 @@ matrix:
       env: TARGET=i686-linux-android
            DOCKER=android
            SKIP_TESTS=1
+    - os: linux
+      env: TARGET=x86_64-linux-android
+           DOCKER=android
+           SKIP_TESTS=1
 
     # On OSX we want to target 10.7 so we ensure that the appropriate
     # environment variable is set to tell the linker what we want.
@@ -122,7 +126,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-2016-11-06 --with-target=$TARGET
+    sh -s -- --prefix=$HOME/rust --spec=nightly-2017-04-25 --with-target=$TARGET
 
 script:
   - mkdir -p target/$TARGET

CHANGELOG.md

@@ -1,3 +1,18 @@
+# 1.3.0
+
+* [Add armv8l support](https://github.com/rust-lang-nursery/rustup.rs/pull/1055)
+* [Update curl crate](https://github.com/rust-lang-nursery/rustup.rs/pull/1101)
+* [Fix inadvertent dependency on bash](https://github.com/rust-lang-nursery/rustup.rs/pull/1048)
+* [Update openssl-probe to 0.1.1](https://github.com/rust-lang-nursery/rustup.rs/pull/1061)
+* [zsh completions cleanup](https://github.com/rust-lang-nursery/rustup.rs/pull/1068)
+* [Alias 'rustup toolchain uninstall' to 'rustup uninstall'](https://github.com/rust-lang-nursery/rustup.rs/pull/1073)
+* [Fix a typo in PowerShell completion script help](https://github.com/rust-lang-nursery/rustup.rs/pull/1076)
+* [Enforce timeouts for reading rustc version](https://github.com/rust-lang-nursery/rustup.rs/pull/1071)
+* [Fix OpenSSL linkage by using the final install-directory in the build](https://github.com/rust-lang-nursery/rustup.rs/pull/1065)
+
+Contributors: bors, Brian Anderson, Diggory Blake, Greg Alexander, James Elford,
+Jordan Hiltunen, Justin Noah, Kang Seonghoon, Kevin K, Marco A L Barbosa
+
 # 1.2.0
 
 * [Check ZDOTDIR when adding path to .zprofile](https://github.com/rust-lang-nursery/rustup.rs/pull/1038)

Cargo.lock

@@ -1,7 +1,7 @@
 [package]
 
 name = "rustup"
-version = "1.2.0"
+version = "1.3.0"
 authors = [ "Diggory Blake <[email protected]>" ]
 description = "multirust in rust - manage multiple rust installations with ease"
 
@@ -58,7 +58,7 @@ winapi = "0.2.8"
 winreg = "0.3.2"
 user32-sys = "0.1.2"
 kernel32-sys = "0.2.1"
-gcc = "0.3.28"
+gcc = "0.3.49"
 psapi-sys = "0.1"
 
 [dev-dependencies]

Cargo.toml

@@ -407,7 +407,7 @@ $ rustup toolchain link my-toolchain path/to/my/toolchain/sysroot
 For example, on Ubuntu you might clone `rust-lang/rust` into `~/rust`, build it, and then run:
 
 ```
-$ rustup toolchain link myrust ~/rustg/x86_64-unknown-linux-gnu/stage2/
+$ rustup toolchain link myrust ~/rust/build/x86_64-unknown-linux-gnu/stage2/
 $ rustup default myrust
 ```
 
@@ -421,22 +421,22 @@ is invoked for a custom toolchain and it is not available, `rustup`
 will attempt to use `cargo` from one of the release channels*,
 preferring 'nightly', then 'beta' or 'stable'.
 
-## Working with HTTP proxies
+## Working with network proxies
 
 Enterprise networks often don't have direct outside HTTP access, but enforce
-the use of HTTP proxies. If you're on such a network, you can request that
+the use of proxies. If you're on such a network, you can request that
 rustup uses a proxy by setting its URL in the environment. In most cases,
-setting `http_proxy` should be sufficient. On a Unix-like system with a
+setting `https_proxy` should be sufficient. On a Unix-like system with a
 shell like __bash__ or __zsh__, you could use:
 
 ```
-export http_proxy=http://proxy.example.com:8080
+export https_proxy=socks5://proxy.example.com:1080 # or http://proxy.example.com:8080
 ```
 
 On Windows, the command would be:
 
 ```
-set http_proxy=http://proxy.example.com:8080
+set https_proxy=socks5://proxy.example.com:1080
 ```
 
 If you need a more complex setup, rustup supports the convention used by
@@ -532,6 +532,7 @@ platform of your choice:
 - [i686-linux-android](https://static.rust-lang.org/rustup/dist/i686-linux-android/rustup-init)
 - [i686-unknown-linux-gnu](https://static.rust-lang.org/rustup/dist/i686-unknown-linux-gnu/rustup-init)
 - [x86_64-apple-darwin](https://static.rust-lang.org/rustup/dist/x86_64-apple-darwin/rustup-init)
+- [x86_64-linux-android](https://static.rust-lang.org/rustup/dist/x86_64-linux-android/rustup-init)
 - [x86_64-pc-windows-gnu](https://static.rust-lang.org/rustup/dist/x86_64-pc-windows-gnu/rustup-init.exe)
 - [x86_64-pc-windows-msvc](https://static.rust-lang.org/rustup/dist/x86_64-pc-windows-msvc/rustup-init.exe)<sup>[†](#vs2015)</sup>
 - [x86_64-unknown-freebsd](https://static.rust-lang.org/rustup/dist/x86_64-unknown-freebsd/rustup-init)

README.md

@@ -44,7 +44,7 @@ install:
 
   # Install rust, x86_64-pc-windows-msvc host
   - appveyor DownloadFile https://win.rustup.rs/ -FileName rustup-init.exe
-  - rustup-init.exe -y --default-toolchain=nightly-2017-01-06-x86_64-pc-windows-msvc
+  - rustup-init.exe -y --default-toolchain=nightly-2017-04-25-x86_64-pc-windows-msvc
   - set PATH=%PATH%;C:\Users\appveyor\.cargo\bin
 
   # Install the target we're compiling for

appveyor.yml

@@ -35,7 +35,7 @@ fn commit_info() -> String {
 
 fn commit_hash() -> Result<String, Ignore> {
     Ok(try!(String::from_utf8(try!(Command::new("git")
-                                       .args(&["rev-parse", "--short", "HEAD"])
+                                       .args(&["rev-parse", "--short=9", "HEAD"])
                                        .output())
                                   .stdout)))
 }

build.rs

@@ -27,9 +27,16 @@ RUN apt-get install -y --no-install-recommends \
         --install-dir /android-ndk/x86 \
         --arch x86 \
         --api 21 && \
+    ./android-ndk-r13b/build/tools/make_standalone_toolchain.py \
+        --install-dir /android-ndk/x86_64 \
+        --arch x86_64 \
+        --api 21 && \
     rm -rf ./android-ndk-r13b-linux-x86_64.zip ./android-ndk-r13b && \
     apt-get purge --auto-remove -y unzip python
 
-ENV PATH=$PATH:/android-ndk/arm/bin:/android-ndk/arm64/bin:/android-ndk/x86/bin
+ENV PATH=$PATH:/android-ndk/arm/bin
+ENV PATH=$PATH:/android-ndk/arm64/bin
+ENV PATH=$PATH:/android-ndk/x86/bin
+ENV PATH=$PATH:/android-ndk/x86_64/bin
 
 WORKDIR /buildslave

ci/docker/android/Dockerfile

@@ -12,15 +12,13 @@ fi
 
 # Upload docs
 if [[ "$TARGET" == "x86_64-unknown-linux-gnu" && "$TRAVIS_BRANCH" == "stable" ]]; then
-    # FIXME rust-lang/rust#32532
-    printf "not uploading docs"
-    #git config --global credential.helper store;
-    #echo "https://${TOKEN}:[email protected]" >> ~/.git-credentials;
-    #cargo doc --release;
-    #echo '<meta http-equiv=refresh content=0;url=multirust/index.html>' > target/doc/index.html;
-    #sudo pip install ghp-import;
-    #ghp-import -n target/doc;
-    #git push -qf https://${TOKEN}@github.com/${TRAVIS_REPO_SLUG}.git gh-pages;
+    git config --global credential.helper store;
+    echo "https://${TOKEN}:[email protected]" >> ~/.git-credentials;
+    cargo doc --release;
+    echo '<meta http-equiv=refresh content=0;url=multirust/index.html>' > target/doc/index.html;
+    sudo pip install ghp-import;
+    ghp-import -n target/doc;
+    git push -qf https://${TOKEN}@github.com/${TRAVIS_REPO_SLUG}.git gh-pages;
 fi;
 
 # Copy rustup-init to rustup-setup for backwards compatibility

ci/prepare-deploy-travis.sh

@@ -67,6 +67,13 @@ case $TARGET in
     OPENSSL_OS=android-x86
     OPENSSL_CC=i686-linux-android-gcc
     OPENSSL_AR=i686-linux-android-ar
+    OPENSSL_CFLAGS=no-asm
+    ;;
+  x86_64-linux-android)
+    OPENSSL_OS=linux-x86_64
+    OPENSSL_CC=x86_64-linux-android-gcc
+    OPENSSL_AR=x86_64-linux-android-ar
+    OPENSSL_CFLAGS="no-asm -mandroid -fomit-frame-pointer"
     ;;
   arm-*-linux-gnueabi)
     OPENSSL_OS=linux-armv4

ci/run-docker.sh

@@ -17,7 +17,7 @@ rustls-backend = ["hyper", "env_proxy", "rustls", "lazy_static", "ca-loader"]
 [dependencies]
 error-chain = "0.7.1"
 url = "1.1"
-curl = { version = "0.4", optional = true }
+curl = { version = "0.4.6", optional = true }
 lazy_static = { version = "0.2", optional = true }
 native-tls = { version = "0.1", optional = true }
 

src/download/Cargo.toml

@@ -235,7 +235,7 @@ pub fn rustc_version(toolchain: &Toolchain) -> String {
             // we guard against such cases by enforcing a reasonable timeout to read.
             let mut line1 = None;
             if let Ok(mut child) = cmd.spawn() {
-                let timeout = Duration::new(1, 0);
+                let timeout = Duration::new(3, 0);
                 match child.wait_timeout(timeout) {
                     Ok(Some(status)) if status.success() => {
                         let out = child.stdout.expect("Child::stdout requested but not present");
@@ -248,6 +248,7 @@ pub fn rustc_version(toolchain: &Toolchain) -> String {
                     }
                     Ok(None) => {
                         let _ = child.kill();
+                        return String::from("(timeout reading rustc version)")
                     }
                     Ok(Some(_)) | Err(_) => {}
                 }

src/rustup-cli/common.rs

@@ -32,7 +32,7 @@ r"DISCUSSION:
     'nightly', or '1.8.0'. For more information see `rustup help
     toolchain`.";
 
-pub static TOOLCHAIN_INSTALL_HELP: &'static str =
+pub static INSTALL_HELP: &'static str =
 r"DISCUSSION:
     Installs a specific rust toolchain.
 
@@ -66,7 +66,7 @@ r"DISCUSSION:
 
     'channel' is either a named release channel or an explicit version
     number, such as '1.8.0'. Channel names can be optionally appended
-    with an archive date, as in 'nightly-2014-12-18', in which case
+    with an archive date, as in 'nightly-2017-05-09', in which case
     the toolchain is downloaded from the archive for that date.
 
     Finally, the host may be specified as a target triple. This is
@@ -81,8 +81,29 @@ r"DISCUSSION:
 
         $ rustup default stable-msvc
 
-    Toolchain names that don't name a channel instead can be used to
-    name custom toolchains with the `rustup toolchain link` command.";
+    rustup can also manage symlinked local toolchain builds, which are
+    often used to for developing Rust itself. For more information see
+    `rustup toolchain help link`.";
+
+pub static TOOLCHAIN_LINK_HELP: &'static str =
+r"DISCUSSION:
+    'toolchain' is the custom name to be assigned to the new toolchain.
+    Any name is permitted as long as it does not fully match an initial
+    substring of a standard release channel. For example, you can use
+    the names 'latest' or '2017-04-01' but you cannot use 'stable' or
+    'beta-i686' or 'nightly-x86_64-unknown-linux-gnu'.
+
+    'path' specifies the directory where the binaries and libraries for
+    the custom toolchain can be found. For example, when used for
+    development of Rust itself, toolchains can be linked directly out of
+    the build directory. After building, you can test out different
+    compiler versions as follows:
+
+        $ rustup toolchain link latest-stage1 build/x86_64-unknown-linux-gnu/stage1
+        $ rustup override set latest-stage1
+
+    If you now compile a crate in the current directory, the custom
+    toolchain 'latest-stage1' will be used.";
 
 pub static OVERRIDE_HELP: &'static str =
 r"DISCUSSION:

src/rustup-cli/help.rs

@@ -1,15 +1,26 @@
+//! The main rustup commandline application
+//!
+//! The rustup binary is a chimera, changing its behavior based on the
+//! name of the binary. This is used most prominently to enable
+//! rustup's tool 'proxies' - that is, rustup itself and the rustup
+//! proxies are the same binary; when the binary is called 'rustup' or
+//! 'rustup.exe' rustup behaves like the rustup commandline
+//! application; when it is called 'rustc' it behaves as a proxy to
+//! 'rustc'.
+//!
+//! This scheme is further used to distingush the rustup installer,
+//! called 'rustup-init' which is again just the rustup binary under a
+//! different name.
+
 #![recursion_limit = "1024"]
 
 extern crate rustup_dist;
-#[macro_use]
 extern crate rustup_utils;
 #[macro_use]
 extern crate error_chain;
 
-#[macro_use]
 extern crate clap;
 extern crate regex;
-#[macro_use]
 extern crate rustup;
 extern crate term;
 extern crate itertools;
@@ -54,29 +65,26 @@ use rustup_dist::dist::TargetTriple;
 use rustup::env_var::RUST_RECURSION_COUNT_MAX;
 
 fn main() {
-    if let Err(ref e) = run_multirust() {
+    if let Err(ref e) = run_rustup() {
         common::report_error(e);
         std::process::exit(1);
     }
 }
 
-fn run_multirust() -> Result<()> {
-    // Guard against infinite recursion
-    let recursion_count = env::var("RUST_RECURSION_COUNT").ok()
-        .and_then(|s| s.parse().ok()).unwrap_or(0);
-    if recursion_count > RUST_RECURSION_COUNT_MAX {
-        return Err(ErrorKind::InfiniteRecursion.into());
-    }
+fn run_rustup() -> Result<()> {
+    // Guard against infinite proxy recursion. This mostly happens due to
+    // bugs in rustup.
+    do_recursion_guard()?;
 
-    // Do various things to clean up past messes
-    // FIXME: Remove this soon to get it out of the proxy path
+    // Do various hacks to clean up past messes
     do_compatibility_hacks();
 
     // The name of arg0 determines how the program is going to behave
     let arg0 = env::args().next().map(PathBuf::from);
     let name = arg0.as_ref()
         .and_then(|a| a.file_stem())
         .and_then(|a| a.to_str());
+
     match name {
         Some("rustup") => {
             rustup_mode::main()
@@ -123,6 +131,16 @@ fn run_multirust() -> Result<()> {
     }
 }
 
+fn do_recursion_guard() -> Result<()> {
+    let recursion_count = env::var("RUST_RECURSION_COUNT").ok()
+        .and_then(|s| s.parse().ok()).unwrap_or(0);
+    if recursion_count > RUST_RECURSION_COUNT_MAX {
+        return Err(ErrorKind::InfiniteRecursion.into());
+    }
+
+    Ok(())
+}
+
 fn do_compatibility_hacks() {
     make_environment_compatible();
     fix_windows_reg_key();

src/rustup-cli/main.rs

@@ -129,7 +129,7 @@ pub fn cli() -> App<'static, 'static> {
             .after_help(SHOW_HELP))
         .subcommand(SubCommand::with_name("install")
             .about("Update Rust toolchains")
-            .after_help(TOOLCHAIN_INSTALL_HELP)
+            .after_help(INSTALL_HELP)
             .setting(AppSettings::Hidden) // synonym for 'toolchain install'
             .arg(Arg::with_name("toolchain")
                 .required(true)
@@ -141,7 +141,7 @@ pub fn cli() -> App<'static, 'static> {
                 .required(true)
                 .multiple(true)))
         .subcommand(SubCommand::with_name("update")
-            .about("Update Rust toolchains")
+            .about("Update Rust toolchains and rustup")
             .after_help(UPDATE_HELP)
             .arg(Arg::with_name("toolchain")
                 .required(false)
@@ -176,6 +176,7 @@ pub fn cli() -> App<'static, 'static> {
                      .multiple(true)))
             .subcommand(SubCommand::with_name("link")
                 .about("Create a custom toolchain by symlinking to a directory")
+                .after_help(TOOLCHAIN_LINK_HELP)
                 .arg(Arg::with_name("toolchain")
                     .required(true))
                 .arg(Arg::with_name("path")