Skip to content

small ci fixes #86

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bmwill merged 2 commits into from
Jul 19, 2026
Merged

small ci fixes #86

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6f51935
tests: update expected output for git v2.54
Jul 19, 2026
562220f
clippy: allow(question_mark)
Jul 19, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,11 @@ std = []
binary = ["dep:zlib-rs"]
color = ["dep:anstyle"]

[lints.clippy]
# Suppressed pending a decision on the clippy 1.97 question_mark expansion,
# which flags `let...else` blocks that are clearer left as-is.
question_mark = "allow"

[dependencies]
hashbrown = { version = "0.17.0", default-features = false, features = ["default-hasher"] }
anstyle = { version = "1.0.13", default-features = false, optional = true }
Expand Down
10 changes: 5 additions & 5 deletions tests/compat/git/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ fn fail_ambiguous_suffix_tie() {
.expect_success(true)
.expect_compat(false)
.expect_external_error(snapbox::str![[r#"
error: git diff header lacks filename information when removing 1 leading pathname component (line 4)
error: git diff header lacks filename information when removing 1 leading pathname component at <stdin>:4

"#]])
.run();
Expand Down Expand Up @@ -186,7 +186,7 @@ fn fail_prefix_no_slash() {
.expect_success(false)
.expect_diffy_error(snapbox::str!["apply error: error applying hunk #1"])
.expect_external_error(snapbox::str![[r#"
error: git diff header lacks filename information when removing 1 leading pathname component (line 5)
error: git diff header lacks filename information when removing 1 leading pathname component at <stdin>:5

"#]])
.run();
Expand All @@ -208,7 +208,7 @@ fn junk_between_hunks() {
.strip(1)
.expect_compat(false)
.expect_external_error(snapbox::str![[r#"
error: patch fragment without header at line 11: @@ -7,3 +7,3 @@
error: patch fragment without header at <stdin>:11: @@ -7,3 +7,3 @@

"#]])
.run();
Expand Down Expand Up @@ -243,7 +243,7 @@ fn binary_literal_wrong_original() {
.strip(1)
.expect_compat(false)
.expect_external_error(snapbox::str![[r#"
error: corrupt binary patch at line 9:
error: corrupt binary patch at <stdin>:9:
error: No valid patches in input (allow with "--allow-empty")

"#]])
Expand All @@ -261,7 +261,7 @@ fn binary_literal_size_mismatch() {
"binary patch error: error parsing binary patch: decompressed size mismatch: expected 99, got 10"
]])
.expect_external_error(snapbox::str![[r#"
error: corrupt binary patch at line 7:
error: corrupt binary patch at <stdin>:7:
error: No valid patches in input (allow with "--allow-empty")

"#]])
Expand Down
Loading