Auto merge of #44654 - TimNN:rollup, r=TimNN

Rollup of 17 pull requests

- Successful merges: #44073, #44088, #44381, #44397, #44509, #44533, #44549, #44553, #44562, #44567, #44595, #44604, #44617, #44622, #44630, #44639, #44647
- Failed merges:

.gitmodules

@@ -36,3 +36,6 @@
 [submodule "src/tools/clippy"]
  path = src/tools/clippy
  url = https://github.com/rust-lang-nursery/rust-clippy.git
+[submodule "src/tools/rustfmt"]
+ path = src/tools/rustfmt
+ url = https://github.com/rust-lang-nursery/rustfmt.git

.travis.yml

@@ -193,7 +193,7 @@ before_install:
 install:
  - case "$TRAVIS_OS_NAME" in
  linux)
- travis_retry curl -fo $HOME/stamp https://s3.amazonaws.com/rust-lang-ci/rust-ci-mirror/2017-03-17-stamp-x86_64-unknown-linux-musl &&
+ travis_retry curl -fo $HOME/stamp https://s3-us-west-1.amazonaws.com/rust-lang-ci2/rust-ci-mirror/2017-03-17-stamp-x86_64-unknown-linux-musl &&
  chmod +x $HOME/stamp &&
  export PATH=$PATH:$HOME
  ;;
@@ -202,9 +202,9 @@ install:
  travis_retry brew update &&
  travis_retry brew install xz;
  fi &&
- travis_retry curl -fo /usr/local/bin/sccache https://s3.amazonaws.com/rust-lang-ci/rust-ci-mirror/2017-05-12-sccache-x86_64-apple-darwin &&
+ travis_retry curl -fo /usr/local/bin/sccache https://s3-us-west-1.amazonaws.com/rust-lang-ci2/rust-ci-mirror/2017-05-12-sccache-x86_64-apple-darwin &&
  chmod +x /usr/local/bin/sccache &&
- travis_retry curl -fo /usr/local/bin/stamp https://s3.amazonaws.com/rust-lang-ci/rust-ci-mirror/2017-03-17-stamp-x86_64-apple-darwin &&
+ travis_retry curl -fo /usr/local/bin/stamp https://s3-us-west-1.amazonaws.com/rust-lang-ci2/rust-ci-mirror/2017-03-17-stamp-x86_64-apple-darwin &&
  chmod +x /usr/local/bin/stamp
  ;;
  esac
@@ -287,12 +287,12 @@ before_deploy:
 
 deploy:
  - provider: s3
- bucket: rust-lang-ci
+ bucket: rust-lang-ci2
  skip_cleanup: true
  local_dir: deploy
  upload_dir: rustc-builds
  acl: public_read
- region: us-east-1
+ region: us-west-1
  access_key_id: AKIAJVBODR3IA4O72THQ
  secret_access_key:
  secure: "kUGd3t7JcVWFESgIlzvsM8viZgCA9Encs3creW0xLJaLSeI1iVjlJK4h/2/nO6y224AFrh/GUfsNr4/4AlxPuYb8OU5oC5Lv+Ff2JiRDYtuNpyQSKAQp+bRYytWMtrmhja91h118Mbm90cUfcLPwkdiINgJNTXhPKg5Cqu3VYn0="
@@ -301,12 +301,12 @@ deploy:
  condition: $DEPLOY = 1
 
  - provider: s3
- bucket: rust-lang-ci
+ bucket: rust-lang-ci2
  skip_cleanup: true
  local_dir: deploy
  upload_dir: rustc-builds-try
  acl: public_read
- region: us-east-1
+ region: us-west-1
  access_key_id: AKIAJVBODR3IA4O72THQ
  secret_access_key:
  secure: "kUGd3t7JcVWFESgIlzvsM8viZgCA9Encs3creW0xLJaLSeI1iVjlJK4h/2/nO6y224AFrh/GUfsNr4/4AlxPuYb8OU5oC5Lv+Ff2JiRDYtuNpyQSKAQp+bRYytWMtrmhja91h118Mbm90cUfcLPwkdiINgJNTXhPKg5Cqu3VYn0="
@@ -317,12 +317,12 @@ deploy:
  # this is the same as the above deployment provider except that it uploads to
  # a slightly different directory and has a different trigger
  - provider: s3
- bucket: rust-lang-ci
+ bucket: rust-lang-ci2
  skip_cleanup: true
  local_dir: deploy
  upload_dir: rustc-builds-alt
  acl: public_read
