about summary refs log tree commit diff
path: root/src/ci/docker
diff options
context:
space:
mode:
authorMazdak Farrokhzad <twingoow@gmail.com>2019-05-25 04:55:33 +0200
committerGitHub <noreply@github.com>2019-05-25 04:55:33 +0200
commitf8b3ebea6f787b558977ce0538a3d4757e8dfe6a (patch)
tree68f6d18d76fadc8492f9fd5a36f2857277e7c051 /src/ci/docker
parent77afe6adf882b58b42018699885461970bae0b2e (diff)
parentfbc6a4b9f015ebf56f4f5b883bd9b0216b33a198 (diff)
downloadrust-f8b3ebea6f787b558977ce0538a3d4757e8dfe6a.tar.gz
rust-f8b3ebea6f787b558977ce0538a3d4757e8dfe6a.zip
Rollup merge of #61110 - ehuss:revert-edition-override, r=Mark-Simulacrum
Revert edition-guide toolstate override

Closes #60929
Diffstat (limited to 'src/ci/docker')
-rwxr-xr-xsrc/ci/docker/x86_64-gnu-tools/checktools.sh4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/ci/docker/x86_64-gnu-tools/checktools.sh b/src/ci/docker/x86_64-gnu-tools/checktools.sh
index a0fe307cffc..af0198705a2 100755
--- a/src/ci/docker/x86_64-gnu-tools/checktools.sh
+++ b/src/ci/docker/x86_64-gnu-tools/checktools.sh
@@ -74,9 +74,7 @@ status_check() {
     check_dispatch $1 beta nomicon src/doc/nomicon
     check_dispatch $1 beta reference src/doc/reference
     check_dispatch $1 beta rust-by-example src/doc/rust-by-example
-    # Temporarily disabled until
-    # https://github.com/rust-lang/rust/issues/60459 is fixed.
-    # check_dispatch $1 beta edition-guide src/doc/edition-guide
+    check_dispatch $1 beta edition-guide src/doc/edition-guide
     check_dispatch $1 beta rls src/tools/rls
     check_dispatch $1 beta rustfmt src/tools/rustfmt
     check_dispatch $1 beta clippy-driver src/tools/clippy