Skip to content

Commit c88c72d

Browse files
committed
adapt to changes in gix-ref
1 parent 56ba898 commit c88c72d

File tree

5 files changed

+2
-9
lines changed

5 files changed

+2
-9
lines changed

.github/workflows/ci.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -391,7 +391,7 @@ jobs:
391391
- name: features of gix-features
392392
run: |
393393
set +x
394-
for feature in progress fs-walkdir-parallel parallel io-pipe crc32 zlib zlib-rust-backend fast-sha1 rustsha1 cache-efficiency-debug; do
394+
for feature in progress parallel io-pipe crc32 zlib zlib-rust-backend fast-sha1 rustsha1 cache-efficiency-debug; do
395395
(cd gix-features && cargo build --features "$feature" --target "$TARGET")
396396
done
397397
- name: crates with 'wasm' feature

Cargo.lock

-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

gix/Cargo.toml

-5
Original file line numberDiff line numberDiff line change
@@ -230,11 +230,6 @@ max-control = ["parallel", "pack-cache-lru-static", "pack-cache-lru-dynamic"]
230230
## No C toolchain is involved.
231231
max-performance-safe = ["max-control"]
232232

233-
## If set, walkdir iterators will be multi-threaded which affects the listing of loose objects and references.
234-
## Note, however, that this will use `rayon` under the hood and spawn threads for each traversal to avoid a global rayon thread pool.
235-
## Thus this option is more interesting to one-off client applications, rather than the server.
236-
parallel-walkdir = ["gix-features/fs-walkdir-parallel"]
237-
238233
## The tempfile registry uses a better implementation of a thread-safe hashmap, relying on an external crate.
239234
## This may be useful when tempfiles are created and accessed in a massively parallel fashion and you know that this is indeed faster than
240235
## the simpler implementation that is the default.

gix/tests/gix/repository/reference.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -102,10 +102,10 @@ mod iter_references {
102102
"refs/heads/d1",
103103
"refs/heads/dt1",
104104
"refs/heads/main",
105-
"refs/heads/multi-link-target1",
106105
"refs/loop-a",
107106
"refs/loop-b",
108107
"refs/multi-link",
108+
"refs/heads/multi-link-target1",
109109
"refs/remotes/origin/HEAD",
110110
"refs/remotes/origin/main",
111111
"refs/remotes/origin/multi-link-target3",

justfile

-1
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,6 @@ check:
9898
cargo check -p gix-status --all-features
9999
cargo check -p gix-features --all-features
100100
cargo check -p gix-features --features parallel
101-
cargo check -p gix-features --features fs-walkdir-parallel
102101
cargo check -p gix-features --features fs-read-dir
103102
cargo check -p gix-features --features rustsha1
104103
cargo check -p gix-features --features fast-sha1

0 commit comments

Comments
 (0)