Auto merge of rust-lang#40432 - alexcrichton:rollup, r=alexcrichton

Rollup of 38 pull requests

- Successful merges: rust-lang#39202, rust-lang#39820, rust-lang#39918, rust-lang#39921, rust-lang#40092, rust-lang#40146, rust-lang#40199, rust-lang#40225, rust-lang#40239, rust-lang#40257, rust-lang#40259, rust-lang#40261, rust-lang#40277, rust-lang#40278, rust-lang#40287, rust-lang#40297, rust-lang#40311, rust-lang#40315, rust-lang#40319, rust-lang#40324, rust-lang#40336, rust-lang#40340, rust-lang#40344, rust-lang#40345, rust-lang#40367, rust-lang#40369, rust-lang#40372, rust-lang#40373, rust-lang#40379, rust-lang#40385, rust-lang#40386, rust-lang#40389, rust-lang#40400, rust-lang#40404, rust-lang#40410, rust-lang#40422, rust-lang#40423, rust-lang#40424
- Failed merges: rust-lang#40220, rust-lang#40329, rust-lang#40426

Author: bors

.gitmodules

@@ -22,7 +22,7 @@
 	path = src/doc/nomicon
 	url = https://github.com/rust-lang-nursery/nomicon
 [submodule "src/tools/cargo"]
-	path = src/tools/cargo
+	path = cargo
 	url = https://github.com/rust-lang/cargo
 [submodule "reference"]
 	path = src/doc/reference

.travis.yml

@@ -20,6 +20,7 @@ matrix:
     - env: IMAGE=dist-armv7-aarch64-linux DEPLOY=1
     - env: IMAGE=dist-freebsd DEPLOY=1
     - env: IMAGE=dist-i586-gnu-i686-musl DEPLOY=1
+    - env: IMAGE=dist-fuchsia DEPLOY=1
     - env: IMAGE=dist-mips-linux DEPLOY=1
     - env: IMAGE=dist-mips64-linux DEPLOY=1
     - env: IMAGE=dist-powerpc-linux DEPLOY=1
@@ -69,9 +70,7 @@ matrix:
       osx_image: xcode8.2
       install: >
         travis_retry curl -o /usr/local/bin/sccache https://s3.amazonaws.com/rust-lang-ci/rust-ci-mirror/2017-02-25-sccache-x86_64-apple-darwin &&
-          chmod +x /usr/local/bin/sccache &&
-          brew uninstall --ignore-dependencies openssl &&
-          brew install openssl --universal --without-test
+          chmod +x /usr/local/bin/sccache
     - env: >
         RUST_CHECK_TARGET=dist
         RUST_CONFIGURE_ARGS="--target=aarch64-apple-ios,armv7-apple-ios,armv7s-apple-ios,i386-apple-ios,x86_64-apple-ios --enable-extended"
@@ -133,6 +132,7 @@ after_failure:
       echo "#### Build failed; Disk usage after running script:";
       df -h;
       du . | sort -nr | head -n100
+  - cat obj/tmp/sccache.log
 
 # Save tagged docker images we created and load them if they're available
 before_cache:

cargo

@@ -512,7 +512,7 @@ case $CFG_CPUTYPE in
         CFG_OSTYPE="${CFG_OSTYPE}eabihf"
         ;;
 
-    armv7l)
+    armv7l | armv8l)
         CFG_CPUTYPE=armv7
         CFG_OSTYPE="${CFG_OSTYPE}eabihf"
         ;;