diff options
| author | bors <bors@rust-lang.org> | 2018-07-03 12:26:14 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2018-07-03 12:26:14 +0000 |
| commit | 860d169474acabdc53b9a698f8ce02eba7e0daeb (patch) | |
| tree | 2cc22e334f2b368e3250239e10eef93d1f991c1e /src/ci/docker | |
| parent | 64f8ae08fd5294718466a61f74f6de0135b88035 (diff) | |
| parent | 492518fcd5a3a0ce145a0b675d480d6c212d4b03 (diff) | |
| download | rust-860d169474acabdc53b9a698f8ce02eba7e0daeb.tar.gz rust-860d169474acabdc53b9a698f8ce02eba7e0daeb.zip | |
Auto merge of #52014 - pietroalbini:rollup, r=pietroalbini
Rollup of 13 pull requests Successful merges: - #51548 (Initialize LLVM's AMDGPU target machine, if available.) - #51809 (Add read_exact_at and write_all_at methods to FileExt on unix) - #51914 (add outlives annotations to `BTreeMap`) - #51958 (Show known meta items in unknown meta items error) - #51973 (Make Stdio handle UnwindSafe) - #51977 (bootstrap: tests should use rustc from config.toml) - #51978 (Do not suggest changes to str literal if it isn't one) - #51979 (Get rid of `TyImplTraitExistential`) - #51980 (Emit column info in debuginfo for non msvc like targets) - #51982 (incr.comp.: Take names of children into account when computing the ICH of a module's HIR.) - #51997 (add entry for cargo-metadata feature to RELEASES) - #52004 (toolstate: Fixed detection of changed submodule, and other fixes.) - #52006 ( Change --keep-stage to apply more often) Failed merges: r? @ghost
Diffstat (limited to 'src/ci/docker')
| -rwxr-xr-x | src/ci/docker/x86_64-gnu-tools/checktools.sh | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/ci/docker/x86_64-gnu-tools/checktools.sh b/src/ci/docker/x86_64-gnu-tools/checktools.sh index 56e637249f5..e8197e90851 100755 --- a/src/ci/docker/x86_64-gnu-tools/checktools.sh +++ b/src/ci/docker/x86_64-gnu-tools/checktools.sh @@ -79,11 +79,11 @@ 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 - check_dispatch $1 beta rls src/tool/rls - check_dispatch $1 beta rustfmt src/tool/rustfmt + check_dispatch $1 beta rls src/tools/rls + check_dispatch $1 beta rustfmt src/tools/rustfmt # these tools are not required for beta to successfully branch - check_dispatch $1 nightly clippy-driver src/tool/clippy - check_dispatch $1 nightly miri src/tool/miri + check_dispatch $1 nightly clippy-driver src/tools/clippy + check_dispatch $1 nightly miri src/tools/miri } # If this PR is intended to update one of these tools, do not let the build pass |