Skip to content

Commit

Permalink
Rollup merge of rust-lang#61110 - ehuss:revert-edition-override, r=Ma…
Browse files Browse the repository at this point in the history
…rk-Simulacrum

Revert edition-guide toolstate override

Closes rust-lang#60929
  • Loading branch information
Centril authored May 24, 2019
2 parents 23cd10e + fbc6a4b commit 6bcc256
Showing 1 changed file with 1 addition and 3 deletions.
4 changes: 1 addition & 3 deletions src/ci/docker/x86_64-gnu-tools/checktools.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 6bcc256

Please sign in to comment.