- region: us-east-1
+ region: us-west-1
  access_key_id: AKIAJVBODR3IA4O72THQ
  secret_access_key:
  secure: "kUGd3t7JcVWFESgIlzvsM8viZgCA9Encs3creW0xLJaLSeI1iVjlJK4h/2/nO6y224AFrh/GUfsNr4/4AlxPuYb8OU5oC5Lv+Ff2JiRDYtuNpyQSKAQp+bRYytWMtrmhja91h118Mbm90cUfcLPwkdiINgJNTXhPKg5Cqu3VYn0="

appveyor.yml

@@ -41,13 +41,13 @@ environment:
  - MSYS_BITS: 32
  RUST_CONFIGURE_ARGS: --build=i686-pc-windows-gnu
  SCRIPT: python x.py test
- MINGW_URL: https://s3.amazonaws.com/rust-lang-ci/rust-ci-mirror
+ MINGW_URL: https://s3-us-west-1.amazonaws.com/rust-lang-ci2/rust-ci-mirror
  MINGW_ARCHIVE: i686-6.3.0-release-posix-dwarf-rt_v5-rev2.7z
  MINGW_DIR: mingw32
  - MSYS_BITS: 64
  SCRIPT: python x.py test
  RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-gnu
- MINGW_URL: https://s3.amazonaws.com/rust-lang-ci/rust-ci-mirror
+ MINGW_URL: https://s3-us-west-1.amazonaws.com/rust-lang-ci2/rust-ci-mirror
  MINGW_ARCHIVE: x86_64-6.3.0-release-posix-seh-rt_v5-rev2.7z
  MINGW_DIR: mingw64
 
@@ -68,14 +68,14 @@ environment:
  - MSYS_BITS: 32
  RUST_CONFIGURE_ARGS: --build=i686-pc-windows-gnu --enable-extended
  SCRIPT: python x.py dist
- MINGW_URL: https://s3.amazonaws.com/rust-lang-ci/rust-ci-mirror
+ MINGW_URL: https://s3-us-west-1.amazonaws.com/rust-lang-ci2/rust-ci-mirror
  MINGW_ARCHIVE: i686-6.3.0-release-posix-dwarf-rt_v5-rev2.7z
  MINGW_DIR: mingw32
  DEPLOY: 1
  - MSYS_BITS: 64
  SCRIPT: python x.py dist
  RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-gnu --enable-extended
- MINGW_URL: https://s3.amazonaws.com/rust-lang-ci/rust-ci-mirror
+ MINGW_URL: https://s3-us-west-1.amazonaws.com/rust-lang-ci2/rust-ci-mirror
  MINGW_ARCHIVE: x86_64-6.3.0-release-posix-seh-rt_v5-rev2.7z
  MINGW_DIR: mingw64
  DEPLOY: 1
@@ -133,25 +133,25 @@ install:
  - set PATH=C:\Python27;%PATH%
 
  # Download and install sccache
- - appveyor-retry appveyor DownloadFile https://s3.amazonaws.com/rust-lang-ci/rust-ci-mirror/2017-05-12-sccache-x86_64-pc-windows-msvc
+ - appveyor-retry appveyor DownloadFile https://s3-us-west-1.amazonaws.com/rust-lang-ci2/rust-ci-mirror/2017-05-12-sccache-x86_64-pc-windows-msvc
  - mv 2017-05-12-sccache-x86_64-pc-windows-msvc sccache.exe
  - set PATH=%PATH%;%CD%
 
  # Download and install ninja
  #
  # Note that this is originally from the github releases patch of Ninja
- - appveyor-retry appveyor DownloadFile https://s3.amazonaws.com/rust-lang-ci/rust-ci-mirror/2017-03-15-ninja-win.zip
+ - appveyor-retry appveyor DownloadFile https://s3-us-west-1.amazonaws.com/rust-lang-ci2/rust-ci-mirror/2017-03-15-ninja-win.zip
  - 7z x 2017-03-15-ninja-win.zip
  - set RUST_CONFIGURE_ARGS=%RUST_CONFIGURE_ARGS% --enable-ninja
  # - set PATH=%PATH%;%CD% -- this already happens above for sccache
 
  # Install InnoSetup to get `iscc` used to produce installers
- - appveyor-retry appveyor DownloadFile https://s3.amazonaws.com/rust-lang-ci/rust-ci-mirror/2017-08-22-is.exe
+ - appveyor-retry appveyor DownloadFile https://s3-us-west-1.amazonaws.com/rust-lang-ci2/rust-ci-mirror/2017-08-22-is.exe
  - 2017-08-22-is.exe /VERYSILENT /SUPPRESSMSGBOXES /NORESTART /SP-
  - set PATH="C:\Program Files (x86)\Inno Setup 5";%PATH%
 
  # Help debug some handle issues on AppVeyor
