Merge branch 'adjustments-for-cargo'

Author: Byron

Cargo.lock

@@ -28,7 +28,7 @@ default = ["max"]
 ## Makes the crate execute as fast as possible by supporting parallel computation of otherwise long-running functions
 ## as well as fast, hardware accelerated hashing, along with a faster zlib backend.
 ## If disabled, the binary will be visibly smaller.
-fast = ["gix/max-performance"]
+fast = ["gix/max-performance", "gix/comfort"]
 
 ## Use `clap` 3.0 to build the prettiest, best documented and most user-friendly CLI at the expense of binary size.
 ## Provides a terminal user interface for detailed and exhaustive progress.
@@ -57,7 +57,7 @@ lean-async = ["fast", "pretty-cli", "gitoxide-core-tools", "gitoxide-core-tools-
 small = ["pretty-cli", "gix-features/rustsha1", "gix-features/zlib-rust-backend", "prodash-render-line", "is-terminal"  ]
 
 ## Makes the crate execute as fast as possible without pulling in C libraries, while keeping everything else minimal akin to the `small` build.
-max-pure = ["pretty-cli", "gix-features/rustsha1", "gix-features/zlib-rust-backend", "prodash-render-line", "prodash-render-tui", "gix/max-performance-safe", "http-client-reqwest", "gitoxide-core-blocking-client", "gitoxide-core-tools", "prodash/render-line-autoconfigure" ]
+max-pure = ["pretty-cli", "gix-features/rustsha1", "gix-features/zlib-rust-backend", "prodash-render-line", "prodash-render-tui", "gix/max-performance-safe", "gix/comfort", "http-client-reqwest", "gitoxide-core-blocking-client", "gitoxide-core-tools", "prodash/render-line-autoconfigure" ]
 
 #! ### `gitoxide-core` Configuration
 
@@ -93,7 +93,7 @@ gix = { version = "^0.38.0", path = "gix", default-features = false }
 time = "0.3.19"
 
 clap = { version = "4.1.1", features = ["derive", "cargo"] }
-prodash = { version = "23.0", optional = true, default-features = false }
+prodash = { version = "23.1", optional = true, default-features = false }
 is-terminal = { version = "0.4.0", optional = true }
 env_logger = { version = "0.10.0", default-features = false }
 crosstermion = { version = "0.10.1", optional = true, default-features = false }

Cargo.toml

@@ -73,6 +73,7 @@ check: ## Build all code in suitable configurations
 	cd gix-hash && cargo check --all-features \
 				&& cargo check
 	cd gix-tempfile && cargo check --features signals \
+					&& cargo check --features hp-hashmap \
 					&& cargo check
 	cd gix-object && cargo check --all-features \
                   && cargo check --features verbose-object-parsing-errors
@@ -135,6 +136,7 @@ check: ## Build all code in suitable configurations
 					  && cargo check --no-default-features --features blocking-http-transport-reqwest \
 					  && cargo check --no-default-features --features max-performance \
 					  && cargo check --no-default-features --features max-performance-safe \
+					  && cargo check --no-default-features --features progress-tree \
 					  && cargo check --no-default-features
 	cd gix-odb && cargo check --features serde1
 	cd cargo-smart-release && cargo check --all

Makefile

@@ -20,7 +20,7 @@ serde1 = ["serde", "bstr/serde", "gix-date/serde1"]
 gix-features = { version = "^0.26.5", path = "../gix-features", optional = true }
 gix-date = { version = "^0.4.3", path = "../gix-date" }
 
-quick-error = "2.0.0"
+thiserror = "1.0.38"
 btoi = "0.4.2"
 bstr = { version = "1.3.0", default-features = false, features = ["std", "unicode"]}
 nom = { version = "7", default-features = false, features = ["std"]}

gix-actor/Cargo.toml

@@ -78,19 +78,15 @@ mod write {
     use std::io;
 
     use bstr::{BStr, ByteSlice};
-    use quick_error::quick_error;
 
     use crate::{Signature, SignatureRef};
 
-    quick_error! {
-        /// The Error produced by [`Signature::write_to()`].
-        #[derive(Debug)]
-        #[allow(missing_docs)]
-        enum Error {
-            IllegalCharacter {
-                display("Signature name or email must not contain '<', '>' or \\n")
-            }
-        }
+    /// The Error produced by [`Signature::write_to()`].
+    #[derive(Debug, thiserror::Error)]
+    #[allow(missing_docs)]
+    enum Error {
+        #[error("Signature name or email must not contain '<', '>' or \\n")]
+        IllegalCharacter,
     }
 
     impl From<Error> for io::Error {

gix-actor/src/signature/mod.rs

@@ -14,7 +14,7 @@ doctest = false
 
 [features]
 ## Data structures implement `serde::Serialize` and `serde::Deserialize`.
-serde1 = ["serde", "bstr/serde", "gix-glob/serde1", "compact_str/serde"]
+serde1 = ["serde", "bstr/serde", "gix-glob/serde1"]
 
 [dependencies]
 gix-features = { version = "^0.26.5", path = "../gix-features" }
@@ -26,7 +26,6 @@ bstr = { version = "1.3.0", default-features = false, features = ["std", "unicod
 unicode-bom = "1.1.4"
 thiserror = "1.0.26"
 serde = { version = "1.0.114", optional = true, default-features = false, features = ["derive"]}
-compact_str = "0.6.1"
 
 document-features = { version = "0.2.1", optional = true }
 

gix-attributes/Cargo.toml

@@ -12,7 +12,6 @@
 use std::path::PathBuf;
 
 use bstr::{BStr, BString};
-use compact_str::CompactString;
 pub use gix_glob as glob;
 
 mod assignment;
@@ -60,15 +59,15 @@ pub enum State {
     Unset,
     /// The attribute is set to the given value, which followed the `=` sign.
     /// Note that values can be empty.
-    Value(CompactString), // TODO: use `kstring`, maybe it gets a binary string soon, needs binary, too, no UTF8 is required for attr values
+    Value(BString), // TODO(performance): Is there a non-utf8 compact_str/KBString crate? See https://github.com/cobalt-org/kstring/issues/37#issuecomment-1446777265 .
     /// The attribute isn't mentioned with a given path or is explicitly set to `Unspecified` using the `!` sign.
     Unspecified,
 }
 
 /// Represents a validated attribute name
 #[derive(PartialEq, Eq, Debug, Hash, Ord, PartialOrd, Clone)]
 #[cfg_attr(feature = "serde1", derive(serde::Serialize, serde::Deserialize))]
-pub struct Name(pub(crate) CompactString);
+pub struct Name(pub(crate) String); // TODO(performance): See if `KBString` or `compact_string` could be meaningful here.
 
 /// Holds a validated attribute name as a reference
 #[derive(PartialEq, Eq, Debug, Hash, Ord, PartialOrd)]

gix-attributes/src/lib.rs

@@ -13,7 +13,7 @@ doctest = false
 test = true
 
 [dependencies]
-quick-error = "2.0.0"
+thiserror = "1.0.38"
 
 [dev-dependencies]
 gix-testtools = { path = "../tests/tools"}

gix-bitmap/Cargo.toml

@@ -1,39 +1,41 @@
 use std::convert::TryInto;
 
 pub mod decode {
-    use quick_error::quick_error;
-
-    quick_error! {
-        #[derive(Debug)]
-        pub enum Error {
-            Corrupt(message: &'static str) {
-                display("{}", message)
-            }
-        }
+    #[derive(Debug, thiserror::Error)]
+    pub enum Error {
+        #[error("{}", message)]
+        Corrupt { message: &'static str },
     }
 }
 
 pub fn decode(data: &[u8]) -> Result<(Vec, &[u8]), decode::Error> {
     use self::decode::Error;
     use crate::decode;
 
-    let (num_bits, data) = decode::u32(data).ok_or(Error::Corrupt("eof reading amount of bits"))?;
-    let (len, data) = decode::u32(data).ok_or(Error::Corrupt("eof reading chunk length"))?;
+    let (num_bits, data) = decode::u32(data).ok_or(Error::Corrupt {
+        message: "eof reading amount of bits",
+    })?;
+    let (len, data) = decode::u32(data).ok_or(Error::Corrupt {
+        message: "eof reading chunk length",
+    })?;
     let len = len as usize;
 
     // NOTE: git does this by copying all bytes first, and then it will change the endianness in a separate loop.
     //       Maybe it's faster, but we can't do it without unsafe. Let's leave it to the optimizer and maybe
     //       one day somebody will find out that it's worth it to use unsafe here.
-    let (mut bits, data) = decode::split_at_pos(data, len * std::mem::size_of::<u64>())
-        .ok_or(Error::Corrupt("eof while reading bit data"))?;
+    let (mut bits, data) = decode::split_at_pos(data, len * std::mem::size_of::<u64>()).ok_or(Error::Corrupt {
+        message: "eof while reading bit data",
+    })?;
     let mut buf = std::vec::Vec::<u64>::with_capacity(len);
     for _ in 0..len {
         let (bit_num, rest) = bits.split_at(std::mem::size_of::<u64>());
         bits = rest;
         buf.push(u64::from_be_bytes(bit_num.try_into().unwrap()))
     }
 
-    let (rlw, data) = decode::u32(data).ok_or(Error::Corrupt("eof while reading run length width"))?;
+    let (rlw, data) = decode::u32(data).ok_or(Error::Corrupt {
+        message: "eof while reading run length width",
+    })?;
 
     Ok((
         Vec {

gix-bitmap/src/ewah.rs

@@ -10,17 +10,6 @@ pub mod ewah;
 pub(crate) mod decode {
     use std::convert::TryInto;
 
-    use quick_error::quick_error;
-
-    quick_error! {
-        #[derive(Debug)]
-        pub enum Error {
-            Corrupt(message: &'static str) {
-                display("{}", message)
-            }
-        }
-    }
-
     #[inline]
     pub(crate) fn split_at_pos(data: &[u8], pos: usize) -> Option<(&[u8], &[u8])> {
         if data.len() < pos {