Rollup merge of rust-lang#61110 - ehuss:revert-edition-override, r=Ma…

…rk-Simulacrum Revert edition-guide toolstate override Closes rust-lang#60929
Centril · May 24, 2019 · 6bcc256 · 6bcc256
2 parents 23cd10e + fbc6a4b
commit 6bcc256
Showing 1 changed file with 1 addition and 3 deletions.
diff --git 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