Skip to content

fixes #1536

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
merged 3 commits into from
Aug 23, 2024
+337 −304
Merged

fixes #1536

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1757377
fix!: remove all workspace dependencies
Byron Aug 22, 2024
3d90ab0
Looks like fuzzing is failing permanently again
Byron Aug 22, 2024
f25829a
update dependencies, and make sure `prodash` is only pulled in once
Byron Aug 23, 2024
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
27 changes: 0 additions & 27 deletions .github/workflows/cifuzz.yml
View file

This file was deleted.

556 changes: 311 additions & 245 deletions Cargo.lock
View file

Large diffs are not rendered by default.

11 changes: 2 additions & 9 deletions Cargo.toml
View file
Original file line number Diff line number Diff line change
@@ -173,11 +173,11 @@ gix = { version = "^0.66.0", path = "gix", default-features = false }

clap = { version = "4.1.1", features = ["derive", "cargo"] }
clap_complete = "4.4.3"
prodash = { workspace = true, optional = true }
prodash = { version = "29.0.0", optional = true }
is-terminal = { version = "0.4.0", optional = true }
env_logger = { version = "0.10.0", default-features = false }
crosstermion = { version = "0.14.0", optional = true, default-features = false }
futures-lite = { workspace = true, optional = true }
futures-lite = { version = "2.1.0", optional = true }

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

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


