Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit 8142a31

Browse files
committedSep 13, 2023
Auto merge of #115790 - flip1995:clippyup, r=Manishearth
Update Clippy r? `@Manishearth`
2 parents eb2446a + 780cbf3 commit 8142a31

File tree

175 files changed

+4685
-1638
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

175 files changed

+4685
-1638
lines changed
 

‎Cargo.lock

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -531,7 +531,7 @@ dependencies = [
531531
"tester",
532532
"tokio",
533533
"toml 0.7.5",
534-
"ui_test 0.18.1",
534+
"ui_test 0.20.0",
535535
"walkdir",
536536
]
537537

@@ -5596,9 +5596,9 @@ dependencies = [
55965596

55975597
[[package]]
55985598
name = "ui_test"
5599-
version = "0.18.1"
5599+
version = "0.20.0"
56005600
source = "registry+https://github.com/rust-lang/crates.io-index"
5601-
checksum = "640159421816683e558867ffc0e60ed3a3ed97ec6ccb22c03adb41bf87c5cfa4"
5601+
checksum = "bfd8fb9b15c8332cf51bfc2dc4830063b2446a9c9d732421b56f2478024a3971"
56025602
dependencies = [
56035603
"annotate-snippets",
56045604
"anyhow",

‎src/tools/clippy/.github/driver.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ unset CARGO_MANIFEST_DIR
3030
# Run a lint and make sure it produces the expected output. It's also expected to exit with code 1
3131
# FIXME: How to match the clippy invocation in compile-test.rs?
3232
./target/debug/clippy-driver -Dwarnings -Aunused -Zui-testing --emit metadata --crate-type bin tests/ui/double_neg.rs 2>double_neg.stderr && exit 1
33-
sed -e "s,tests/ui,\$DIR," -e "/= help/d" double_neg.stderr >normalized.stderr
33+
sed -e "s,tests/ui,\$DIR," -e "/= help: for/d" double_neg.stderr > normalized.stderr
3434
diff -u normalized.stderr tests/ui/double_neg.stderr
3535

3636
# make sure "clippy-driver --rustc --arg" and "rustc --arg" behave the same

0 commit comments

Comments
 (0)
Please sign in to comment.