rust-lang · bors · May 9, 2018 · May 7, 2018
diff --git a/src/Cargo.lock b/src/Cargo.lock
diff --git a/src/bootstrap/tool.rs b/src/bootstrap/tool.rs
@@ -556,15 +556,6 @@ tool_extended!((self, builder),
     };
     Miri, miri, "src/tools/miri", "miri", {};
     Rls, rls, "src/tools/rls", "rls", {
-        let clippy = builder.ensure(Clippy {
-            compiler: self.compiler,
-            target: self.target,
-            extra_features: Vec::new(),
-        });
-        let channel = &builder.config.channel;
-        if clippy.is_some() && channel != "stable" && channel != "beta" {
-            self.extra_features.push("clippy".to_owned());
-        }
         builder.ensure(native::Openssl {
             target: self.target,
         });

diff --git a/src/ci/docker/x86_64-gnu-tools/checktools.sh b/src/ci/docker/x86_64-gnu-tools/checktools.sh
@@ -30,9 +30,7 @@ python2.7 "$X_PY" test --no-fail-fast \
     src/doc/reference \
     src/doc/rust-by-example \
     src/tools/rls \
-    src/tools/rustfmt \
-    src/tools/miri \
-    src/tools/clippy
+    src/tools/rustfmt
 set -e
 
 cat "$TOOLSTATE_FILE"
@@ -66,8 +64,6 @@ verify_status reference src/doc/reference
 verify_status rust-by-example src/doc/rust-by-example
 verify_status rls src/tool/rls
 verify_status rustfmt src/tool/rustfmt
-verify_status clippy-driver src/tool/clippy
-verify_status miri src/tool/miri
 
 if [ "$RUST_RELEASE_CHANNEL" = nightly -a -n "${TOOLSTATE_REPO_ACCESS_TOKEN+is_set}" ]; then
     . "$(dirname $0)/repo.sh"

diff --git a/src/ci/run.sh b/src/ci/run.sh
@@ -48,7 +48,7 @@ fi
 #
 # FIXME: need a scheme for changing this `nightly` value to `beta` and `stable`
 #        either automatically or manually.
-export RUST_RELEASE_CHANNEL=nightly
+export RUST_RELEASE_CHANNEL=beta
 if [ "$DEPLOY$DEPLOY_ALT" != "" ]; then
   RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --release-channel=$RUST_RELEASE_CHANNEL"
   RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --enable-llvm-static-stdcpp"

diff --git a/src/stage0.txt b/src/stage0.txt
@@ -12,9 +12,9 @@
 # source tarball for a stable release you'll likely see `1.x.0` for rustc and
 # `0.x.0` for Cargo where they were released on `date`.
 
-date: 2018-04-24
-rustc: beta
-cargo: beta
+date: 2018-05-07
+rustc: 1.26.0
+cargo: 0.27.0
 
 # When making a stable release the process currently looks like:
 #
@@ -34,4 +34,4 @@ cargo: beta
 # looking at a beta source tarball and it's uncommented we'll shortly comment it
 # out.
 
-#dev: 1
+dev: 1
diff --git a/src/stdsimd b/src/stdsimd
diff --git a/src/tools/cargo b/src/tools/cargo
diff --git a/src/tools/rls b/src/tools/rls
diff --git a/src/tools/rustfmt b/src/tools/rustfmt
+8 −7		src/bin/cargo/command_prelude.rs
+2 −2		src/bin/cargo/commands/bench.rs
+1 −1		src/bin/cargo/commands/build.rs
+1 −1		src/bin/cargo/commands/check.rs
+1 −1		src/bin/cargo/commands/doc.rs
+2 −2		src/bin/cargo/commands/install.rs
+1 −1		src/bin/cargo/commands/run.rs
+1 −1		src/bin/cargo/commands/rustc.rs
+1 −1		src/bin/cargo/commands/rustdoc.rs
+2 −2		src/bin/cargo/commands/test.rs
+190 −0		src/cargo/core/compiler/build_config.rs
+145 −16		src/cargo/core/compiler/build_context/mod.rs
+25 −10		src/cargo/core/compiler/build_context/target_info.rs
+8 −7		src/cargo/core/compiler/compilation.rs
+6 −5		src/cargo/core/compiler/context/compilation_files.rs
+6 −12		src/cargo/core/compiler/context/mod.rs
+5 −6		src/cargo/core/compiler/context/unit_dependencies.rs
+10 −10		src/cargo/core/compiler/custom_build.rs
+1 −1		src/cargo/core/compiler/fingerprint.rs
+1 −2		src/cargo/core/compiler/job_queue.rs
+7 −204		src/cargo/core/compiler/mod.rs
+8 −3		src/cargo/core/features.rs
+4 −0		src/cargo/core/package.rs
+21 −1		src/cargo/core/package_id_spec.rs
+113 −28		src/cargo/core/profiles.rs
+0 −108		src/cargo/core/registry.rs
+26 −13		src/cargo/core/resolver/context.rs
+34 −2		src/cargo/core/source/mod.rs
+5 −5		src/cargo/ops/cargo_clean.rs
+41 −166		src/cargo/ops/cargo_compile.rs
+1 −1		src/cargo/ops/cargo_doc.rs
+7 −6		src/cargo/ops/cargo_fetch.rs
+81 −32		src/cargo/ops/cargo_output_metadata.rs
+2 −6		src/cargo/ops/cargo_package.rs
+21 −5		src/cargo/ops/cargo_run.rs
+1 −1		src/cargo/ops/mod.rs
+2 −4		src/cargo/sources/directory.rs
+2 −6		src/cargo/sources/git/source.rs
+2 −4		src/cargo/sources/path.rs
+2 −4		src/cargo/sources/registry/mod.rs
+2 −4		src/cargo/sources/replaced.rs
+7 −2		src/cargo/util/config.rs
+42 −8		src/cargo/util/toml/mod.rs
+1 −13		src/doc/src/reference/manifest.md
+4 −4		src/doc/src/reference/unstable.md
+1 −1		tests/testsuite/bench.rs
+174 −5		tests/testsuite/build_script.rs
+1 −1		tests/testsuite/doc.rs
+118 −42		tests/testsuite/freshness.rs
+1 −1		tests/testsuite/install.rs
+223 −2		tests/testsuite/metadata.rs
+7 −4		tests/testsuite/package.rs
+131 −3		tests/testsuite/profile_overrides.rs
+6 −2		tests/testsuite/profile_targets.rs
+25 −0		tests/testsuite/profiles.rs
+0 −6		tests/testsuite/resolve.rs
+33 −1		tests/testsuite/run.rs