[package.metadata.docs.rs]
2 changes: 1 addition & 1 deletion gitoxide-core/Cargo.toml
View file
Original file line number Diff line number Diff line change
@@ -62,7 +62,7 @@ tempfile = "3.1.0"
# for async-client
async-trait = { version = "0.1.51", optional = true }
async-net = { version = "2.0", optional = true }
futures-lite = { workspace = true, optional = true }
futures-lite = { version = "2.1.0", optional = true }
async-io = { version = "2.2", optional = true }
futures-io = { version = "0.3.16", optional = true }
blocking = { version = "1.0.2", optional = true }
2 changes: 1 addition & 1 deletion gix-actor/Cargo.toml
View file
Original file line number Diff line number Diff line change
@@ -25,7 +25,7 @@ bstr = { version = "1.3.0", default-features = false, features = [
"std",
"unicode",
] }
winnow.workspace = true
winnow = { version = "0.6", features = ["simd"] }
itoa = "1.0.1"
serde = { version = "1.0.114", optional = true, default-features = false, features = [
"derive",
2 changes: 1 addition & 1 deletion gix-attributes/Cargo.toml
View file
Original file line number Diff line number Diff line change
@@ -25,7 +25,7 @@ gix-trace = { version = "^0.1.8", path = "../gix-trace" }
bstr = { version = "1.3.0", default-features = false, features = ["std", "unicode"] }
smallvec = "1.10.0"
kstring = "2.0.0"
unicode-bom.workspace = true
unicode-bom = { version = "2.0.3" }
thiserror = "1.0.26"
serde = { version = "1.0.114", optional = true, default-features = false, features = ["derive"] }

4 changes: 2 additions & 2 deletions gix-config/Cargo.toml
View file
Original file line number Diff line number Diff line change
@@ -24,10 +24,10 @@ gix-sec = { version = "^0.10.8", path = "../gix-sec" }
gix-ref = { version = "^0.47.0", path = "../gix-ref" }
gix-glob = { version = "^0.16.5", path = "../gix-glob" }

winnow.workspace = true
winnow = { version = "0.6", features = ["simd"] }
memchr = "2"
thiserror = "1.0.26"
unicode-bom.workspace = true
unicode-bom = { version = "2.0.3" }
bstr = { version = "1.3.0", default-features = false, features = ["std"] }
serde = { version = "1.0.114", optional = true, default-features = false, features = ["derive"] }
smallvec = "1.9.0"
2 changes: 1 addition & 1 deletion gix-features/Cargo.toml
View file
Original file line number Diff line number Diff line change
@@ -136,7 +136,7 @@ crc32fast = { version = "1.2.1", optional = true }
sha1 = { version = "0.10.0", optional = true }

# progress
prodash = { workspace = true, optional = true }
prodash = { version = "29.0.0", optional = true }
bytesize = { version = "1.0.1", optional = true }

# pipe
6 changes: 3 additions & 3 deletions gix-hash/Cargo.toml
View file
Original file line number Diff line number Diff line change
@@ -15,17 +15,17 @@ test = false

[features]
## Data structures implement `serde::Serialize` and `serde::Deserialize`.
serde= ["dep:serde"]
serde = ["dep:serde"]

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

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

[dev-dependencies]
gix-testtools = { path = "../tests/tools"}
gix-testtools = { path = "../tests/tools" }
gix-features = { path = "../gix-features", features = ["rustsha1"] }

[package.metadata.docs.rs]
2 changes: 1 addition & 1 deletion gix-ignore/Cargo.toml
View file
Original file line number Diff line number Diff line change
@@ -22,7 +22,7 @@ gix-path = { version = "^0.10.10", path = "../gix-path" }
gix-trace = { version = "^0.1.8", path = "../gix-trace" }

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

document-features = { version = "0.2.1", optional = true }
2 changes: 1 addition & 1 deletion gix-object/Cargo.toml
View file
Original file line number Diff line number Diff line change
@@ -50,7 +50,7 @@ bstr = { version = "1.3.0", default-features = false, features = [
"std",
"unicode",
] }
winnow.workspace = true
winnow = { version = "0.6", features = ["simd"] }
smallvec = { version = "1.4.0", features = ["write"] }
serde = { version = "1.0.114", optional = true, default-features = false, features = [
"derive",
4 changes: 2 additions & 2 deletions gix-packetline-blocking/Cargo.toml
View file
Original file line number Diff line number Diff line change
@@ -29,9 +29,9 @@ serde = ["dep:serde", "bstr/serde"]
[dependencies]
gix-trace = { version = "^0.1.9", path = "../gix-trace" }

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

document-features = { version = "0.2.0", optional = true }
6 changes: 3 additions & 3 deletions gix-packetline/Cargo.toml
View file
Original file line number Diff line number Diff line change
@@ -41,13 +41,13 @@ required-features = ["blocking-io", "maybe-async/is_sync"]
[dependencies]
gix-trace = { version = "^0.1.8", path = "../gix-trace" }

serde = { version = "1.0.114", optional = true, default-features = false, features = ["std", "derive"]}
serde = { version = "1.0.114", optional = true, default-features = false, features = ["std", "derive"] }
thiserror = "1.0.34"
faster-hex = { workspace = true }
faster-hex = { version = "0.9.0" }
bstr = { version = "1.3.0", default-features = false, features = ["std"] }
# async support
futures-io = { version = "0.3.16", optional = true }
futures-lite = { workspace = true, optional = true }
futures-lite = { version = "2.1.0", optional = true }
pin-project-lite = { version = "0.2.6", optional = true }

document-features = { version = "0.2.0", optional = true }
4 changes: 2 additions & 2 deletions gix-protocol/Cargo.toml
View file
Original file line number Diff line number Diff line change
@@ -62,12 +62,12 @@ bstr = { version = "1.3.0", default-features = false, features = [
"std",
"unicode",
] }
winnow.workspace = true
winnow = { version = "0.6", features = ["simd"] }

# for async-client
async-trait = { version = "0.1.51", optional = true }
futures-io = { version = "0.3.16", optional = true }
futures-lite = { workspace = true, optional = true }
futures-lite = { version = "2.1.0", optional = true }
maybe-async = "0.2.6"

document-features = { version = "0.2.0", optional = true }
2 changes: 1 addition & 1 deletion gix-ref/Cargo.toml
View file
Original file line number Diff line number Diff line change
@@ -31,7 +31,7 @@ gix-lock = { version = "^14.0.0", path = "../gix-lock" }
gix-tempfile = { version = "^14.0.0", default-features = false, path = "../gix-tempfile" }

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

# packed refs
7 changes: 4 additions & 3 deletions gix-transport/Cargo.toml
View file
Original file line number Diff line number Diff line change
@@ -98,17 +98,18 @@ thiserror = "1.0.26"
# for async-client
async-trait = { version = "0.1.51", optional = true }
futures-io = { version = "0.3.16", optional = true }
futures-lite = { workspace = true, optional = true }
futures-lite = { version = "2.1.0", optional = true }
pin-project-lite = { version = "0.2.6", optional = true }

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

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

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

## If used in conjunction with `async-client`, the `connect()` method will become available along with supporting the git protocol over TCP,
## where the TCP stream is created using this crate.
2 changes: 1 addition & 1 deletion gix/Cargo.toml
View file
Original file line number Diff line number Diff line change
@@ -358,7 +358,7 @@ gix-protocol = { version = "^0.45.3", path = "../gix-protocol", optional = true
gix-transport = { version = "^0.42.3", path = "../gix-transport", optional = true }

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