Skip to content

Commit a4b82c7

Browse files
ByronByron
authored
Merge 1757377 into b3ff033 
2 parents b3ff033 + 1757377 commit a4b82c7

File tree

16 files changed

+29
-32
lines changed

16 files changed

+29
-32
lines changed

‎Cargo.lock

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

‎Cargo.toml

+2-9
Original file line numberDiff line numberDiff line change
@@ -173,11 +173,11 @@ gix = { version = "^0.66.0", path = "gix", default-features = false }
173173

174174
clap = { version = "4.1.1", features = ["derive", "cargo"] }
175175
clap_complete = "4.4.3"
176-
prodash = { workspace = true, optional = true }
176+
prodash = { version = "29.0.0", optional = true }
177177
is-terminal = { version = "0.4.0", optional = true }
178178
env_logger = { version = "0.10.0", default-features = false }
179179
crosstermion = { version = "0.14.0", optional = true, default-features = false }
180-
futures-lite = { workspace = true, optional = true }
180+
futures-lite = { version = "2.1.0", optional = true }
181181

182182
# for 'tracing'
183183
tracing-forest = { version = "0.1.5", features = ["serde"], optional = true }
@@ -303,13 +303,6 @@ members = [
303303
]
304304

305305
[workspace.dependencies]
306-
prodash = { version = "29.0.0", default-features = false }
307-
futures-lite = { version = "2.1.0", default-features = false, features = ["std"] }
308-
faster-hex = { version = "0.9.0", default-features = false }
309-
reqwest = { version = "0.12.0", default-features = false, features = ["charset", "http2", "macos-system-configuration"] } # all but the 'default-tls' feature
310-
curl = { version = "0.4" }
311-
winnow = { version = "0.6.0", features = ["simd"] }
312-
unicode-bom = "2.0.2"
313306

314307

315308
[package.metadata.docs.rs]

‎gitoxide-core/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ tempfile = "3.1.0"
6262
# for async-client
6363
async-trait = { version = "0.1.51", optional = true }
6464
async-net = { version = "2.0", optional = true }
65-
futures-lite = { workspace = true, optional = true }
65+
futures-lite = { version = "2.1.0", optional = true }
6666
async-io = { version = "2.2", optional = true }
6767
futures-io = { version = "0.3.16", optional = true }
6868
blocking = { version = "1.0.2", optional = true }

