Merge pull request #1662 from paolobarbolini/thiserror-v2

upgrade thiserror to v2.0.0
GitoxideLabs · Nov 8, 2024 · 7a40648 · 7a40648
2 parents cf0c7ee + 0f0e4fe
commit 7a40648
Show file tree

Hide file tree

Showing 47 changed files with 156 additions and 139 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/gitoxide-core/Cargo.toml b/gitoxide-core/Cargo.toml
@@ -57,7 +57,7 @@ gix-status = { version = "^0.14.0", path = "../gix-status" }
 gix-fsck = { version = "^0.7.0", path = "../gix-fsck" }
 serde = { version = "1.0.114", optional = true, default-features = false, features = ["derive"] }
 anyhow = "1.0.42"
-thiserror = "1.0.34"
+thiserror = "2.0.0"
 bytesize = "1.0.1"
 tempfile = "3.1.0"
 

diff --git a/gix-actor/Cargo.toml b/gix-actor/Cargo.toml
@@ -22,7 +22,7 @@ serde = ["dep:serde", "bstr/serde", "gix-date/serde"]
 gix-date = { version = "^0.9.1", path = "../gix-date" }
 gix-utils = { version = "^0.1.13", path = "../gix-utils" }
 
-thiserror = "1.0.38"
+thiserror = "2.0.0"
 bstr = { version = "1.3.0", default-features = false, features = [
     "std",
     "unicode",

diff --git a/gix-archive/Cargo.toml b/gix-archive/Cargo.toml
@@ -36,7 +36,7 @@ flate2 = { version = "1.0.33", optional = true }
 zip = { version = "2.1.0", optional = true, default-features = false, features = ["deflate"] }
 jiff = { version = "0.1.2", default-features = false, features = ["std"] }
 
-thiserror = "1.0.26"
+thiserror = "2.0.0"
 bstr = { version = "1.5.0", default-features = false }
 
 tar = { version = "0.4.38", optional = true }

diff --git a/gix-attributes/Cargo.toml b/gix-attributes/Cargo.toml
@@ -28,7 +28,7 @@ bstr = { version = "1.3.0", default-features = false, features = ["std", "unicod
 smallvec = "1.10.0"
 kstring = "2.0.0"
 unicode-bom = { version = "2.0.3" }
-thiserror = "1.0.26"
+thiserror = "2.0.0"
 serde = { version = "1.0.114", optional = true, default-features = false, features = ["derive"] }
 
 document-features = { version = "0.2.1", optional = true }

diff --git a/gix-bitmap/Cargo.toml b/gix-bitmap/Cargo.toml
@@ -16,7 +16,7 @@ doctest = false
 test = true
 
 [dependencies]
-thiserror = "1.0.38"
+thiserror = "2.0.0"
 
 [dev-dependencies]
 gix-testtools = { path = "../tests/tools" }
diff --git a/gix-chunk/Cargo.toml b/gix-chunk/Cargo.toml
@@ -17,4 +17,4 @@ doctest = false
 test = false
 
 [dependencies]
-thiserror = "1.0.34"
+thiserror = "2.0.0"
diff --git a/gix-commitgraph/Cargo.toml b/gix-commitgraph/Cargo.toml
@@ -27,7 +27,7 @@ gix-chunk = { version = "^0.4.9", path = "../gix-chunk" }
 bstr = { version = "1.3.0", default-features = false, features = ["std"] }
 memmap2 = "0.9.0"
 serde = { version = "1.0.114", optional = true, default-features = false, features = ["derive"] }
-thiserror = "1.0.26"
+thiserror = "2.0.0"
 
 document-features = { version = "0.2.0", optional = true }
 

diff --git a/gix-commitgraph/src/init.rs b/gix-commitgraph/src/init.rs
@@ -30,10 +30,7 @@ pub enum Error {
         err: std::io::Error,
         path: PathBuf,
     },
-    #[error(
-        "Commit-graph files contain {0} commits altogether, but only {} commits are allowed",
-        MAX_COMMITS
-    )]
+    #[error("Commit-graph files contain {0} commits altogether, but only {MAX_COMMITS} commits are allowed")]
     TooManyCommits(u64),
 }
 

diff --git a/gix-config-value/Cargo.toml b/gix-config-value/Cargo.toml
@@ -21,7 +21,7 @@ serde = ["dep:serde", "bstr/serde"]
 [dependencies]
 gix-path = { version = "^0.10.12", path = "../gix-path" }
 
-thiserror = "1.0.32"
+thiserror = "2.0.0"
 bstr = { version = "1.0.1", default-features = false, features = ["std"] }
 serde = { version = "1.0.114", optional = true, default-features = false, features = ["derive"] }
 bitflags = "2"

diff --git a/gix-config/Cargo.toml b/gix-config/Cargo.toml
@@ -28,7 +28,7 @@ gix-glob = { version = "^0.17.0", path = "../gix-glob" }
 
 winnow = { version = "0.6", features = ["simd"] }
 memchr = "2"
-thiserror = "1.0.26"
+thiserror = "2.0.0"
 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"] }

diff --git a/gix-credentials/Cargo.toml b/gix-credentials/Cargo.toml
@@ -27,7 +27,7 @@ gix-config-value = { version = "^0.14.9", path = "../gix-config-value" }
 gix-prompt = { version = "^0.8.8", path = "../gix-prompt" }
 gix-trace = { version = "^0.1.11", path = "../gix-trace" }
 
-thiserror = "1.0.32"
+thiserror = "2.0.0"
 serde = { version = "1.0.114", optional = true, default-features = false, features = ["derive"] }
 bstr = { version = "1.3.0", default-features = false, features = ["std"] }
 

diff --git a/gix-date/Cargo.toml b/gix-date/Cargo.toml
@@ -23,7 +23,7 @@ bstr = { version = "1.3.0", default-features = false, features = ["std"] }
 serde = { version = "1.0.114", optional = true, default-features = false, features = ["derive"] }
 itoa = "1.0.1"
 jiff = "0.1.1"
-thiserror = "1.0.32"
+thiserror = "2.0.0"
 
 document-features = { version = "0.2.0", optional = true }
 

diff --git a/gix-diff/Cargo.toml b/gix-diff/Cargo.toml
@@ -36,7 +36,7 @@ gix-tempfile = { version = "^15.0.0", path = "../gix-tempfile", optional = true
 gix-trace = { version = "^0.1.11", path = "../gix-trace", optional = true }
 gix-traverse = { version = "^0.42.0", path = "../gix-traverse", optional = true }
 
-thiserror = "1.0.32"
+thiserror = "2.0.0"
 imara-diff = { version = "0.1.7", optional = true }
 serde = { version = "1.0.114", optional = true, default-features = false, features = ["derive"] }
 getrandom = { version = "0.2.8", optional = true, default-features = false, features = ["js"] }

diff --git a/gix-dir/Cargo.toml b/gix-dir/Cargo.toml
@@ -26,7 +26,7 @@ gix-ignore = { version = "^0.12.0", path = "../gix-ignore" }
 gix-utils = { version = "^0.1.13", path = "../gix-utils", features = ["bstr"] }
 
 bstr = { version = "1.5.0", default-features = false }
-thiserror = "1.0.34"
+thiserror = "2.0.0"
 
 [dev-dependencies]
 gix-testtools = { path = "../tests/tools" }

diff --git a/gix-discover/Cargo.toml b/gix-discover/Cargo.toml
@@ -22,7 +22,7 @@ gix-hash = { version = "^0.15.0", path = "../gix-hash" }
 gix-fs = { version = "^0.12.0", path = "../gix-fs" }
 
 bstr = { version = "1.3.0", default-features = false, features = ["std", "unicode"] }
-thiserror = "1.0.26"
+thiserror = "2.0.0"
 
 [target.'cfg(windows)'.dependencies]
 dunce = "1.0.3"

diff --git a/gix-features/Cargo.toml b/gix-features/Cargo.toml
@@ -146,7 +146,7 @@ bytes = { version = "1.0.0", optional = true }
 
 # zlib module
 flate2 = { version = "1.0.33", optional = true, default-features = false }
-thiserror = { version = "1.0.38", optional = true }
+thiserror = { version = "2.0.0", optional = true }
 
 once_cell = { version = "1.13.0", optional = true }
 

diff --git a/gix-filter/Cargo.toml b/gix-filter/Cargo.toml
@@ -27,7 +27,7 @@ gix-attributes = { version = "^0.23.0", path = "../gix-attributes" }
 
 encoding_rs = "0.8.32"
 bstr = { version = "1.5.0", default-features = false, features = ["std"] }
-thiserror = "1.0.38"
+thiserror = "2.0.0"
 smallvec = "1.10.0"
 
 

diff --git a/gix-hash/Cargo.toml b/gix-hash/Cargo.toml
@@ -20,7 +20,7 @@ test = false
 serde = ["dep:serde"]
 
 [dependencies]
-thiserror = "1.0.33"
+thiserror = "2.0.0"
 faster-hex = { version = "0.9.0" }
 serde = { version = "1.0.114", optional = true, default-features = false, features = ["derive"] }
 

diff --git a/gix-index/Cargo.toml b/gix-index/Cargo.toml
@@ -37,7 +37,7 @@ gix-utils = { version = "^0.1.13", path = "../gix-utils" }
 
 hashbrown = "0.14.3"
 fnv = "1.0.7"
-thiserror = "1.0.32"
+thiserror = "2.0.0"
 memmap2 = "0.9.0"
 filetime = "0.2.15"
 bstr = { version = "1.3.0", default-features = false }

diff --git a/gix-lock/Cargo.toml b/gix-lock/Cargo.toml
@@ -18,7 +18,7 @@ test = true
 [dependencies]
 gix-utils = { version = "^0.1.13", default-features = false, path = "../gix-utils" }
 gix-tempfile = { version = "^15.0.0", default-features = false, path = "../gix-tempfile" }
-thiserror = "1.0.38"
+thiserror = "2.0.0"
 
 [dev-dependencies]
 tempfile = "3.2.0"
diff --git a/gix-mailmap/Cargo.toml b/gix-mailmap/Cargo.toml
@@ -22,7 +22,7 @@ serde = ["dep:serde", "bstr/serde", "gix-actor/serde"]
 gix-actor = { version = "^0.33.0", path = "../gix-actor" }
 gix-date = { version = "^0.9.1", path = "../gix-date" }
 bstr = { version = "1.3.0", default-features = false, features = ["std", "unicode"] }
-thiserror = "1.0.38"
+thiserror = "2.0.0"
 serde = { version = "1.0.114", optional = true, default-features = false, features = ["derive"] }
 
 document-features = { version = "0.2.0", optional = true }

diff --git a/gix-merge/Cargo.toml b/gix-merge/Cargo.toml
@@ -33,7 +33,7 @@ gix-revision = { version = "^0.30.0", path = "../gix-revision", default-features
 gix-revwalk = { version = "^0.16.0", path = "../gix-revwalk" }
 gix-diff = { version = "^0.47.0", path = "../gix-diff", default-features = false, features = ["blob"] }
 
-thiserror = "1.0.63"
+thiserror = "2.0.0"
 imara-diff = { version = "0.1.7" }
 bstr = { version = "1.5.0", default-features = false }
 serde = { version = "1.0.114", optional = true, default-features = false, features = ["derive"] }

diff --git a/gix-negotiate/Cargo.toml b/gix-negotiate/Cargo.toml
@@ -21,7 +21,7 @@ gix-object = { version = "^0.45.0", path = "../gix-object" }
 gix-date = { version = "^0.9.1", path = "../gix-date" }
 gix-commitgraph = { version = "^0.25.0", path = "../gix-commitgraph" }
 gix-revwalk = { version = "^0.16.0", path = "../gix-revwalk" }
-thiserror = "1.0.40"
+thiserror = "2.0.0"
 smallvec = "1.10.0"
 bitflags = "2"
 

diff --git a/gix-object/Cargo.toml b/gix-object/Cargo.toml
@@ -53,7 +53,7 @@ gix-date = { version = "^0.9.1", path = "../gix-date" }
 gix-utils = { version = "^0.1.13", path = "../gix-utils" }
 
 itoa = "1.0.1"
-thiserror = "1.0.34"
+thiserror = "2.0.0"
 bstr = { version = "1.3.0", default-features = false, features = [
     "std",
     "unicode",

diff --git a/gix-odb/Cargo.toml b/gix-odb/Cargo.toml
@@ -32,7 +32,7 @@ gix-fs = { version = "^0.12.0", path = "../gix-fs" }
 serde = { version = "1.0.114", optional = true, default-features = false, features = ["derive"] }
 
 tempfile = "3.10.0"
-thiserror = "1.0.26"
+thiserror = "2.0.0"
 parking_lot = { version = "0.12.0" }
 arc-swap = "1.5.0"
 

diff --git a/gix-pack/Cargo.toml b/gix-pack/Cargo.toml
@@ -48,7 +48,7 @@ gix-diff = { version = "^0.47.0", path = "../gix-diff", default-features = false
 memmap2 = "0.9.0"
 smallvec = "1.3.0"
 parking_lot = { version = "0.12.0", default-features = false, optional = true }
-thiserror = "1.0.26"
+thiserror = "2.0.0"
 
 # for caching
 uluru = { version = "3.0.0", optional = true }

diff --git a/gix-packetline-blocking/Cargo.toml b/gix-packetline-blocking/Cargo.toml
@@ -32,7 +32,7 @@ serde = ["dep:serde", "bstr/serde"]
 gix-trace = { version = "^0.1.11", path = "../gix-trace" }
 
 serde = { version = "1.0.114", optional = true, default-features = false, features = ["std", "derive"] }
-thiserror = "1.0.34"
+thiserror = "2.0.0"
 faster-hex = { version = "0.9.0" }
 bstr = { version = "1.3.0", default-features = false, features = ["std"] }
 

diff --git a/gix-packetline/Cargo.toml b/gix-packetline/Cargo.toml
@@ -44,7 +44,7 @@ required-features = ["blocking-io", "maybe-async/is_sync"]
 gix-trace = { version = "^0.1.11", path = "../gix-trace" }
 
 serde = { version = "1.0.114", optional = true, default-features = false, features = ["std", "derive"] }
-thiserror = "1.0.34"
+thiserror = "2.0.0"
 faster-hex = { version = "0.9.0" }
 bstr = { version = "1.3.0", default-features = false, features = ["std"] }
 # async support

diff --git a/gix-path/Cargo.toml b/gix-path/Cargo.toml
@@ -17,7 +17,7 @@ doctest = false
 [dependencies]
 gix-trace = { version = "^0.1.11", path = "../gix-trace" }
 bstr = { version = "1.3.0", default-features = false, features = ["std"] }
-thiserror = "1.0.26"
+thiserror = "2.0.0"
 once_cell = "1.17.1"
 
 [target.'cfg(not(target_family = "wasm"))'.dependencies]

diff --git a/gix-pathspec/Cargo.toml b/gix-pathspec/Cargo.toml
@@ -22,7 +22,7 @@ gix-config-value = { version = "^0.14.9", path = "../gix-config-value" }
 
 bstr = { version = "1.3.0", default-features = false, features = ["std"] }
 bitflags = "2"
-thiserror = "1.0.26"
+thiserror = "2.0.0"
 
 [dev-dependencies]
 gix-testtools = { path = "../tests/tools" }

diff --git a/gix-prompt/Cargo.toml b/gix-prompt/Cargo.toml
@@ -18,7 +18,7 @@ doctest = false
 gix-command = { version = "^0.3.10", path = "../gix-command" }
 gix-config-value = { version = "^0.14.9", path = "../gix-config-value" }
 
-thiserror = "1.0.32"
+thiserror = "2.0.0"
 
 [target.'cfg(unix)'.dependencies]
 rustix = { version = "0.38.4", features = ["termios"] }

diff --git a/gix-protocol/Cargo.toml b/gix-protocol/Cargo.toml
@@ -56,7 +56,7 @@ gix-date = { version = "^0.9.1", path = "../gix-date" }
 gix-credentials = { version = "^0.25.0", path = "../gix-credentials" }
 gix-utils = { version = "^0.1.13", path = "../gix-utils" }
 
-thiserror = "1.0.32"
+thiserror = "2.0.0"
 serde = { version = "1.0.114", optional = true, default-features = false, features = [
     "derive",
 ] }

diff --git a/gix-quote/Cargo.toml b/gix-quote/Cargo.toml
@@ -18,4 +18,4 @@ doctest = false
 gix-utils = { version = "^0.1.13", path = "../gix-utils" }
 
 bstr = { version = "1.3.0", default-features = false, features = ["std"] }
-thiserror = "1.0.38"
+thiserror = "2.0.0"
diff --git a/gix-ref/Cargo.toml b/gix-ref/Cargo.toml
@@ -32,7 +32,7 @@ gix-actor = { version = "^0.33.0", path = "../gix-actor" }
 gix-lock = { version = "^15.0.0", path = "../gix-lock" }
 gix-tempfile = { version = "^15.0.0", default-features = false, path = "../gix-tempfile" }
 
-thiserror = "1.0.34"
+thiserror = "2.0.0"
 winnow = { version = "0.6", features = ["simd"] }
 serde = { version = "1.0.114", optional = true, default-features = false, features = ["derive"] }
 

diff --git a/gix-refspec/Cargo.toml b/gix-refspec/Cargo.toml
@@ -20,7 +20,7 @@ gix-validate = { version = "^0.9.1", path = "../gix-validate" }
 gix-hash = { version = "^0.15.0", path = "../gix-hash" }
 
 bstr = { version = "1.3.0", default-features = false, features = ["std"] }
-thiserror = "1.0.26"
+thiserror = "2.0.0"
 smallvec = "1.9.0"
 
 [dev-dependencies]

diff --git a/gix-revision/Cargo.toml b/gix-revision/Cargo.toml
@@ -37,7 +37,7 @@ gix-trace = { version = "^0.1.11", path = "../gix-trace", optional = true }
 
 bstr = { version = "1.3.0", default-features = false, features = ["std"] }
 bitflags = { version = "2", optional = true }
-thiserror = "1.0.26"
+thiserror = "2.0.0"
 serde = { version = "1.0.114", optional = true, default-features = false, features = ["derive"] }
 document-features = { version = "0.2.1", optional = true }
 

diff --git a/gix-revwalk/Cargo.toml b/gix-revwalk/Cargo.toml
@@ -21,5 +21,5 @@ gix-date = { version = "^0.9.1", path = "../gix-date" }
 gix-hashtable = { version = "^0.6.0", path = "../gix-hashtable" }
 gix-commitgraph = { version = "^0.25.0", path = "../gix-commitgraph" }
 
-thiserror = "1.0.26"
+thiserror = "2.0.0"
 smallvec = "1.10.0"
diff --git a/gix-status/Cargo.toml b/gix-status/Cargo.toml
@@ -33,7 +33,7 @@ gix-pathspec = { version = "^0.8.0", path = "../gix-pathspec" }
 gix-dir = { version = "^0.9.0", path = "../gix-dir", optional = true }
 gix-diff = { version = "^0.47.0", path = "../gix-diff", default-features = false, features = ["blob"], optional = true }
 
-thiserror = "1.0.26"
+thiserror = "2.0.0"
 filetime = "0.2.15"
 bstr = { version = "1.3.0", default-features = false }
 

diff --git a/gix-submodule/Cargo.toml b/gix-submodule/Cargo.toml
@@ -22,7 +22,7 @@ gix-path = { version = "^0.10.12", path = "../gix-path" }
 gix-url = { version = "^0.28.0", path = "../gix-url" }
 
 bstr = { version = "1.5.0", default-features = false }
-thiserror = "1.0.44"
+thiserror = "2.0.0"
 
 [dev-dependencies]
 gix-testtools = { path = "../tests/tools" }

diff --git a/gix-transport/Cargo.toml b/gix-transport/Cargo.toml
@@ -95,7 +95,7 @@ bstr = { version = "1.3.0", default-features = false, features = [
     "std",
     "unicode",
 ] }
-thiserror = "1.0.26"
+thiserror = "2.0.0"
 
 # for async-client
 async-trait = { version = "0.1.51", optional = true }

diff --git a/gix-traverse/Cargo.toml b/gix-traverse/Cargo.toml
@@ -23,5 +23,5 @@ gix-hashtable = { version = "^0.6.0", path = "../gix-hashtable" }
 gix-revwalk = { version = "^0.16.0", path = "../gix-revwalk" }
 gix-commitgraph = { version = "^0.25.0", path = "../gix-commitgraph" }
 smallvec = "1.10.0"
-thiserror = "1.0.32"
+thiserror = "2.0.0"
 bitflags = "2"
diff --git a/gix-url/Cargo.toml b/gix-url/Cargo.toml
@@ -23,7 +23,7 @@ gix-features = { version = "^0.39.0", path = "../gix-features" }
 gix-path = { version = "^0.10.12", path = "../gix-path" }
 
 serde = { version = "1.0.114", optional = true, default-features = false, features = ["std", "derive"] }
-thiserror = "1.0.32"
+thiserror = "2.0.0"
 url = "2.5.2"
 bstr = { version = "1.3.0", default-features = false, features = ["std"] }
 

diff --git a/gix-validate/Cargo.toml b/gix-validate/Cargo.toml
@@ -16,7 +16,7 @@ doctest = false
 test = true
 
 [dependencies]
-thiserror = "1.0.34"
+thiserror = "2.0.0"
 bstr = { version = "1.3.0", default-features = false, features = ["std"] }
 
 [dev-dependencies]

diff --git a/gix-worktree-state/Cargo.toml b/gix-worktree-state/Cargo.toml
@@ -27,5 +27,5 @@ gix-features = { version = "^0.39.0", path = "../gix-features" }
 gix-filter = { version = "^0.14.0", path = "../gix-filter" }
 
 io-close = "0.3.7"
-thiserror = "1.0.26"
+thiserror = "2.0.0"
 bstr = { version = "1.3.0", default-features = false }
diff --git a/gix-worktree-stream/Cargo.toml b/gix-worktree-stream/Cargo.toml
@@ -24,7 +24,7 @@ gix-traverse = { version = "^0.42.0", path = "../gix-traverse" }
 gix-fs = { version = "^0.12.0", path = "../gix-fs" }
 gix-path = { version = "^0.10.12", path = "../gix-path" }
 
-thiserror = "1.0.26"
+thiserror = "2.0.0"
 parking_lot = "0.12.1"
 
 [dev-dependencies]