diff options
| author | bors <bors@rust-lang.org> | 2022-10-07 17:37:39 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2022-10-07 17:37:39 +0000 |
| commit | 2d3a85b4f8ba7e2554f4d4fee126bc2ac6ee2af4 (patch) | |
| tree | f40bafbf266a8500e96c2b232e8dfba5c98c0af8 /src/ci/scripts | |
| parent | 43c22af267fd9337bc05382b2771dde49d2e9f26 (diff) | |
| parent | 3800d40dc8ca3d4bb9967cbee27d2c2bb7c12be6 (diff) | |
| download | rust-2d3a85b4f8ba7e2554f4d4fee126bc2ac6ee2af4.tar.gz rust-2d3a85b4f8ba7e2554f4d4fee126bc2ac6ee2af4.zip | |
Auto merge of #102787 - Dylan-DPC:rollup-fvbb4t9, r=Dylan-DPC
Rollup of 6 pull requests Successful merges: - #102300 (Use a macro to not have to copy-paste `ConstFnMutClosure::new(&mut fold, NeverShortCircuit::wrap_mut_2_imp)).0` everywhere) - #102475 (unsafe keyword: trait examples and unsafe_op_in_unsafe_fn update) - #102760 (Avoid repeated re-initialization of the BufReader buffer) - #102764 (Check `WhereClauseReferencesSelf` after all other object safety checks) - #102779 (Fix `type_of` ICE) - #102780 (run Miri CI when std::sys changes) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'src/ci/scripts')
| -rwxr-xr-x | src/ci/scripts/should-skip-this.sh | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/ci/scripts/should-skip-this.sh b/src/ci/scripts/should-skip-this.sh index 67ff00cc1df..60c2960b160 100755 --- a/src/ci/scripts/should-skip-this.sh +++ b/src/ci/scripts/should-skip-this.sh @@ -19,9 +19,12 @@ if [[ -n "${CI_ONLY_WHEN_SUBMODULES_CHANGED-}" ]]; then # those files are present in the diff a submodule was updated. echo "Submodules were updated" elif ! (git diff --quiet "$BASE_COMMIT" -- \ - src/tools/clippy src/tools/rustfmt src/tools/miri); then + src/tools/clippy src/tools/rustfmt src/tools/miri + library/std/src/sys); then # There is not an easy blanket search for subtrees. For now, manually list # the subtrees. + # Also run this when the platform-specific parts of std change, in case + # that breaks Miri. echo "Tool subtrees were updated" elif ! (git diff --quiet "$BASE_COMMIT" -- \ src/test/rustdoc-gui \ |