- - appveyor-retry appveyor DownloadFile https://s3.amazonaws.com/rust-lang-ci/rust-ci-mirror/2017-05-15-Handle.zip
+ - appveyor-retry appveyor DownloadFile https://s3-us-west-1.amazonaws.com/rust-lang-ci2/rust-ci-mirror/2017-05-15-Handle.zip
  - mkdir handle
  - 7z x -ohandle 2017-05-15-Handle.zip
  - set PATH=%PATH%;%CD%\handle
@@ -189,9 +189,9 @@ deploy:
  access_key_id: AKIAJVBODR3IA4O72THQ
  secret_access_key:
  secure: tQWIE+DJHjXaV4np/3YeETkEmXngtIuIgAO/LYKQaUshGLgN8cBCFGG3cHx5lKLt
- bucket: rust-lang-ci
+ bucket: rust-lang-ci2
  set_public: true
- region: us-east-1
+ region: us-west-1
  artifact: /.*/
  folder: rustc-builds
  on:
@@ -206,9 +206,9 @@ deploy:
  access_key_id: AKIAJVBODR3IA4O72THQ
  secret_access_key:
  secure: tQWIE+DJHjXaV4np/3YeETkEmXngtIuIgAO/LYKQaUshGLgN8cBCFGG3cHx5lKLt
- bucket: rust-lang-ci
+ bucket: rust-lang-ci2
  set_public: true
- region: us-east-1
+ region: us-west-1
  artifact: /.*/
  folder: rustc-builds-alt
  on:

src/Cargo.toml

@@ -18,6 +18,7 @@ members = [
  "tools/cargo",
  "tools/rustdoc",
  "tools/rls",
+ "tools/rustfmt",
  # FIXME(https://github.com/rust-lang/cargo/issues/4089): move these to exclude
  "tools/rls/test_data/borrow_error",
  "tools/rls/test_data/completion",
@@ -56,5 +57,13 @@ debug-assertions = false
 debug = false
 debug-assertions = false
 
-[patch.'https://github.com/rust-lang/cargo']
+[patch."https://github.com/rust-lang/cargo"]
 cargo = { path = "tools/cargo" }
+
+# Override rustfmt dependencies both on the repo and the crate (the RLS
+# sometimes uses either).
+# FIXME should only need the crates.io patch, long term.
+[patch.'https://github.com/rust-lang-nursery/rustfmt']
+rustfmt-nightly = { path = "tools/rustfmt" }
+[patch.crates-io]
+rustfmt-nightly = { path = "tools/rustfmt" }

src/bootstrap/builder.rs

@@ -249,11 +249,11 @@ impl<'a> Builder<'a> {
  tool::UnstableBookGen, tool::Tidy, tool::Linkchecker, tool::CargoTest,
  tool::Compiletest, tool::RemoteTestServer, tool::RemoteTestClient,
  tool::RustInstaller, tool::Cargo, tool::Rls, tool::Rustdoc, tool::Clippy,
- native::Llvm),
+ native::Llvm, tool::Rustfmt),
  Kind::Test => describe!(check::Tidy, check::Bootstrap, check::DefaultCompiletest,
  check::HostCompiletest, check::Crate, check::CrateLibrustc, check::Rustdoc,
  check::Linkcheck, check::Cargotest, check::Cargo, check::Rls, check::Docs,
- check::ErrorIndex, check::Distcheck),
+ check::ErrorIndex, check::Distcheck, check::Rustfmt),
  Kind::Bench => describe!(check::Crate, check::CrateLibrustc),
  Kind::Doc => describe!(doc::UnstableBook, doc::UnstableBookGen, doc::TheBook,
  doc::Standalone, doc::Std, doc::Test, doc::Rustc, doc::ErrorIndex, doc::Nomicon,

src/bootstrap/check.rs

@@ -253,6 +253,47 @@ impl Step for Rls {
  }
 }
 
