diff options
| author | bors <bors@rust-lang.org> | 2021-07-08 04:05:41 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2021-07-08 04:05:41 +0000 |
| commit | ac8c3bfffb2829d0af075a5d4020fb7e9e86c3a2 (patch) | |
| tree | 7ed177e41caaf762288a5e899f18a027fa12e320 /src/ci/docker | |
| parent | d2b04f075c0ce010758c4c8674152ff89d1d73f3 (diff) | |
| parent | 01474ad92cc025ac7e16a9d70c76c2d030d414d7 (diff) | |
| download | rust-ac8c3bfffb2829d0af075a5d4020fb7e9e86c3a2.tar.gz rust-ac8c3bfffb2829d0af075a5d4020fb7e9e86c3a2.zip | |
Auto merge of #86966 - JohnTitor:rollup-uiqj2vc, r=JohnTitor
Rollup of 9 pull requests Successful merges: - #86639 (Support lint tool names in rustc command line options) - #86812 (Recover from `&dyn mut ...` parse errors) - #86917 (Add doc comment for `impl From<LayoutError> for TryReserveError`) - #86925 (Add self to mailmap) - #86927 (Sync rustc_codegen_cranelift) - #86932 (Fix ICE when misplaced visibility cannot be properly parsed) - #86933 (Clean up rustdoc static files) - #86955 (Fix typo in `ops::Drop` docs) - #86956 (Revert "Add "every" as a doc alias for "all".") Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'src/ci/docker')
| -rw-r--r-- | src/ci/docker/host-x86_64/mingw-check/Dockerfile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/ci/docker/host-x86_64/mingw-check/Dockerfile b/src/ci/docker/host-x86_64/mingw-check/Dockerfile index 8066ea3a944..c27e42a2662 100644 --- a/src/ci/docker/host-x86_64/mingw-check/Dockerfile +++ b/src/ci/docker/host-x86_64/mingw-check/Dockerfile @@ -40,5 +40,5 @@ ENV SCRIPT python3 ../x.py --stage 2 test src/tools/expand-yaml-anchors && \ /scripts/validate-toolstate.sh && \ /scripts/validate-error-codes.sh && \ # Runs checks to ensure that there are no ES5 issues in our JS code. - es-check es5 ../src/librustdoc/html/static/*.js && \ - eslint ../src/librustdoc/html/static/*.js + es-check es5 ../src/librustdoc/html/static/js/*.js && \ + eslint ../src/librustdoc/html/static/js/*.js |