diff options
| author | bors <bors@rust-lang.org> | 2023-01-29 19:29:49 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2023-01-29 19:29:49 +0000 |
| commit | e972bc8083d5228536dfd42913c8778b6bb04c8e (patch) | |
| tree | 17b5e1e05361b5496f3ae02cca79afe6e2485a2b /src/etc | |
| parent | c7bf469fecc75792e1598a0842ac40b361f0107b (diff) | |
| parent | 97e6abad182c7506893634ba7495a86bbd62e078 (diff) | |
| download | rust-e972bc8083d5228536dfd42913c8778b6bb04c8e.tar.gz rust-e972bc8083d5228536dfd42913c8778b6bb04c8e.zip | |
Auto merge of #107451 - matthiaskrgr:rollup-m4ucfu8, r=matthiaskrgr
Rollup of 11 pull requests Successful merges: - #96763 (Fix maintainer validation message) - #106540 (Insert whitespace to avoid ident concatenation in suggestion) - #106763 (print why a test was ignored if its the only test specified) - #106769 (libtest: Print why a test was ignored if it's the only test specified.) - #106798 (Implement `signum` with `Ord`) - #107006 (Output tree representation on thir-tree) - #107078 (Update wording of invalid_doc_attributes docs.) - #107169 (Pass `--locked` to the x test tidy call) - #107431 (docs: remove colon from time header) - #107432 (rustdoc: remove unused class `has-srclink`) - #107448 (When stamp doesn't exist, should say Error, and print path to stamp file) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'src/etc')
| -rwxr-xr-x | src/etc/pre-push.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/etc/pre-push.sh b/src/etc/pre-push.sh index 7a846d44ad6..ff17931115c 100755 --- a/src/etc/pre-push.sh +++ b/src/etc/pre-push.sh @@ -14,4 +14,4 @@ ROOT_DIR="$(git rev-parse --show-toplevel)" echo "Running pre-push script $ROOT_DIR/x test tidy" cd "$ROOT_DIR" -./x test tidy +CARGOFLAGS="--locked" ./x test tidy |