+#[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]
+pub struct Rustfmt {
+ stage: u32,
+ host: Interned<String>,
+}
+
+impl Step for Rustfmt {
+ type Output = ();
+ const ONLY_HOSTS: bool = true;
+
+ fn should_run(run: ShouldRun) -> ShouldRun {
+ run.path("src/tools/rustfmt")
+ }
+
+ fn make_run(run: RunConfig) {
+ run.builder.ensure(Rustfmt {
+ stage: run.builder.top_stage,
+ host: run.target,
+ });
+ }
+
+ /// Runs `cargo test` for rustfmt.
+ fn run(self, builder: &Builder) {
+ let build = builder.build;
+ let stage = self.stage;
+ let host = self.host;
+ let compiler = builder.compiler(stage, host);
+
+ builder.ensure(tool::Rustfmt { compiler, target: self.host });
+ let mut cargo = builder.cargo(compiler, Mode::Tool, host, "test");
+ cargo.arg("--manifest-path").arg(build.src.join("src/tools/rustfmt/Cargo.toml"));
+
+ // Don't build tests dynamically, just a pain to work with
+ cargo.env("RUSTC_NO_PREFER_DYNAMIC", "1");
+
+ builder.add_rustc_lib_path(compiler, &mut cargo);
+
+ try_run(build, &mut cargo);
+ }
+}
+
 fn path_for_cargo(builder: &Builder, compiler: Compiler) -> OsString {
  // Configure PATH to find the right rustc. NB. we have to use PATH
  // and not RUSTC because the Cargo test suite has tests that will

src/bootstrap/mk/Makefile.in

@@ -55,6 +55,7 @@ check-aux:
  src/tools/cargotest \
  src/tools/cargo \
  src/tools/rls \
+ src/tools/rustfmt \
  src/test/pretty \
  src/test/run-pass/pretty \
  src/test/run-fail/pretty \

src/bootstrap/native.rs

@@ -350,7 +350,7 @@ impl Step for Openssl {
  if !tarball.exists() {
  let tmp = tarball.with_extension("tmp");
  // originally from https://www.openssl.org/source/...
- let url = format!("https://s3.amazonaws.com/rust-lang-ci/rust-ci-mirror/{}",
+ let url = format!("https://s3-us-west-1.amazonaws.com/rust-lang-ci2/rust-ci-mirror/{}",
  name);
  let mut ok = false;
  for _ in 0..3 {

src/bootstrap/tool.rs

@@ -445,6 +445,40 @@ impl Step for Rls {
  }
 }
 
+#[derive(Debug, Copy, Clone, Hash, PartialEq, Eq)]
+pub struct Rustfmt {
+ pub compiler: Compiler,
+ pub target: Interned<String>,
+}
+
+impl Step for Rustfmt {
+ type Output = PathBuf;
+ const DEFAULT: bool = true;
+ const ONLY_HOSTS: bool = true;
+
+ fn should_run(run: ShouldRun) -> ShouldRun {
+ let builder = run.builder;
+ run.path("src/tools/rustfmt").default_condition(builder.build.config.extended)
+ }
+
+ fn make_run(run: RunConfig) {
+ run.builder.ensure(Rustfmt {
+ compiler: run.builder.compiler(run.builder.top_stage, run.builder.build.build),
+ target: run.target,
+ });
+ }
+
+ fn run(self, builder: &Builder) -> PathBuf {
+ builder.ensure(ToolBuild {
+ compiler: self.compiler,
+ target: self.target,
+ tool: "rustfmt",
+ mode: Mode::Librustc,
+ path: "src/tools/rustfmt",
+ })
+ }
+}
+
 impl<'a> Builder<'a> {
  /// Get a `Command` which is ready to run `tool` in `stage` built for
  /// `host`.

src/ci/docker/cross/install-mips-musl.sh

@@ -15,7 +15,7 @@ mkdir /usr/local/mips-linux-musl
 # originally from
 # https://downloads.openwrt.org/snapshots/trunk/ar71xx/generic/
 # OpenWrt-Toolchain-ar71xx-generic_gcc-5.3.0_musl-1.1.16.Linux-x86_64.tar.bz2
-URL="https://s3.amazonaws.com/rust-lang-ci/rust-ci-mirror"
+URL="https://s3-us-west-1.amazonaws.com/rust-lang-ci2/rust-ci-mirror"
 FILE="OpenWrt-Toolchain-ar71xx-generic_gcc-5.3.0_musl-1.1.16.Linux-x86_64.tar.bz2"
 curl -L "$URL/$FILE" | tar xjf - -C /usr/local/mips-linux-musl --strip-components=2
 

src/ci/docker/cross/install-mipsel-musl.sh

@@ -15,7 +15,7 @@ mkdir /usr/local/mipsel-linux-musl
 # Note that this originally came from:
 # https://downloads.openwrt.org/snapshots/trunk/malta/generic/
 # OpenWrt-Toolchain-malta-le_gcc-5.3.0_musl-1.1.15.Linux-x86_64.tar.bz2
-URL="https://s3.amazonaws.com/rust-lang-ci/libc"
+URL="https://s3-us-west-1.amazonaws.com/rust-lang-ci2/libc"
 FILE="OpenWrt-Toolchain-malta-le_gcc-5.3.0_musl-1.1.15.Linux-x86_64.tar.bz2"
 curl -L "$URL/$FILE" | tar xjf - -C /usr/local/mipsel-linux-musl --strip-components=2