Skip to content
Permalink

Comparing changes

This is a direct comparison between two commits made in this repository or its related repositories. View the default comparison for this range or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: GitoxideLabs/gitoxide
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 53bf674989224599f2405fa8a6cdf1132cf43cd2
Choose a base ref
..
head repository: GitoxideLabs/gitoxide
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 2dd8841b1c4f093dd8d0bd4ee71a860b4067ea70
Choose a head ref
Showing with 42 additions and 22 deletions.
  1. +29 −11 Cargo.lock
  2. +1 −0 Cargo.toml
  3. +2 −2 gitoxide-core/Cargo.toml
  4. +1 −1 gix-hash/Cargo.toml
  5. +1 −1 gix-hash/src/object_id.rs
  6. +1 −1 gix-hash/src/prefix.rs
  7. +5 −4 gix-index/src/fs.rs
  8. +1 −1 gix-packetline-blocking/Cargo.toml
  9. +1 −1 gix-packetline/Cargo.toml
40 changes: 29 additions & 11 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
@@ -300,6 +300,7 @@ members = [
[workspace.dependencies]
prodash = { version = "27.0.0", default-features = false }
futures-lite = { version = "2.1.0", default-features = false, features = ["std"] }
faster-hex = { version = "0.9.0", workspace = true }

[package.metadata.docs.rs]
features = ["document-features", "max"]
4 changes: 2 additions & 2 deletions gitoxide-core/Cargo.toml
Original file line number Diff line number Diff line change
@@ -69,13 +69,13 @@ gix-url = { version = "^0.25.2", path = "../gix-url", optional = true }
jwalk = { version = "0.8.0", optional = true }

# for 'hours'
itertools = { version = "0.11.0", optional = true }
itertools = { version = "0.12.0", optional = true }
fs-err = { version = "2.6.0", optional = true }
crossbeam-channel = { version = "0.5.6", optional = true }
smallvec = { version = "1.10.0", optional = true }

# for 'query' and 'corpus'
rusqlite = { version = "0.29.0", optional = true, features = ["bundled"] }
rusqlite = { version = "0.30.0", optional = true, features = ["bundled"] }

# for 'corpus'
parking_lot = { version = "0.12.1", optional = true }
2 changes: 1 addition & 1 deletion gix-hash/Cargo.toml
Original file line number Diff line number Diff line change
@@ -19,7 +19,7 @@ serde= ["dep:serde"]

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

document-features = { version = "0.2.0", optional = true }
2 changes: 1 addition & 1 deletion gix-hash/src/object_id.rs
Original file line number Diff line number Diff line change
@@ -55,7 +55,7 @@ pub mod decode {
ObjectId::Sha1({
let mut buf = [0; 20];
faster_hex::hex_decode(buffer, &mut buf).map_err(|err| match err {
faster_hex::Error::InvalidChar => Error::Invalid,
faster_hex::Error::InvalidChar | faster_hex::Error::Overflow => Error::Invalid,
faster_hex::Error::InvalidLength(_) => {
unreachable!("BUG: This is already checked")
}
2 changes: 1 addition & 1 deletion gix-hash/src/prefix.rs
Original file line number Diff line number Diff line change
@@ -115,7 +115,7 @@ impl Prefix {
faster_hex::hex_decode(src, &mut out).map(move |_| out)
}
.map_err(|e| match e {
faster_hex::Error::InvalidChar => from_hex::Error::Invalid,
faster_hex::Error::InvalidChar | faster_hex::Error::Overflow => from_hex::Error::Invalid,
faster_hex::Error::InvalidLength(_) => panic!("This is already checked"),
})?;

9 changes: 5 additions & 4 deletions gix-index/src/fs.rs
Original file line number Diff line number Diff line change
@@ -44,7 +44,7 @@ impl Metadata {
pub fn is_dir(&self) -> bool {
#[cfg(not(windows))]
{
(self.0.st_mode & libc::S_IFMT) == libc::S_IFDIR
(self.0.st_mode as u32 & libc::S_IFMT as u32) == libc::S_IFDIR as u32
}
#[cfg(windows)]
self.0.is_dir()
@@ -133,7 +133,8 @@ impl Metadata {
pub fn is_executable(&self) -> bool {
#[cfg(not(windows))]
{
(self.0.st_mode & libc::S_IFMT) == libc::S_IFREG && self.0.st_mode & libc::S_IXUSR == libc::S_IXUSR
(self.0.st_mode as u32 & libc::S_IFMT as u32) == libc::S_IFREG as u32
&& self.0.st_mode as u32 & libc::S_IXUSR as u32 == libc::S_IXUSR as u32
}
#[cfg(windows)]
gix_fs::is_executable(&self.0)
@@ -143,7 +144,7 @@ impl Metadata {
pub fn is_symlink(&self) -> bool {
#[cfg(not(windows))]
{
(self.0.st_mode & libc::S_IFMT) == libc::S_IFLNK
(self.0.st_mode as u32 & libc::S_IFMT as u32) == libc::S_IFLNK as u32
}
#[cfg(windows)]
self.0.is_symlink()
@@ -153,7 +154,7 @@ impl Metadata {
pub fn is_file(&self) -> bool {
#[cfg(not(windows))]
{
(self.0.st_mode & libc::S_IFMT) == libc::S_IFREG
(self.0.st_mode as u32 & libc::S_IFMT as u32) == libc::S_IFREG as u32
}
#[cfg(windows)]
self.0.is_file()
2 changes: 1 addition & 1 deletion gix-packetline-blocking/Cargo.toml
Original file line number Diff line number Diff line change
@@ -31,7 +31,7 @@ gix-trace = { version = "^0.1.4", path = "../gix-trace" }

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

document-features = { version = "0.2.0", optional = true }
2 changes: 1 addition & 1 deletion gix-packetline/Cargo.toml
Original file line number Diff line number Diff line change
@@ -43,7 +43,7 @@ gix-trace = { version = "^0.1.4", path = "../gix-trace" }

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