Auto merge of #44823 - dtolnay:backport21, r=alexcrichton

[beta] Backport accepted PRs to 1.21 Backport of: - ~don't suggest placing `use` statements into expanded code #44215 - stabilize tcpstream_connect_timeout #44563 - stabilized iterator_for_each #44567 - travis: Move sccache to the us-west-1 region #44574 - stabilized ord_max_min #44593 - stabilized compiler_fences #44595 - ci: Upload/download from a new S3 bucket #44617 - stabilized needs_drop #44639 - Stabilized vec_splice and modified splice tracking issue #44640 - Backport libs stabilizations to 1.21 beta #44824
rust-lang · Sep 26, 2017 · 3c3cd3f · 3c3cd3f
2 parents ea1fd7d + f38d353
commit 3c3cd3f
Show file tree

Hide file tree

Showing 23 changed files with 118 additions and 201 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -126,7 +126,8 @@ matrix:
 
 env:
  global:
- - SCCACHE_BUCKET=rust-lang-ci-sccache
+ - SCCACHE_BUCKET=rust-lang-ci-sccache2
+ - SCCACHE_REGION=us-west-1
  - AWS_ACCESS_KEY_ID=AKIAJAMV3QAMMA6AXHFQ
  # AWS_SECRET_ACCESS_KEY=...
  - secure: "j96XxTVOSUf4s4r4htIxn/fvIa5DWbMgLqWl7r8z2QfgUwscmkMXAwXuFNc7s7bGTpV/+CgDiMFFM6BAFLGKutytIF6oA02s9b+usQYnM0th7YQ2AIgm9GtMTJCJp4AoyfFmh8F2faUICBZlfVLUJ34udHEe35vOklix+0k4WDo="
@@ -161,7 +162,7 @@ install:
  else
  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
  ;;
@@ -170,9 +171,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
@@ -256,12 +257,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="
@@ -270,12 +271,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="
@@ -286,12 +287,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="

diff --git a/appveyor.yml b/appveyor.yml
@@ -1,5 +1,6 @@
 environment:
- SCCACHE_BUCKET: rust-lang-ci-sccache
+ SCCACHE_BUCKET: rust-lang-ci-sccache2
+ SCCACHE_REGION: us-west-1
  AWS_ACCESS_KEY_ID: AKIAJAMV3QAMMA6AXHFQ
  AWS_SECRET_ACCESS_KEY:
  secure: 7Y+JiquYedOAgnUU26uL0DPzrxmTtR+qIwG6rNKSuWDffqU3vVZxbGXim9QpTO80
@@ -40,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
 
@@ -67,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
@@ -132,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
@@ -188,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:
@@ -205,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:

diff --git a/src/bootstrap/native.rs b/src/bootstrap/native.rs
@@ -349,7 +349,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 {

diff --git a/src/ci/docker/cross/install-mips-musl.sh b/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
 

diff --git a/src/ci/docker/cross/install-mipsel-musl.sh b/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
 

diff --git a/src/ci/docker/dist-i686-linux/build-openssl.sh b/src/ci/docker/dist-i686-linux/build-openssl.sh
@@ -13,7 +13,7 @@ set -ex
 source shared.sh
 
 VERSION=1.0.2k
-URL=https://s3.amazonaws.com/rust-lang-ci/rust-ci-mirror/openssl-$VERSION.tar.gz
+URL=https://s3-us-west-1.amazonaws.com/rust-lang-ci2/rust-ci-mirror/openssl-$VERSION.tar.gz
 
 curl $URL | tar xzf -
 

diff --git a/src/ci/docker/dist-x86_64-linux/build-openssl.sh b/src/ci/docker/dist-x86_64-linux/build-openssl.sh
@@ -13,7 +13,7 @@ set -ex
 source shared.sh
 
 VERSION=1.0.2k
-URL=https://s3.amazonaws.com/rust-lang-ci/rust-ci-mirror/openssl-$VERSION.tar.gz
+URL=https://s3-us-west-1.amazonaws.com/rust-lang-ci2/rust-ci-mirror/openssl-$VERSION.tar.gz
 
 curl $URL | tar xzf -
 

diff --git a/src/ci/docker/dist-x86_64-netbsd/build-netbsd-toolchain.sh b/src/ci/docker/dist-x86_64-netbsd/build-netbsd-toolchain.sh
@@ -35,7 +35,7 @@ cd netbsd
 
 mkdir -p /x-tools/x86_64-unknown-netbsd/sysroot
 
-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
 
 # Originally from ftp://ftp.netbsd.org/pub/NetBSD/NetBSD-$BSD/source/sets/*.tgz
 curl $URL/2017-03-17-netbsd-src.tgz | tar xzf -

diff --git a/src/ci/docker/run.sh b/src/ci/docker/run.sh
@@ -57,9 +57,10 @@ mkdir -p $objdir/tmp
 
 args=
 if [ "$SCCACHE_BUCKET" != "" ]; then
- args="$args --env SCCACHE_BUCKET=$SCCACHE_BUCKET"
- args="$args --env AWS_ACCESS_KEY_ID=$AWS_ACCESS_KEY_ID"
- args="$args --env AWS_SECRET_ACCESS_KEY=$AWS_SECRET_ACCESS_KEY"
+ args="$args --env SCCACHE_BUCKET"
+ args="$args --env SCCACHE_REGION"
+ args="$args --env AWS_ACCESS_KEY_ID"
+ args="$args --env AWS_SECRET_ACCESS_KEY"
  args="$args --env SCCACHE_ERROR_LOG=/tmp/sccache/sccache.log"
  args="$args --volume $objdir/tmp:/tmp/sccache"
 else
@@ -82,10 +83,10 @@ exec docker \
  --env SRC=/checkout \
  $args \
  --env CARGO_HOME=/cargo \
- --env DEPLOY=$DEPLOY \
- --env DEPLOY_ALT=$DEPLOY_ALT \
+ --env DEPLOY \
+ --env DEPLOY_ALT \
  --env LOCAL_USER_ID=`id -u` \
- --env TRAVIS=${TRAVIS-false} \
+ --env TRAVIS \
  --env TRAVIS_BRANCH \
  --volume "$HOME/.cargo:/cargo" \
  --volume "$HOME/rustsrc:$HOME/rustsrc" \

diff --git a/src/ci/docker/scripts/sccache.sh b/src/ci/docker/scripts/sccache.sh
@@ -8,9 +8,11 @@
 # option. This file may not be copied, modified, or distributed
 # except according to those terms.
 
+# ignore-tidy-linelength
+
 set -ex
 
 curl -fo /usr/local/bin/sccache \
- https://s3.amazonaws.com/rust-lang-ci/rust-ci-mirror/2017-05-12-sccache-x86_64-unknown-linux-musl
+ https://s3-us-west-1.amazonaws.com/rust-lang-ci2/rust-ci-mirror/2017-05-12-sccache-x86_64-unknown-linux-musl
 
 chmod +x /usr/local/bin/sccache
diff --git a/src/doc/unstable-book/src/library-features/compiler-fences.md b/src/doc/unstable-book/src/library-features/compiler-fences.md
diff --git a/src/doc/unstable-book/src/library-features/iterator-for-each.md b/src/doc/unstable-book/src/library-features/iterator-for-each.md