‎gix-actor/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ bstr = { version = "1.3.0", default-features = false, features = [
2525
"std",
2626
"unicode",
2727
] }
28-
winnow.workspace = true
28+
winnow = { version = "0.6", features = ["simd"] }
2929
itoa = "1.0.1"
3030
serde = { version = "1.0.114", optional = true, default-features = false, features = [
3131
"derive",

‎gix-attributes/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ gix-trace = { version = "^0.1.8", path = "../gix-trace" }
2525
bstr = { version = "1.3.0", default-features = false, features = ["std", "unicode"] }
2626
smallvec = "1.10.0"
2727
kstring = "2.0.0"
28-
unicode-bom.workspace = true
28+
unicode-bom = { version = "2.0.3" }
2929
thiserror = "1.0.26"
3030
serde = { version = "1.0.114", optional = true, default-features = false, features = ["derive"] }
3131

‎gix-config/Cargo.toml

+2-2
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,10 @@ gix-sec = { version = "^0.10.8", path = "../gix-sec" }
2424
gix-ref = { version = "^0.47.0", path = "../gix-ref" }
2525
gix-glob = { version = "^0.16.5", path = "../gix-glob" }
2626

27-
winnow.workspace = true
27+
winnow = { version = "0.6", features = ["simd"] }
2828
memchr = "2"
2929
thiserror = "1.0.26"
30-
unicode-bom.workspace = true
30+
unicode-bom = { version = "2.0.3" }
3131
bstr = { version = "1.3.0", default-features = false, features = ["std"] }
3232
serde = { version = "1.0.114", optional = true, default-features = false, features = ["derive"] }
3333
smallvec = "1.9.0"

‎gix-features/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ crc32fast = { version = "1.2.1", optional = true }
136136
sha1 = { version = "0.10.0", optional = true }
137137

138138
# progress
139-
prodash = { workspace = true, optional = true }
139+
prodash = { version = "29.0.0", optional = true }
140140
bytesize = { version = "1.0.1", optional = true }
141141

142142
# pipe

‎gix-hash/Cargo.toml

+3-3
Original file line numberDiff line numberDiff line change
@@ -15,17 +15,17 @@ test = false
1515

1616
[features]
1717
## Data structures implement `serde::Serialize` and `serde::Deserialize`.
18-
serde= ["dep:serde"]
18+
serde = ["dep:serde"]
1919

2020
[dependencies]
2121
thiserror = "1.0.33"
22-
faster-hex = { workspace = true }
22+
faster-hex = { version = "0.9.0" }
2323
serde = { version = "1.0.114", optional = true, default-features = false, features = ["derive"] }
2424

2525
document-features = { version = "0.2.0", optional = true }
2626

2727
[dev-dependencies]
28-
gix-testtools = { path = "../tests/tools"}
28+
gix-testtools = { path = "../tests/tools" }
2929
gix-features = { path = "../gix-features", features = ["rustsha1"] }
3030

3131
[package.metadata.docs.rs]

‎gix-ignore/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ gix-path = { version = "^0.10.10", path = "../gix-path" }
2222
gix-trace = { version = "^0.1.8", path = "../gix-trace" }
2323

2424
bstr = { version = "1.3.0", default-features = false, features = ["std", "unicode"] }
25-
unicode-bom.workspace = true
25+
unicode-bom = { version = "2.0.3" }
2626
serde = { version = "1.0.114", optional = true, default-features = false, features = ["derive"] }
2727

2828
document-features = { version = "0.2.1", optional = true }

‎gix-object/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ bstr = { version = "1.3.0", default-features = false, features = [
5050
"std",
5151
"unicode",
5252
] }
53-
winnow.workspace = true
53+
winnow = { version = "0.6", features = ["simd"] }
5454
smallvec = { version = "1.4.0", features = ["write"] }
5555
serde = { version = "1.0.114", optional = true, default-features = false, features = [
5656
"derive",

‎gix-packetline-blocking/Cargo.toml

+2-2
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,9 @@ serde = ["dep:serde", "bstr/serde"]
2929
[dependencies]
3030
gix-trace = { version = "^0.1.9", path = "../gix-trace" }
3131

32-
serde = { version = "1.0.114", optional = true, default-features = false, features = ["std", "derive"]}
32+
serde = { version = "1.0.114", optional = true, default-features = false, features = ["std", "derive"] }
3333
thiserror = "1.0.34"
34-
faster-hex = { workspace = true }
34+
faster-hex = { version = "0.9.0" }
3535
bstr = { version = "1.3.0", default-features = false, features = ["std"] }
3636

3737
document-features = { version = "0.2.0", optional = true }

‎gix-packetline/Cargo.toml

+3-3
Original file line numberDiff line numberDiff line change
@@ -41,13 +41,13 @@ required-features = ["blocking-io", "maybe-async/is_sync"]
4141
[dependencies]
4242
gix-trace = { version = "^0.1.8", path = "../gix-trace" }
4343

44-
serde = { version = "1.0.114", optional = true, default-features = false, features = ["std", "derive"]}
44+
serde = { version = "1.0.114", optional = true, default-features = false, features = ["std", "derive"] }
4545
thiserror = "1.0.34"
46-
faster-hex = { workspace = true }
46+
faster-hex = { version = "0.9.0" }
4747
bstr = { version = "1.3.0", default-features = false, features = ["std"] }
4848
# async support
4949
futures-io = { version = "0.3.16", optional = true }
50-
futures-lite = { workspace = true, optional = true }
50+
futures-lite = { version = "2.1.0", optional = true }
5151
pin-project-lite = { version = "0.2.6", optional = true }
5252

5353
document-features = { version = "0.2.0", optional = true }

‎gix-protocol/Cargo.toml

+2-2
Original file line numberDiff line numberDiff line change
@@ -62,12 +62,12 @@ bstr = { version = "1.3.0", default-features = false, features = [
6262
"std",
6363
"unicode",
6464
] }
65-
winnow.workspace = true
65+
winnow = { version = "0.6", features = ["simd"] }
6666

6767
# for async-client
6868
async-trait = { version = "0.1.51", optional = true }
6969
futures-io = { version = "0.3.16", optional = true }
70-
futures-lite = { workspace = true, optional = true }
70+
futures-lite = { version = "2.1.0", optional = true }
7171
maybe-async = "0.2.6"
7272

7373
document-features = { version = "0.2.0", optional = true }

‎gix-ref/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ gix-lock = { version = "^14.0.0", path = "../gix-lock" }
3131
gix-tempfile = { version = "^14.0.0", default-features = false, path = "../gix-tempfile" }
3232

3333
thiserror = "1.0.34"
34-
winnow.workspace = true
34+
winnow = { version = "0.6", features = ["simd"] }
3535
serde = { version = "1.0.114", optional = true, default-features = false, features = ["derive"] }
3636

3737
# packed refs

‎gix-transport/Cargo.toml

+4-3
Original file line numberDiff line numberDiff line change
@@ -98,17 +98,18 @@ thiserror = "1.0.26"
9898
# for async-client
9999
async-trait = { version = "0.1.51", optional = true }
100100
futures-io = { version = "0.3.16", optional = true }
101-
futures-lite = { workspace = true, optional = true }
101+
futures-lite = { version = "2.1.0", optional = true }
102102
pin-project-lite = { version = "0.2.6", optional = true }
103103

104104
# for http-client
105105
base64 = { version = "0.22.1", optional = true }
106106

107107
# for http-client-curl. Additional configuration should be performed on higher levels of the dependency tree.
108-
curl = { workspace = true, optional = true }
108+
curl = { version = "0.4", optional = true }
109109

110110
# for http-client-reqwest
111-
reqwest = { workspace = true, optional = true, features = ["blocking"] }
111+
# all but the 'default-tls' feature
112+
reqwest = { version = "0.12.0", optional = true, default-features = false, features = ["blocking", "charset", "http2", "macos-system-configuration"] }
112113

113114
## If used in conjunction with `async-client`, the `connect()` method will become available along with supporting the git protocol over TCP,
114115
## where the TCP stream is created using this crate.

‎gix/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -358,7 +358,7 @@ gix-protocol = { version = "^0.45.3", path = "../gix-protocol", optional = true
358358
gix-transport = { version = "^0.42.3", path = "../gix-transport", optional = true }
359359

360360
# Just to get the progress-tree feature
361-
prodash = { workspace = true, optional = true, features = ["progress-tree"] }
361+
prodash = { version = "29.0.0", optional = true, features = ["progress-tree"] }
362362
once_cell = "1.14.0"
363363
signal-hook = { version = "0.3.9", default-features = false, optional = true }
364364
thiserror = "1.0.26"

0 commit comments

Comments
 (0)