From b2ded125b8268fcd95d149db79279d94b2ec7e71 Mon Sep 17 00:00:00 2001 From: Sebastian Thiel Date: Fri, 29 Dec 2023 08:09:55 +0100 Subject: [PATCH 1/9] fix!: remove panicking version of `ObjectId::from()` in favor of `ObjectId::from_bytes_or_panic()`. We also add an `&oid::try_from()` implementation for good measure, which is hard to call in practice but certainly not impossible. --- gix-hash/src/lib.rs | 2 +- gix-hash/src/object_id.rs | 31 ++++++++++++++++++++---------- gix-hash/src/oid.rs | 40 ++++++++++++++++++++++++--------------- 3 files changed, 47 insertions(+), 26 deletions(-) diff --git a/gix-hash/src/lib.rs b/gix-hash/src/lib.rs index 7dda8eb4c0d..4c5b91231b7 100644 --- a/gix-hash/src/lib.rs +++ b/gix-hash/src/lib.rs @@ -11,7 +11,7 @@ #[path = "oid.rs"] mod borrowed; -pub use borrowed::oid; +pub use borrowed::{oid, Error}; mod object_id; pub use object_id::{decode, ObjectId}; diff --git a/gix-hash/src/object_id.rs b/gix-hash/src/object_id.rs index 4738116a396..f44d6ccf5ce 100644 --- a/gix-hash/src/object_id.rs +++ b/gix-hash/src/object_id.rs @@ -1,6 +1,5 @@ use std::{ borrow::Borrow, - convert::TryInto, hash::{Hash, Hasher}, ops::Deref, }; @@ -152,6 +151,19 @@ impl ObjectId { } } +/// Lifecycle +impl ObjectId { + /// Convert `bytes` into an owned object Id or panic if the slice length doesn't indicate a supported hash. + /// + /// Use `Self::try_from(bytes)` for a fallible version. + pub fn from_bytes_or_panic(bytes: &[u8]) -> Self { + match bytes.len() { + 20 => Self::Sha1(bytes.try_into().expect("prior length validation")), + other => panic!("BUG: unsupported hash len: {other}"), + } + } +} + /// Sha1 hash specific methods impl ObjectId { /// Instantiate an Digest from 20 bytes of a Sha1 digest. @@ -195,15 +207,6 @@ impl From<[u8; SIZE_OF_SHA1_DIGEST]> for ObjectId { } } -impl From<&[u8]> for ObjectId { - fn from(v: &[u8]) -> Self { - match v.len() { - 20 => Self::Sha1(v.try_into().expect("prior length validation")), - other => panic!("BUG: unsupported hash len: {other}"), - } - } -} - impl From<&oid> for ObjectId { fn from(v: &oid) -> Self { match v.kind() { @@ -212,6 +215,14 @@ impl From<&oid> for ObjectId { } } +impl TryFrom<&[u8]> for ObjectId { + type Error = crate::Error; + + fn try_from(bytes: &[u8]) -> Result { + Ok(oid::try_from_bytes(bytes)?.into()) + } +} + impl Deref for ObjectId { type Target = oid; diff --git a/gix-hash/src/oid.rs b/gix-hash/src/oid.rs index f9c74adfec3..4bf6648e751 100644 --- a/gix-hash/src/oid.rs +++ b/gix-hash/src/oid.rs @@ -1,4 +1,4 @@ -use std::{convert::TryInto, fmt, hash}; +use std::{convert::TryInto, hash}; use crate::{Kind, ObjectId, SIZE_OF_SHA1_DIGEST}; @@ -41,28 +41,30 @@ pub struct HexDisplay<'a> { hex_len: usize, } -impl<'a> fmt::Display for HexDisplay<'a> { - fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { - let mut hex = crate::Kind::hex_buf(); +impl<'a> std::fmt::Display for HexDisplay<'a> { + fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { + let mut hex = Kind::hex_buf(); let max_len = self.inner.hex_to_buf(hex.as_mut()); let hex = std::str::from_utf8(&hex[..self.hex_len.min(max_len)]).expect("ascii only in hex"); f.write_str(hex) } } -impl fmt::Debug for oid { - fn fmt(&self, f: &mut fmt::Formatter<'_>) -> std::fmt::Result { +impl std::fmt::Debug for oid { + fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { write!( f, "{}({})", match self.kind() { - crate::Kind::Sha1 => "Sha1", + Kind::Sha1 => "Sha1", }, self.to_hex(), ) } } +/// The error returned when trying to convert a byte slice to an [`oid`] or [`ObjectId`] +#[allow(missing_docs)] #[derive(Debug, thiserror::Error)] pub enum Error { #[error("Cannot instantiate git hash from a digest of length {0}")] @@ -104,8 +106,8 @@ impl oid { impl oid { /// The kind of hash used for this instance. #[inline] - pub fn kind(&self) -> crate::Kind { - crate::Kind::from_len_in_bytes(self.bytes.len()) + pub fn kind(&self) -> Kind { + Kind::from_len_in_bytes(self.bytes.len()) } /// The first byte of the hash, commonly used to partition a set of object ids. @@ -164,7 +166,7 @@ impl oid { /// Write ourselves to `out` in hexadecimal notation. #[inline] pub fn write_hex_to(&self, out: &mut dyn std::io::Write) -> std::io::Result<()> { - let mut hex = crate::Kind::hex_buf(); + let mut hex = Kind::hex_buf(); let hex_len = self.hex_to_buf(&mut hex); out.write_all(&hex[..hex_len]) } @@ -182,12 +184,20 @@ impl AsRef for &oid { } } +impl<'a> TryFrom<&'a [u8]> for &'a oid { + type Error = Error; + + fn try_from(value: &'a [u8]) -> Result { + oid::try_from_bytes(value) + } +} + impl ToOwned for oid { - type Owned = crate::ObjectId; + type Owned = ObjectId; fn to_owned(&self) -> Self::Owned { match self.kind() { - crate::Kind::Sha1 => crate::ObjectId::Sha1(self.bytes.try_into().expect("no bug in hash detection")), + Kind::Sha1 => ObjectId::Sha1(self.bytes.try_into().expect("no bug in hash detection")), } } } @@ -198,8 +208,8 @@ impl<'a> From<&'a [u8; SIZE_OF_SHA1_DIGEST]> for &'a oid { } } -impl fmt::Display for &oid { - fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { +impl std::fmt::Display for &oid { + fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { for b in self.as_bytes() { write!(f, "{b:02x}")?; } @@ -207,7 +217,7 @@ impl fmt::Display for &oid { } } -impl PartialEq for &oid { +impl PartialEq for &oid { fn eq(&self, other: &ObjectId) -> bool { *self == other.as_ref() } From 859a092bb6ad04ee9bab424cf5b56f299a9645d3 Mon Sep 17 00:00:00 2001 From: Sebastian Thiel Date: Fri, 29 Dec 2023 08:16:13 +0100 Subject: [PATCH 2/9] adapt to changes in `gix-hash` --- gix-commitgraph/src/file/verify.rs | 2 +- gix-index/src/decode/entries.rs | 2 +- gix-index/src/decode/mod.rs | 2 +- gix-index/src/extension/link.rs | 2 +- gix-index/src/extension/resolve_undo.rs | 2 +- gix-index/src/extension/tree/decode.rs | 2 +- gix-index/src/extension/untracked_cache.rs | 4 ++-- gix-index/src/file/init.rs | 3 ++- gix-pack/src/data/entry/decode.rs | 4 ++-- gix-pack/src/data/file/verify.rs | 2 +- gix-pack/src/index/access.rs | 4 ++-- gix-pack/src/index/verify.rs | 4 ++-- gix-pack/src/multi_index/access.rs | 2 +- 13 files changed, 18 insertions(+), 17 deletions(-) diff --git a/gix-commitgraph/src/file/verify.rs b/gix-commitgraph/src/file/verify.rs index c91f6b4d281..5bff7309504 100644 --- a/gix-commitgraph/src/file/verify.rs +++ b/gix-commitgraph/src/file/verify.rs @@ -147,7 +147,7 @@ impl File { let data_len_without_trailer = self.data.len() - self.hash_len; let mut hasher = gix_features::hash::hasher(self.object_hash()); hasher.update(&self.data[..data_len_without_trailer]); - let actual = gix_hash::ObjectId::from(hasher.digest().as_ref()); + let actual = gix_hash::ObjectId::from_bytes_or_panic(hasher.digest().as_ref()); let expected = self.checksum(); if actual == expected { diff --git a/gix-index/src/decode/entries.rs b/gix-index/src/decode/entries.rs index 5de949fe130..414957dc6f4 100644 --- a/gix-index/src/decode/entries.rs +++ b/gix-index/src/decode/entries.rs @@ -156,7 +156,7 @@ fn load_one<'a>( gid, size, }, - id: gix_hash::ObjectId::from(hash), + id: gix_hash::ObjectId::from_bytes_or_panic(hash), flags: flags & !entry::Flags::PATH_LEN, // This forces us to add the bits we need before being able to use them. mode: entry::Mode::from_bits_truncate(mode), diff --git a/gix-index/src/decode/mod.rs b/gix-index/src/decode/mod.rs index 12c8c53e404..f6bb126c4ee 100644 --- a/gix-index/src/decode/mod.rs +++ b/gix-index/src/decode/mod.rs @@ -213,7 +213,7 @@ impl State { }); } - let checksum = gix_hash::ObjectId::from(data); + let checksum = gix_hash::ObjectId::from_bytes_or_panic(data); let checksum = (!checksum.is_null()).then_some(checksum); if let Some((expected_checksum, actual_checksum)) = expected_checksum.zip(checksum) { if actual_checksum != expected_checksum { diff --git a/gix-index/src/extension/link.rs b/gix-index/src/extension/link.rs index c49bec34a3f..722cbd17971 100644 --- a/gix-index/src/extension/link.rs +++ b/gix-index/src/extension/link.rs @@ -43,7 +43,7 @@ pub(crate) fn decode(data: &[u8], object_hash: gix_hash::Kind) -> Result Option { data = rest; *stage = Some(Stage { mode: *mode, - id: ObjectId::from(hash), + id: ObjectId::from_bytes_or_panic(hash), }); } diff --git a/gix-index/src/extension/tree/decode.rs b/gix-index/src/extension/tree/decode.rs index 82221b48c07..530c65d8ff2 100644 --- a/gix-index/src/extension/tree/decode.rs +++ b/gix-index/src/extension/tree/decode.rs @@ -29,7 +29,7 @@ fn one_recursive(data: &[u8], hash_len: usize) -> Option<(Tree, &[u8])> { let (id, mut data) = if num_entries >= 0 { let (hash, data) = split_at_pos(data, hash_len)?; - (ObjectId::from(hash), data) + (ObjectId::from_bytes_or_panic(hash), data) } else { ( ObjectId::null(gix_hash::Kind::from_hex_len(hash_len * 2).expect("valid hex_len")), diff --git a/gix-index/src/extension/untracked_cache.rs b/gix-index/src/extension/untracked_cache.rs index a9c95eb1f34..f3b2d8afdcb 100644 --- a/gix-index/src/extension/untracked_cache.rs +++ b/gix-index/src/extension/untracked_cache.rs @@ -100,7 +100,7 @@ pub fn decode(data: &[u8], object_hash: gix_hash::Kind) -> Option Option<(OidStat, &[u8])> { Some(( OidStat { stat, - id: ObjectId::from(hash), + id: ObjectId::from_bytes_or_panic(hash), }, data, )) diff --git a/gix-index/src/file/init.rs b/gix-index/src/file/init.rs index ed13bed6e9b..88dd86af9ac 100644 --- a/gix-index/src/file/init.rs +++ b/gix-index/src/file/init.rs @@ -71,7 +71,8 @@ impl File { // index files, we choose more safety here just like git does and don't even try to decode the index if the hashes // don't match. // Thanks to `skip_hash`, we can get performance and it's under caller control, at the cost of some safety. - let expected = gix_hash::ObjectId::from(&data[data.len() - object_hash.len_in_bytes()..]); + let expected = + gix_hash::ObjectId::from_bytes_or_panic(&data[data.len() - object_hash.len_in_bytes()..]); if !expected.is_null() { let _span = gix_features::trace::detail!("gix::open_index::hash_index", path = ?path); let meta = file.metadata()?; diff --git a/gix-pack/src/data/entry/decode.rs b/gix-pack/src/data/entry/decode.rs index b8132031920..37b8560ac03 100644 --- a/gix-pack/src/data/entry/decode.rs +++ b/gix-pack/src/data/entry/decode.rs @@ -27,7 +27,7 @@ impl data::Entry { } REF_DELTA => { let delta = RefDelta { - base_id: gix_hash::ObjectId::from(&d[consumed..][..hash_len]), + base_id: gix_hash::ObjectId::from_bytes_or_panic(&d[consumed..][..hash_len]), }; consumed += hash_len; delta @@ -69,7 +69,7 @@ impl data::Entry { r.read_exact(hash)?; #[allow(clippy::redundant_slicing)] let delta = RefDelta { - base_id: gix_hash::ObjectId::from(&hash[..]), + base_id: gix_hash::ObjectId::from_bytes_or_panic(&hash[..]), }; consumed += hash_len; delta diff --git a/gix-pack/src/data/file/verify.rs b/gix-pack/src/data/file/verify.rs index 76d47de0bc3..ea99144a1e9 100644 --- a/gix-pack/src/data/file/verify.rs +++ b/gix-pack/src/data/file/verify.rs @@ -14,7 +14,7 @@ pub mod checksum { impl File { /// The checksum in the trailer of this pack data file pub fn checksum(&self) -> gix_hash::ObjectId { - gix_hash::ObjectId::from(&self.data[self.data.len() - self.hash_len..]) + gix_hash::ObjectId::from_bytes_or_panic(&self.data[self.data.len() - self.hash_len..]) } /// Verifies that the checksum of the packfile over all bytes preceding it indeed matches the actual checksum, diff --git a/gix-pack/src/index/access.rs b/gix-pack/src/index/access.rs index 3b748e11008..618e5dcb396 100644 --- a/gix-pack/src/index/access.rs +++ b/gix-pack/src/index/access.rs @@ -36,7 +36,7 @@ impl index::File { .map(|c| { let (ofs, oid) = c.split_at(N32_SIZE); Entry { - oid: gix_hash::ObjectId::from(oid), + oid: gix_hash::ObjectId::from_bytes_or_panic(oid), pack_offset: crate::read_u32(ofs) as u64, crc32: None, } @@ -55,7 +55,7 @@ impl index::File { ) .take(self.num_objects as usize) .map(move |(oid, crc32, ofs32)| Entry { - oid: gix_hash::ObjectId::from(oid), + oid: gix_hash::ObjectId::from_bytes_or_panic(oid), pack_offset: self.pack_offset_from_offset_v2(ofs32, pack64_offset), crc32: Some(crate::read_u32(crc32)), }), diff --git a/gix-pack/src/index/verify.rs b/gix-pack/src/index/verify.rs index 343a647b4f0..0ee4259a8fc 100644 --- a/gix-pack/src/index/verify.rs +++ b/gix-pack/src/index/verify.rs @@ -121,7 +121,7 @@ impl index::File { /// /// It's a hash over all bytes of the index. pub fn index_checksum(&self) -> gix_hash::ObjectId { - gix_hash::ObjectId::from(&self.data[self.data.len() - self.hash_len..]) + gix_hash::ObjectId::from_bytes_or_panic(&self.data[self.data.len() - self.hash_len..]) } /// Returns the hash of the pack data file that this index file corresponds to. @@ -129,7 +129,7 @@ impl index::File { /// It should [`crate::data::File::checksum()`] of the corresponding pack data file. pub fn pack_checksum(&self) -> gix_hash::ObjectId { let from = self.data.len() - self.hash_len * 2; - gix_hash::ObjectId::from(&self.data[from..][..self.hash_len]) + gix_hash::ObjectId::from_bytes_or_panic(&self.data[from..][..self.hash_len]) } /// Validate that our [`index_checksum()`][index::File::index_checksum()] matches the actual contents diff --git a/gix-pack/src/multi_index/access.rs b/gix-pack/src/multi_index/access.rs index 0150c720660..255764aca20 100644 --- a/gix-pack/src/multi_index/access.rs +++ b/gix-pack/src/multi_index/access.rs @@ -51,7 +51,7 @@ impl File { /// /// It can be used to validate it didn't change after creation. pub fn checksum(&self) -> gix_hash::ObjectId { - gix_hash::ObjectId::from(&self.data[self.data.len() - self.hash_len..]) + gix_hash::ObjectId::from_bytes_or_panic(&self.data[self.data.len() - self.hash_len..]) } /// Return all names of index files (`*.idx`) whose objects we contain. /// From d38d1cc1aa3402629a0f182324e3310e730ce3f2 Mon Sep 17 00:00:00 2001 From: Sebastian Thiel Date: Fri, 29 Dec 2023 09:02:25 +0100 Subject: [PATCH 3/9] thanks clippy --- gix-config/src/parse/section/header.rs | 36 +++++++++---------- gix-odb/tests/odb/mod.rs | 1 - gix-packetline/src/read/sidebands/async_io.rs | 36 +++++++++---------- gix-protocol/tests/fetch/response.rs | 3 +- gix-ref/src/store/file/find.rs | 5 ++- .../connection/fetch/update_refs/tests.rs | 4 +-- gix/src/remote/url/scheme_permission.rs | 2 +- 7 files changed, 43 insertions(+), 44 deletions(-) diff --git a/gix-config/src/parse/section/header.rs b/gix-config/src/parse/section/header.rs index 14c2519cf2d..ad1288f3fe0 100644 --- a/gix-config/src/parse/section/header.rs +++ b/gix-config/src/parse/section/header.rs @@ -59,24 +59,6 @@ fn validated_name(name: Cow<'_, BStr>) -> Result, Error> { .ok_or(Error::InvalidName) } -#[cfg(test)] -mod tests { - use super::*; - - #[test] - fn empty_header_names_are_legal() { - assert!(Header::new("", None).is_ok(), "yes, git allows this, so do we"); - } - - #[test] - fn empty_header_sub_names_are_legal() { - assert!( - Header::new("remote", Some(Cow::Borrowed("".into()))).is_ok(), - "yes, git allows this, so do we" - ); - } -} - impl Header<'_> { ///Return true if this is a header like `[legacy.subsection]`, or false otherwise. pub fn is_legacy(&self) -> bool { @@ -178,3 +160,21 @@ impl<'a> From> for Event<'a> { Event::SectionHeader(header) } } + +#[cfg(test)] +mod tests { + use super::*; + + #[test] + fn empty_header_names_are_legal() { + assert!(Header::new("", None).is_ok(), "yes, git allows this, so do we"); + } + + #[test] + fn empty_header_sub_names_are_legal() { + assert!( + Header::new("remote", Some(Cow::Borrowed("".into()))).is_ok(), + "yes, git allows this, so do we" + ); + } +} diff --git a/gix-odb/tests/odb/mod.rs b/gix-odb/tests/odb/mod.rs index 1a914ba4c64..6e4b1506bae 100644 --- a/gix-odb/tests/odb/mod.rs +++ b/gix-odb/tests/odb/mod.rs @@ -1,6 +1,5 @@ use gix_hash::ObjectId; use gix_testtools::fixture_path_standalone; -pub use gix_testtools::{fixture_path, scripted_fixture_read_only}; pub fn hex_to_id(hex: &str) -> ObjectId { ObjectId::from_hex(hex.as_bytes()).expect("40 bytes hex") diff --git a/gix-packetline/src/read/sidebands/async_io.rs b/gix-packetline/src/read/sidebands/async_io.rs index 55c7bce26e2..6c53e922c1f 100644 --- a/gix-packetline/src/read/sidebands/async_io.rs +++ b/gix-packetline/src/read/sidebands/async_io.rs @@ -72,24 +72,6 @@ enum State<'a, T> { #[allow(unsafe_code, clippy::non_send_fields_in_send_ty)] unsafe impl<'a, T> Send for State<'a, T> where T: Send {} -#[cfg(test)] -mod tests { - use super::*; - fn receiver(_i: T) {} - - /// We want to declare items containing pointers of `StreamingPeekableIter` `Send` as well, so it must be `Send` itself. - #[test] - fn streaming_peekable_iter_is_send() { - receiver(StreamingPeekableIter::new(Vec::::new(), &[], false)); - } - - #[test] - fn state_is_send() { - let mut s = StreamingPeekableIter::new(Vec::::new(), &[], false); - receiver(State::Idle { parent: Some(&mut s) }); - } -} - impl<'a, T, F> WithSidebands<'a, T, F> where T: AsyncRead + Unpin, @@ -381,3 +363,21 @@ where Poll::Ready(Ok(nread)) } } + +#[cfg(test)] +mod tests { + use super::*; + fn receiver(_i: T) {} + + /// We want to declare items containing pointers of `StreamingPeekableIter` `Send` as well, so it must be `Send` itself. + #[test] + fn streaming_peekable_iter_is_send() { + receiver(StreamingPeekableIter::new(Vec::::new(), &[], false)); + } + + #[test] + fn state_is_send() { + let mut s = StreamingPeekableIter::new(Vec::::new(), &[], false); + receiver(State::Idle { parent: Some(&mut s) }); + } +} diff --git a/gix-protocol/tests/fetch/response.rs b/gix-protocol/tests/fetch/response.rs index 58908dbf8d1..016f00386fe 100644 --- a/gix-protocol/tests/fetch/response.rs +++ b/gix-protocol/tests/fetch/response.rs @@ -317,7 +317,8 @@ mod v2 { assert_eq!(bytes_read, 1643, "should be able to read the whole pack"); assert_eq!(&buf[..4], b"PACK"); assert_eq!( - gix_hash::ObjectId::from(&buf[buf.len() - gix_hash::Kind::Sha1.len_in_bytes()..]).to_string(), + gix_hash::ObjectId::from_bytes_or_panic(&buf[buf.len() - gix_hash::Kind::Sha1.len_in_bytes()..]) + .to_string(), "f34c9be7e0c3ef2c3ed7c62cc7791dbf6dc5ec9a" ); Ok(()) diff --git a/gix-ref/src/store/file/find.rs b/gix-ref/src/store/file/find.rs index b9cf6543a4b..0aae19e15eb 100644 --- a/gix-ref/src/store/file/find.rs +++ b/gix-ref/src/store/file/find.rs @@ -45,7 +45,7 @@ impl file::Store { Error: From, { self.find_one_with_verified_input(partial.try_into()?, None) - .map(|r| r.map(|r| r.try_into().expect("only loose refs are found without pack"))) + .map(|r| r.map(Into::into)) } /// Similar to [`file::Store::find()`], but allows to pass a snapshotted packed buffer instead. @@ -267,8 +267,7 @@ pub mod existing { Name: TryInto<&'a PartialNameRef, Error = E>, crate::name::Error: From, { - self.find_existing_inner(partial, None) - .map(|r| r.try_into().expect("always loose without packed")) + self.find_existing_inner(partial, None).map(Into::into) } /// Similar to [`file::Store::find()`] but a non-existing ref is treated as error. diff --git a/gix/src/remote/connection/fetch/update_refs/tests.rs b/gix/src/remote/connection/fetch/update_refs/tests.rs index 27501720d0f..a56e1218043 100644 --- a/gix/src/remote/connection/fetch/update_refs/tests.rs +++ b/gix/src/remote/connection/fetch/update_refs/tests.rs @@ -605,7 +605,7 @@ mod update { let (mut mappings, specs) = mapping_from_spec("refs/heads/symbolic:refs/remotes/origin/new", &repo); mappings.push(Mapping { remote: Source::Ref(gix_protocol::handshake::Ref::Direct { - full_ref_name: "refs/heads/main".try_into().unwrap(), + full_ref_name: "refs/heads/main".into(), object: hex_to_id("f99771fe6a1b535783af3163eba95a927aae21d5"), }), local: Some("refs/heads/symbolic".into()), @@ -728,7 +728,7 @@ mod update { let (mut mappings, specs) = mapping_from_spec("HEAD:refs/remotes/origin/new-HEAD", &repo); mappings.push(Mapping { remote: Source::Ref(gix_protocol::handshake::Ref::Direct { - full_ref_name: "refs/heads/main".try_into().unwrap(), + full_ref_name: "refs/heads/main".into(), object: hex_to_id("f99771fe6a1b535783af3163eba95a927aae21d5"), }), local: Some("refs/remotes/origin/main".into()), diff --git a/gix/src/remote/url/scheme_permission.rs b/gix/src/remote/url/scheme_permission.rs index ddb87e111ad..eed7be6185c 100644 --- a/gix/src/remote/url/scheme_permission.rs +++ b/gix/src/remote/url/scheme_permission.rs @@ -72,7 +72,7 @@ impl SchemePermission { scheme .to_str() .ok() - .and_then(|scheme| gix_url::Scheme::try_from(scheme).ok().map(|scheme| (section, scheme))) + .map(|scheme| (section, gix_url::Scheme::from(scheme))) }) }) { if let Some(value) = section From 29c3f938664a0d721873bfb345eeba01b3c7593d Mon Sep 17 00:00:00 2001 From: Sebastian Thiel Date: Fri, 29 Dec 2023 09:04:53 +0100 Subject: [PATCH 4/9] upgrade `crosstermion`, `owo-colors`, `prodash` and `owo-colors` --- Cargo.lock | 48 +++++++++++++++++++++++++----------------------- Cargo.toml | 6 +++--- 2 files changed, 28 insertions(+), 26 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 5baf890dad4..8f832028513 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -772,9 +772,9 @@ dependencies = [ [[package]] name = "crosstermion" -version = "0.12.1" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4fb1963117df5f418acb1b1c9214992e587c9a576158a7177e38fbcf33bf9ea" +checksum = "400415b86f4dc01b9e4e129e822dad900e546287319da7ab229654978d3e07e1" dependencies = [ "ansiterm", "async-channel 2.1.1", @@ -1251,7 +1251,7 @@ dependencies = [ "is-terminal", "once_cell", "owo-colors", - "prodash 27.0.0", + "prodash 28.0.0", "serde_derive", "tabled", "time", @@ -1357,7 +1357,7 @@ dependencies = [ "is_ci", "once_cell", "parking_lot", - "prodash 27.0.0", + "prodash 28.0.0", "regex", "reqwest", "serde", @@ -1705,7 +1705,7 @@ dependencies = [ "libc", "once_cell", "parking_lot", - "prodash 27.0.0", + "prodash 28.0.0", "sha1", "sha1_smol", "thiserror", @@ -3127,15 +3127,6 @@ dependencies = [ "either", ] -[[package]] -name = "itertools" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1c173a5686ce8bfa551b3563d0c2170bf24ca44da99c7ca4bfdab5418c3fe57" -dependencies = [ - "either", -] - [[package]] name = "itertools" version = "0.12.0" @@ -3604,9 +3595,9 @@ checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" [[package]] name = "owo-colors" -version = "3.5.0" +version = "4.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1b04fb49957986fdce4d6ee7a65027d55d4b6d2265e5848bbb507b58ccfdb6f" +checksum = "caff54706df99d2a78a5a4e3455ff45448d81ef1bb63c22cd14052ca0e993a3f" [[package]] name = "papergrid" @@ -3796,9 +3787,9 @@ checksum = "9516b775656bc3e8985e19cd4b8c0c0de045095074e453d2c0a513b5f978392d" [[package]] name = "prodash" -version = "27.0.0" +version = "28.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7309f1ec8d18f40e3b874087c413ba69566bb7212e6d4cfdd25758e51cb0068d" +checksum = "744a264d26b88a6a7e37cbad97953fa233b94d585236310bcbc88474b4092d79" dependencies = [ "async-io 2.2.1", "bytesize", @@ -3874,17 +3865,18 @@ dependencies = [ [[package]] name = "ratatui" -version = "0.24.0" +version = "0.25.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ebc917cfb527a566c37ecb94c7e3fd098353516fb4eb6bea17015ade0182425" +checksum = "a5659e52e4ba6e07b2dad9f1158f578ef84a73762625ddb51536019f34d180eb" dependencies = [ "bitflags 2.4.0", "cassowary", "crossterm", "indoc", - "itertools 0.11.0", + "itertools 0.12.0", "lru", "paste", + "stability", "strum", "unicode-segmentation", "unicode-width", @@ -4413,6 +4405,16 @@ version = "0.9.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" +[[package]] +name = "stability" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ebd1b177894da2a2d9120208c3386066af06a488255caabc5de8ddca22dbc3ce" +dependencies = [ + "quote", + "syn 1.0.109", +] + [[package]] name = "static_assertions" version = "1.1.0" @@ -4849,9 +4851,9 @@ dependencies = [ [[package]] name = "tui-react" -version = "0.21.0" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a93d64ce9d859e49cba06be4904ecda0fb94b1e22f51e027dc44c122bea9ed5b" +checksum = "2ffacd73e2d4666c1aec4e85ab986354909e276f1dbff5c75f86bcebce566511" dependencies = [ "log", "ratatui", diff --git a/Cargo.toml b/Cargo.toml index d88dd416297..6b39d76f281 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -175,7 +175,7 @@ clap_complete = "4.4.3" prodash = { workspace = true, optional = true } is-terminal = { version = "0.4.0", optional = true } env_logger = { version = "0.10.0", default-features = false } -crosstermion = { version = "0.12.0", optional = true, default-features = false } +crosstermion = { version = "0.13.0", optional = true, default-features = false } futures-lite = { workspace = true, optional = true } # for 'tracing' @@ -184,7 +184,7 @@ tracing-subscriber = { version = "0.3.17", optional = true } tracing = { version = "0.1.37", optional = true } # for progress -owo-colors = "3.5.0" +owo-colors = "4.0.0" tabled = { version = "0.10.0", default-features = false } # Avoid pre-compiled binaries, see https://github.com/serde-rs/serde/issues/2538 and https://github.com/serde-rs/serde/pull/2590 @@ -298,7 +298,7 @@ members = [ ] [workspace.dependencies] -prodash = { version = "27.0.0", default-features = false } +prodash = { version = "28.0.0", default-features = false } futures-lite = { version = "2.1.0", default-features = false, features = ["std"] } faster-hex = { version = "0.9.0" } From e06ab59e1377aeeef83d107c41c0d1d144571153 Mon Sep 17 00:00:00 2001 From: Sebastian Thiel Date: Fri, 29 Dec 2023 09:33:32 +0100 Subject: [PATCH 5/9] upgrade sysinfo --- Cargo.lock | 29 ++++++++++++++++++++++++----- gitoxide-core/Cargo.toml | 2 +- gitoxide-core/src/corpus/db.rs | 4 ++-- 3 files changed, 27 insertions(+), 8 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 8f832028513..d37358e3257 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3194,9 +3194,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] name = "libc" -version = "0.2.149" +version = "0.2.151" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a08173bc88b7955d1b3145aa561539096c421ac8debde8cbc3612ec635fee29b" +checksum = "302d7ab3130588088d277783b1e2d2e10c9e9e4a16dd9050e6ec93fb3e7048f4" [[package]] name = "libsqlite3-sys" @@ -4479,16 +4479,16 @@ dependencies = [ [[package]] name = "sysinfo" -version = "0.29.10" +version = "0.30.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a18d114d420ada3a891e6bc8e96a2023402203296a47cdd65083377dad18ba5" +checksum = "c856f6ee1d0241d2ebaee960aaad07080afb4daf6bdfa3b250ace3cf1b81355d" dependencies = [ "cfg-if", "core-foundation-sys", "libc", "ntapi", "once_cell", - "winapi", + "windows 0.51.1", ] [[package]] @@ -5146,6 +5146,25 @@ dependencies = [ "windows-targets 0.48.5", ] +[[package]] +name = "windows" +version = "0.51.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca229916c5ee38c2f2bc1e9d8f04df975b4bd93f9955dc69fabb5d91270045c9" +dependencies = [ + "windows-core", + "windows-targets 0.48.5", +] + +[[package]] +name = "windows-core" +version = "0.51.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1f8cf84f35d2db49a46868f947758c7a1138116f7fac3bc844f43ade1292e64" +dependencies = [ + "windows-targets 0.48.5", +] + [[package]] name = "windows-sys" version = "0.48.0" diff --git a/gitoxide-core/Cargo.toml b/gitoxide-core/Cargo.toml index b5edaf19dc7..0f4fcbe6fd5 100644 --- a/gitoxide-core/Cargo.toml +++ b/gitoxide-core/Cargo.toml @@ -79,7 +79,7 @@ rusqlite = { version = "0.30.0", optional = true, features = ["bundled"] } # for 'corpus' parking_lot = { version = "0.12.1", optional = true } -sysinfo = { version = "0.29.2", optional = true, default-features = false } +sysinfo = { version = "0.30.1", optional = true, default-features = false } serde_json = { version = "1.0.65", optional = true } tracing-forest = { version = "0.1.5", features = ["serde"], optional = true } tracing-subscriber = { version = "0.3.17", optional = true } diff --git a/gitoxide-core/src/corpus/db.rs b/gitoxide-core/src/corpus/db.rs index f56275bd4c3..b2e88583ea8 100644 --- a/gitoxide-core/src/corpus/db.rs +++ b/gitoxide-core/src/corpus/db.rs @@ -3,7 +3,7 @@ use std::path::{Path, PathBuf}; use anyhow::{bail, Context}; use bytesize::ByteSize; use rusqlite::{params, OptionalExtension}; -use sysinfo::{CpuExt, CpuRefreshKind, RefreshKind, SystemExt}; +use sysinfo::{CpuRefreshKind, RefreshKind}; use crate::corpus::{Engine, Run}; @@ -152,7 +152,7 @@ impl Engine { sysinfo::System::new_with_specifics(RefreshKind::new().with_cpu(CpuRefreshKind::new().with_frequency())); let cpu = &sys.cpus()[0]; let vendor = Some(cpu.vendor_id().to_owned()); - let host = sys.host_name(); + let host = sysinfo::System::host_name(); let brand = Some(cpu.brand().to_owned()); Ok(self.con.query_row( "INSERT INTO runner (vendor, brand, host_name) VALUES (?1, ?2, ?3) \ From 768d0e030dbfcfbfc74d71ab1d0791c34095e948 Mon Sep 17 00:00:00 2001 From: Sebastian Thiel Date: Fri, 29 Dec 2023 09:51:24 +0100 Subject: [PATCH 6/9] upgrade `windows` to v0.52 --- Cargo.lock | 23 ++++++++++++++-- gix-sec/Cargo.toml | 2 +- gix-sec/src/identity.rs | 61 ++++++++++++++++++++--------------------- 3 files changed, 51 insertions(+), 35 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index d37358e3257..e9b7a2e2733 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2398,7 +2398,7 @@ dependencies = [ "libc", "serde", "tempfile", - "windows 0.48.0", + "windows 0.52.0", ] [[package]] @@ -5152,10 +5152,20 @@ version = "0.51.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ca229916c5ee38c2f2bc1e9d8f04df975b4bd93f9955dc69fabb5d91270045c9" dependencies = [ - "windows-core", + "windows-core 0.51.1", "windows-targets 0.48.5", ] +[[package]] +name = "windows" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e48a53791691ab099e5e2ad123536d0fff50652600abaf43bbf952894110d0be" +dependencies = [ + "windows-core 0.52.0", + "windows-targets 0.52.0", +] + [[package]] name = "windows-core" version = "0.51.1" @@ -5165,6 +5175,15 @@ dependencies = [ "windows-targets 0.48.5", ] +[[package]] +name = "windows-core" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" +dependencies = [ + "windows-targets 0.52.0", +] + [[package]] name = "windows-sys" version = "0.48.0" diff --git a/gix-sec/Cargo.toml b/gix-sec/Cargo.toml index 12b4ae02d80..c96fb28656c 100644 --- a/gix-sec/Cargo.toml +++ b/gix-sec/Cargo.toml @@ -27,7 +27,7 @@ libc = "0.2.123" [target.'cfg(windows)'.dependencies] gix-path = { version = "^0.10.1", path = "../gix-path" } -windows = { version = "0.48", features = [ +windows = { version = "0.52.0", features = [ "Win32_Foundation", "Win32_Security_Authorization", "Win32_Storage_FileSystem", diff --git a/gix-sec/src/identity.rs b/gix-sec/src/identity.rs index 87c697fc494..9f660324697 100644 --- a/gix-sec/src/identity.rs +++ b/gix-sec/src/identity.rs @@ -62,17 +62,14 @@ mod impl_ { use windows::{ core::{Error, PCWSTR}, Win32::{ - Foundation::{CloseHandle, BOOL, HANDLE, HLOCAL, PSID}, + Foundation::{CloseHandle, LocalFree, BOOL, HANDLE, HLOCAL, PSID}, Security::{ Authorization::{GetNamedSecurityInfoW, SE_FILE_OBJECT}, CheckTokenMembership, EqualSid, GetTokenInformation, IsWellKnownSid, TokenOwner, WinBuiltinAdministratorsSid, OWNER_SECURITY_INFORMATION, PSECURITY_DESCRIPTOR, TOKEN_OWNER, TOKEN_QUERY, }, - System::{ - Memory::LocalFree, - Threading::{GetCurrentProcess, GetCurrentThread, OpenProcessToken, OpenThreadToken}, - }, + System::Threading::{GetCurrentProcess, GetCurrentThread, OpenProcessToken, OpenThreadToken}, }, }; @@ -113,43 +110,43 @@ mod impl_ { let mut token = HANDLE::default(); // Use the current thread token if possible, otherwise open the process token OpenThreadToken(GetCurrentThread(), TOKEN_QUERY, true, &mut token) - .ok() - .or_else(|_| OpenProcessToken(GetCurrentProcess(), TOKEN_QUERY, &mut token).ok())?; + .or_else(|_| OpenProcessToken(GetCurrentProcess(), TOKEN_QUERY, &mut token))?; let mut buffer_size = 0; let mut buffer = Vec::::new(); - GetTokenInformation(token, TokenOwner, None, 0, &mut buffer_size); + GetTokenInformation(token, TokenOwner, None, 0, &mut buffer_size).ok(); if buffer_size != 0 { buffer.resize(buffer_size as usize, 0); - if GetTokenInformation( + match GetTokenInformation( token, TokenOwner, Some(buffer.as_mut_ptr() as *mut std::ffi::c_void), buffer_size, &mut buffer_size, - ) - .as_bool() - { - let token_owner = buffer.as_ptr() as *const TOKEN_OWNER; - let token_owner = (*token_owner).Owner; - - is_owned = EqualSid(folder_owner, token_owner).as_bool(); - - // Admin-group owned folders are considered owned by the current user, if they are in the admin group - if !is_owned && IsWellKnownSid(token_owner, WinBuiltinAdministratorsSid).as_bool() { - let mut is_member = BOOL::default(); - // TODO: re-use the handle - match CheckTokenMembership(HANDLE::default(), token_owner, &mut is_member).ok() { - Err(e) => err_msg = Some(format!("Couldn't check if user is an administrator: {}", e)), - Ok(()) => is_owned = is_member.as_bool(), + ) { + Ok(()) => { + let token_owner = buffer.as_ptr() as *const TOKEN_OWNER; + let token_owner = (*token_owner).Owner; + + is_owned = EqualSid(folder_owner, token_owner).is_ok(); + + // Admin-group owned folders are considered owned by the current user, if they are in the admin group + if !is_owned && IsWellKnownSid(token_owner, WinBuiltinAdministratorsSid).as_bool() { + let mut is_member = BOOL::default(); + // TODO: re-use the handle + match CheckTokenMembership(HANDLE::default(), token_owner, &mut is_member) { + Err(e) => { + err_msg = Some(format!("Couldn't check if user is an administrator: {}", e)) + } + Ok(()) => is_owned = is_member.as_bool(), + } } } - } else { - err_msg = format!( - "Couldn't get actual token information for current process with err: {}", - Error::from_win32() - ) - .into(); + Err(err) => { + err_msg = + format!("Couldn't get actual token information for current process with err: {err}",) + .into(); + } } } else { err_msg = format!( @@ -158,7 +155,7 @@ mod impl_ { ) .into(); } - CloseHandle(token); + CloseHandle(token)?; } else { err_msg = format!( "Couldn't get security information for path '{}' with err {}", @@ -167,7 +164,7 @@ mod impl_ { ) .into(); } - LocalFree(HLOCAL(pdescriptor.0 as isize)).ok(); + LocalFree(HLOCAL(pdescriptor.0)).ok(); } err_msg.map(|msg| Err(err(msg))).unwrap_or(Ok(is_owned)) From 29c59045425dcfc23392e0b766d6d6ca399b00a4 Mon Sep 17 00:00:00 2001 From: Sebastian Thiel Date: Fri, 29 Dec 2023 09:52:26 +0100 Subject: [PATCH 7/9] upgrade testtools dependencies to latest feasible version --- Cargo.lock | 416 +++++++++++++++++++++++------------------ justfile | 4 +- tests/tools/Cargo.toml | 8 +- tests/tools/src/lib.rs | 10 +- 4 files changed, 251 insertions(+), 187 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index e9b7a2e2733..28b99a4df6f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -450,6 +450,12 @@ dependencies = [ "serde", ] +[[package]] +name = "byteyarn" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a7534301c0ea17abb4db06d75efc7b4b0fa360fce8e175a4330d721c71c942ff" + [[package]] name = "cassowary" version = "0.3.0" @@ -1311,7 +1317,7 @@ dependencies = [ "gix-archive", "gix-attributes 0.20.1", "gix-command", - "gix-commitgraph", + "gix-commitgraph 0.22.1", "gix-config", "gix-credentials", "gix-date 0.8.1", @@ -1339,7 +1345,7 @@ dependencies = [ "gix-ref 0.39.1", "gix-refspec", "gix-revision", - "gix-revwalk", + "gix-revwalk 0.10.0", "gix-sec 0.10.1", "gix-status", "gix-submodule", @@ -1371,16 +1377,16 @@ dependencies = [ [[package]] name = "gix-actor" -version = "0.20.0" +version = "0.27.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "848efa0f1210cea8638f95691c82a46f98a74b9e3524f01d4955ebc25a8f84f3" +checksum = "08c60e982c5290897122d4e2622447f014a2dadd5a18cb73d50bb91b31645e27" dependencies = [ "bstr", "btoi", - "gix-date 0.5.1", + "gix-date 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", "itoa", - "nom", "thiserror", + "winnow", ] [[package]] @@ -1401,6 +1407,20 @@ dependencies = [ "winnow", ] +[[package]] +name = "gix-actor" +version = "0.28.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2eadca029ef716b4378f7afb19f7ee101fde9e58ba1f1445971315ac866db417" +dependencies = [ + "bstr", + "btoi", + "gix-date 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", + "itoa", + "thiserror", + "winnow", +] + [[package]] name = "gix-archive" version = "0.7.0" @@ -1426,16 +1446,16 @@ dependencies = [ [[package]] name = "gix-attributes" -version = "0.12.0" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3015baa01ad2122fbcaab7863c857a603eb7b7ec12ac8141207c42c6439805e2" +checksum = "2451665e70709ba4753b623ef97511ee98c4a73816b2c5b5df25678d607ed820" dependencies = [ "bstr", - "gix-glob 0.7.0", - "gix-path 0.8.4", - "gix-quote 0.4.7", - "kstring", - "log", + "byteyarn", + "gix-glob 0.13.0", + "gix-path 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)", + "gix-quote 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", + "gix-trace 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", "smallvec", "thiserror", "unicode-bom", @@ -1484,6 +1504,15 @@ dependencies = [ "thiserror", ] +[[package]] +name = "gix-chunk" +version = "0.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d411ecd9b558b0c20b3252b7e409eec48eabc41d18324954fe526bac6e2db55f" +dependencies = [ + "thiserror", +] + [[package]] name = "gix-command" version = "0.3.0" @@ -1495,13 +1524,27 @@ dependencies = [ "shell-words", ] +[[package]] +name = "gix-commitgraph" +version = "0.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e75a975ee22cf0a002bfe9b5d5cb3d2a88e263a8a178cd7509133cff10f4df8a" +dependencies = [ + "bstr", + "gix-chunk 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)", + "gix-features 0.35.0", + "gix-hash 0.13.2", + "memmap2 0.7.1", + "thiserror", +] + [[package]] name = "gix-commitgraph" version = "0.22.1" dependencies = [ "bstr", "document-features", - "gix-chunk", + "gix-chunk 0.4.5", "gix-date 0.8.1", "gix-features 0.36.1", "gix-hash 0.13.3", @@ -1580,12 +1623,15 @@ dependencies = [ [[package]] name = "gix-date" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc164145670e9130a60a21670d9b6f0f4f8de04e5dd256c51fa5a0340c625902" +version = "0.8.1" dependencies = [ "bstr", + "document-features", + "gix-hash 0.13.3", + "gix-testtools", "itoa", + "once_cell", + "serde", "thiserror", "time", ] @@ -1593,14 +1639,11 @@ dependencies = [ [[package]] name = "gix-date" version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "468dfbe411f335f01525a1352271727f8e7772075a93fa747260f502086b30be" dependencies = [ "bstr", - "document-features", - "gix-hash 0.13.3", - "gix-testtools", "itoa", - "once_cell", - "serde", "thiserror", "time", ] @@ -1644,16 +1687,16 @@ dependencies = [ [[package]] name = "gix-discover" -version = "0.18.1" +version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a6b61363e63e7cdaa3e6f96acb0257ebdb3d8883e21eba5930c99f07f0a5fc0" +checksum = "a45d5cf0321178883e38705ab2b098f625d609a7d4c391b33ac952eff2c490f2" dependencies = [ "bstr", "dunce", - "gix-hash 0.11.4", - "gix-path 0.8.4", - "gix-ref 0.29.1", - "gix-sec 0.8.4", + "gix-hash 0.13.2", + "gix-path 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)", + "gix-ref 0.38.0", + "gix-sec 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)", "thiserror", ] @@ -1677,15 +1720,15 @@ dependencies = [ [[package]] name = "gix-features" -version = "0.29.0" +version = "0.35.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf69b0f5c701cc3ae22d3204b671907668f6437ca88862d355eaf9bc47a4f897" +checksum = "9b9ff423ae4983f762659040d13dd7a5defbd54b6a04ac3cc7347741cec828cd" dependencies = [ - "gix-hash 0.11.4", + "gix-hash 0.13.2", + "gix-trace 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", "libc", - "prodash 23.1.2", + "prodash 26.2.2", "sha1_smol", - "walkdir", ] [[package]] @@ -1721,6 +1764,9 @@ dependencies = [ "gix-hash 0.13.2", "gix-trace 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", "libc", + "prodash 26.2.2", + "sha1_smol", + "walkdir", ] [[package]] @@ -1751,11 +1797,11 @@ dependencies = [ [[package]] name = "gix-fs" -version = "0.1.1" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b37a1832f691fdc09910bd267f9a2e413737c1f9ec68c6e31f9e802616278a9" +checksum = "09815faba62fe9b32d918b75a554686c98e43f7d48c43a80df58eb718e5c6635" dependencies = [ - "gix-features 0.29.0", + "gix-features 0.35.0", ] [[package]] @@ -1789,14 +1835,14 @@ dependencies = [ [[package]] name = "gix-glob" -version = "0.7.0" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c07c98204529ac3f24b34754540a852593d2a4c7349008df389240266627a72a" +checksum = "a9d76e85f11251dcf751d2c5e918a14f562db5be6f727fd24775245653e9b19d" dependencies = [ "bitflags 2.4.0", "bstr", - "gix-features 0.29.0", - "gix-path 0.8.4", + "gix-features 0.35.0", + "gix-path 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1812,16 +1858,6 @@ dependencies = [ "serde", ] -[[package]] -name = "gix-hash" -version = "0.11.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b422ff2ad9a0628baaad6da468cf05385bf3f5ab495ad5a33cce99b9f41092f" -dependencies = [ - "hex", - "thiserror", -] - [[package]] name = "gix-hash" version = "0.13.2" @@ -1846,11 +1882,9 @@ dependencies = [ [[package]] name = "gix-hashtable" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "385f4ce6ecf3692d313ca3aa9bd3b3d8490de53368d6d94bedff3af8b6d9c58d" +version = "0.4.1" dependencies = [ - "gix-hash 0.11.4", + "gix-hash 0.13.3", "hashbrown 0.14.1", "parking_lot", ] @@ -1858,21 +1892,23 @@ dependencies = [ [[package]] name = "gix-hashtable" version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "feb61880816d7ec4f0b20606b498147d480860ddd9133ba542628df2f548d3ca" dependencies = [ - "gix-hash 0.13.3", + "gix-hash 0.13.2", "hashbrown 0.14.1", "parking_lot", ] [[package]] name = "gix-ignore" -version = "0.2.0" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba205b6df563e2906768bb22834c82eb46c5fdfcd86ba2c347270bc8309a05b2" +checksum = "b048f443a1f6b02da4205c34d2e287e3fd45d75e8e2f06cfb216630ea9bff5e3" dependencies = [ "bstr", - "gix-glob 0.7.0", - "gix-path 0.8.4", + "gix-glob 0.13.0", + "gix-path 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)", "unicode-bom", ] @@ -1892,22 +1928,23 @@ dependencies = [ [[package]] name = "gix-index" -version = "0.16.1" +version = "0.25.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f39c1ccc8f1912cbbd5191efc28dbc5f0d0598042aa56bc09427b7c34efab3ba" +checksum = "f54d63a9d13c13088f41f5a3accbec284e492ac8f4f707fcc307c139622e17b7" dependencies = [ "bitflags 2.4.0", "bstr", "btoi", "filetime", "gix-bitmap 0.2.7", - "gix-features 0.29.0", - "gix-hash 0.11.4", - "gix-lock 5.0.1", - "gix-object 0.29.2", - "gix-traverse 0.25.0", + "gix-features 0.35.0", + "gix-fs 0.7.0", + "gix-hash 0.13.2", + "gix-lock 10.0.0", + "gix-object 0.37.0", + "gix-traverse 0.33.0", "itoa", - "memmap2 0.5.10", + "memmap2 0.7.1", "smallvec", "thiserror", ] @@ -1956,11 +1993,22 @@ version = "0.0.0" [[package]] name = "gix-lock" -version = "5.0.1" +version = "10.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "47fc96fa8b6b6d33555021907c81eb3b27635daecf6e630630bdad44f8feaa95" +dependencies = [ + "gix-tempfile 10.0.0", + "gix-utils 0.1.5", + "thiserror", +] + +[[package]] +name = "gix-lock" +version = "11.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c693d7f05730fa74a7c467150adc7cea393518410c65f0672f80226b8111555" +checksum = "f4feb1dcd304fe384ddc22edba9dd56a42b0800032de6537728cea2f033a4f37" dependencies = [ - "gix-tempfile 5.0.3", + "gix-tempfile 11.0.1 (registry+https://github.com/rust-lang/crates.io-index)", "gix-utils 0.1.5", "thiserror", ] @@ -2003,13 +2051,13 @@ name = "gix-negotiate" version = "0.10.0" dependencies = [ "bitflags 2.4.0", - "gix-commitgraph", + "gix-commitgraph 0.22.1", "gix-date 0.8.1", "gix-hash 0.13.3", "gix-object 0.39.0", "gix-odb", "gix-ref 0.39.1", - "gix-revwalk", + "gix-revwalk 0.10.0", "gix-testtools", "smallvec", "thiserror", @@ -2021,21 +2069,40 @@ version = "0.0.0" [[package]] name = "gix-object" -version = "0.29.2" +version = "0.37.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d96bd620fd08accdd37f70b2183cfa0b001b4f1c6ade8b7f6e15cb3d9e261ce" +checksum = "1e7e19616c67967374137bae83e950e9b518a9ea8a605069bd6716ada357fd6f" dependencies = [ "bstr", "btoi", - "gix-actor 0.20.0", - "gix-features 0.29.0", - "gix-hash 0.11.4", - "gix-validate 0.7.7", - "hex", + "gix-actor 0.27.0", + "gix-date 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", + "gix-features 0.35.0", + "gix-hash 0.13.2", + "gix-validate 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", "itoa", - "nom", "smallvec", "thiserror", + "winnow", +] + +[[package]] +name = "gix-object" +version = "0.38.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "740f2a44267f58770a1cb3a3d01d14e67b089c7136c48d4bddbb3cfd2bf86a51" +dependencies = [ + "bstr", + "btoi", + "gix-actor 0.28.1 (registry+https://github.com/rust-lang/crates.io-index)", + "gix-date 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", + "gix-features 0.36.1 (registry+https://github.com/rust-lang/crates.io-index)", + "gix-hash 0.13.2", + "gix-validate 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", + "itoa", + "smallvec", + "thiserror", + "winnow", ] [[package]] @@ -2102,7 +2169,7 @@ version = "0.45.0" dependencies = [ "clru", "document-features", - "gix-chunk", + "gix-chunk 0.4.5", "gix-diff", "gix-features 0.36.1", "gix-hash 0.13.3", @@ -2170,26 +2237,26 @@ dependencies = [ [[package]] name = "gix-path" -version = "0.8.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18609c8cbec8508ea97c64938c33cd305b75dfc04a78d0c3b78b8b3fd618a77c" +version = "0.10.1" dependencies = [ "bstr", - "gix-trace 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", + "gix-trace 0.1.4", "home", "once_cell", + "tempfile", "thiserror", ] [[package]] name = "gix-path" version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d86d6fac2fabe07b67b7835f46d07571f68b11aa1aaecae94fe722ea4ef305e1" dependencies = [ "bstr", - "gix-trace 0.1.4", + "gix-trace 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", "home", "once_cell", - "tempfile", "thiserror", ] @@ -2249,9 +2316,7 @@ dependencies = [ [[package]] name = "gix-quote" -version = "0.4.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "475c86a97dd0127ba4465fbb239abac9ea10e68301470c9791a6dd5351cdc905" +version = "0.4.8" dependencies = [ "bstr", "btoi", @@ -2261,6 +2326,8 @@ dependencies = [ [[package]] name = "gix-quote" version = "0.4.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4f84845efa535468bc79c5a87b9d29219f1da0313c8ecf0365a5daa7e72786f2" dependencies = [ "bstr", "btoi", @@ -2273,22 +2340,23 @@ version = "0.0.0" [[package]] name = "gix-ref" -version = "0.29.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e03989e9d49954368e1b526578230fc7189d1634acdfbe79e9ba1de717e15d5" -dependencies = [ - "gix-actor 0.20.0", - "gix-features 0.29.0", - "gix-fs 0.1.1", - "gix-hash 0.11.4", - "gix-lock 5.0.1", - "gix-object 0.29.2", - "gix-path 0.8.4", - "gix-tempfile 5.0.3", - "gix-validate 0.7.7", - "memmap2 0.5.10", - "nom", +version = "0.38.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ec2f6d07ac88d2fb8007ee3fa3e801856fb9d82e7366ec0ca332eb2c9d74a52" +dependencies = [ + "gix-actor 0.28.1 (registry+https://github.com/rust-lang/crates.io-index)", + "gix-date 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", + "gix-features 0.36.1 (registry+https://github.com/rust-lang/crates.io-index)", + "gix-fs 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", + "gix-hash 0.13.2", + "gix-lock 11.0.0", + "gix-object 0.38.0", + "gix-path 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)", + "gix-tempfile 11.0.1 (registry+https://github.com/rust-lang/crates.io-index)", + "gix-validate 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", + "memmap2 0.7.1", "thiserror", + "winnow", ] [[package]] @@ -2350,24 +2418,39 @@ version = "0.24.0" dependencies = [ "bstr", "document-features", - "gix-commitgraph", + "gix-commitgraph 0.22.1", "gix-date 0.8.1", "gix-hash 0.13.3", "gix-hashtable 0.4.1", "gix-object 0.39.0", "gix-odb", - "gix-revwalk", + "gix-revwalk 0.10.0", "gix-testtools", "gix-trace 0.1.4", "serde", "thiserror", ] +[[package]] +name = "gix-revwalk" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e9870c6b1032f2084567710c3b2106ac603377f8d25766b8a6b7c33e6e3ca279" +dependencies = [ + "gix-commitgraph 0.21.0", + "gix-date 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", + "gix-hash 0.13.2", + "gix-hashtable 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", + "gix-object 0.37.0", + "smallvec", + "thiserror", +] + [[package]] name = "gix-revwalk" version = "0.10.0" dependencies = [ - "gix-commitgraph", + "gix-commitgraph 0.22.1", "gix-date 0.8.1", "gix-hash 0.13.3", "gix-hashtable 0.4.1", @@ -2378,27 +2461,27 @@ dependencies = [ [[package]] name = "gix-sec" -version = "0.8.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9615cbd6b456898aeb942cd75e5810c382fbfc48dbbff2fa23ebd2d33dcbe9c7" +version = "0.10.1" dependencies = [ "bitflags 2.4.0", - "gix-path 0.8.4", + "document-features", + "gix-path 0.10.1", "libc", - "windows 0.48.0", + "serde", + "tempfile", + "windows 0.52.0", ] [[package]] name = "gix-sec" version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a36ea2c5907d64a9b4b5d3cc9f430e6c30f0509646b5e38eb275ca57c5bf29e2" dependencies = [ "bitflags 2.4.0", - "document-features", - "gix-path 0.10.1", + "gix-path 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)", "libc", - "serde", - "tempfile", - "windows 0.52.0", + "windows 0.48.0", ] [[package]] @@ -2455,11 +2538,11 @@ dependencies = [ [[package]] name = "gix-tempfile" -version = "5.0.3" +version = "10.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d71a0d32f34e71e86586124225caefd78dabc605d0486de580d717653addf182" +checksum = "5ae0978f3e11dc57290ee75ac2477c815bca1ce2fa7ed5dc5f16db067410ac4d" dependencies = [ - "gix-fs 0.1.1", + "gix-fs 0.7.0", "libc", "once_cell", "parking_lot", @@ -2503,12 +2586,12 @@ dependencies = [ "crc", "fastrand 2.0.1", "fs_extra", - "gix-discover 0.18.1", + "gix-discover 0.26.0", "gix-fs 0.8.1", - "gix-ignore 0.2.0", - "gix-lock 5.0.1", + "gix-ignore 0.8.0", + "gix-lock 10.0.0", "gix-tempfile 11.0.1", - "gix-worktree 0.17.1", + "gix-worktree 0.26.0", "io-close", "is_ci", "once_cell", @@ -2568,13 +2651,17 @@ dependencies = [ [[package]] name = "gix-traverse" -version = "0.25.0" +version = "0.33.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5be1e807f288c33bb005075111886cceb43ed8a167b3182a0f62c186e2a0dd1" +checksum = "22ef04ab3643acba289b5cedd25d6f53c0430770b1d689d1d654511e6fb81ba0" dependencies = [ - "gix-hash 0.11.4", - "gix-hashtable 0.2.4", - "gix-object 0.29.2", + "gix-commitgraph 0.21.0", + "gix-date 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", + "gix-hash 0.13.2", + "gix-hashtable 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", + "gix-object 0.37.0", + "gix-revwalk 0.8.0", + "smallvec", "thiserror", ] @@ -2582,12 +2669,12 @@ dependencies = [ name = "gix-traverse" version = "0.35.0" dependencies = [ - "gix-commitgraph", + "gix-commitgraph 0.22.1", "gix-date 0.8.1", "gix-hash 0.13.3", "gix-hashtable 0.4.1", "gix-object 0.39.0", - "gix-revwalk", + "gix-revwalk 0.10.0", "smallvec", "thiserror", ] @@ -2596,7 +2683,7 @@ dependencies = [ name = "gix-traverse-tests" version = "0.0.0" dependencies = [ - "gix-commitgraph", + "gix-commitgraph 0.22.1", "gix-hash 0.13.3", "gix-object 0.39.0", "gix-odb", @@ -2642,42 +2729,39 @@ dependencies = [ [[package]] name = "gix-validate" -version = "0.7.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba9b3737b2cef3dcd014633485f0034b0f1a931ee54aeb7d8f87f177f3c89040" +version = "0.8.1" dependencies = [ "bstr", + "gix-testtools", "thiserror", ] [[package]] name = "gix-validate" version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75b7d8e4274be69f284bbc7e6bb2ccf7065dbcdeba22d8c549f2451ae426883f" dependencies = [ "bstr", - "gix-testtools", "thiserror", ] [[package]] name = "gix-worktree" -version = "0.17.1" +version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a69eaff0ae973a9d37c40f02ae5ae50fa726c8fc2fd3ab79d0a19eb61975aafa" +checksum = "9f5e32972801bd82d56609e6fc84efc358fa1f11f25c5e83b7807ee2280f14fe" dependencies = [ "bstr", - "filetime", - "gix-attributes 0.12.0", - "gix-features 0.29.0", - "gix-fs 0.1.1", - "gix-glob 0.7.0", - "gix-hash 0.11.4", - "gix-ignore 0.2.0", - "gix-index 0.16.1", - "gix-object 0.29.2", - "gix-path 0.8.4", - "io-close", - "thiserror", + "gix-attributes 0.19.0", + "gix-features 0.35.0", + "gix-fs 0.7.0", + "gix-glob 0.13.0", + "gix-hash 0.13.2", + "gix-ignore 0.8.0", + "gix-index 0.25.0", + "gix-object 0.37.0", + "gix-path 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -2855,12 +2939,6 @@ version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d77f7ec81a6d05a3abb01ab6eb7590f6083d08449fe5a1c8b1e620283546ccb7" -[[package]] -name = "hex" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" - [[package]] name = "home" version = "0.5.5" @@ -3335,9 +3413,9 @@ checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167" [[package]] name = "memmap2" -version = "0.5.10" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83faa42c0a078c393f6b29d5db232d8be22776a891f8f56e5284faee4a20b327" +checksum = "f49388d20533534cd19360ad3d6a7dadc885944aa802ba3995040c5ec11288c6" dependencies = [ "libc", ] @@ -3375,12 +3453,6 @@ version = "0.3.17" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" -[[package]] -name = "minimal-lexical" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" - [[package]] name = "miniz_oxide" version = "0.7.1" @@ -3433,16 +3505,6 @@ dependencies = [ "pin-utils", ] -[[package]] -name = "nom" -version = "7.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a" -dependencies = [ - "memchr", - "minimal-lexical", -] - [[package]] name = "ntapi" version = "0.4.1" @@ -3781,9 +3843,9 @@ dependencies = [ [[package]] name = "prodash" -version = "23.1.2" +version = "26.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9516b775656bc3e8985e19cd4b8c0c0de045095074e453d2c0a513b5f978392d" +checksum = "794b5bf8e2d19b53dcdcec3e4bba628e20f5b6062503ba89281fa7037dd7bbcf" [[package]] name = "prodash" diff --git a/justfile b/justfile index 313ec3a2d15..f6afa7655cf 100755 --- a/justfile +++ b/justfile @@ -106,7 +106,9 @@ check: cargo check -p gix-features --features zlib-stock cargo check -p gix-features --features zlib,zlib-stock cargo check -p gix-features --features cache-efficiency-debug - cargo check -p gix-commitgraph --all-features + cd gix-commitgraph; \ + set -ex; \ + cargo check --all-features cargo check -p gix-config-value --all-features cargo check -p gix-config --all-features cargo check -p gix-diff --no-default-features diff --git a/tests/tools/Cargo.toml b/tests/tools/Cargo.toml index 7c01a24f002..f36f4072e7d 100644 --- a/tests/tools/Cargo.toml +++ b/tests/tools/Cargo.toml @@ -14,10 +14,10 @@ path = "src/main.rs" doctest = false [dependencies] -gix-lock = "5.0.1" -gix-discover = "0.18.0" -gix-ignore = "0.2.0" -gix-worktree = "0.17.0" +gix-lock = "10" +gix-discover = "0.26" +gix-ignore = "0.8" +gix-worktree = "0.26" gix-fs = { version = "^0.8.1", path = "../../gix-fs" } gix-tempfile = { version = "^11.0.0", default-features = false, features = ["signals"], path = "../../gix-tempfile" } diff --git a/tests/tools/src/lib.rs b/tests/tools/src/lib.rs index 250809dd66c..efa78117355 100644 --- a/tests/tools/src/lib.rs +++ b/tests/tools/src/lib.rs @@ -52,7 +52,7 @@ impl Drop for GitDaemon { } static SCRIPT_IDENTITY: Lazy>> = Lazy::new(|| Mutex::new(BTreeMap::new())); -static EXCLUDE_LUT: Lazy>> = Lazy::new(|| { +static EXCLUDE_LUT: Lazy>> = Lazy::new(|| { let cache = (|| { let (repo_path, _) = gix_discover::upwards(Path::new(".")).ok()?; let (gix_dir, work_tree) = repo_path.into_repository_and_work_tree_directories(); @@ -63,13 +63,13 @@ static EXCLUDE_LUT: Lazy>> = Lazy::new(|| { .ignore_case .then_some(gix_ignore::glob::pattern::Case::Fold) .unwrap_or_default(); - let state = gix_worktree::cache::State::IgnoreStack(gix_worktree::cache::state::Ignore::new( + let state = gix_worktree::stack::State::IgnoreStack(gix_worktree::stack::state::Ignore::new( Default::default(), - gix_ignore::Search::from_git_dir(gix_dir, None, &mut buf).ok()?, + gix_ignore::Search::from_git_dir(&gix_dir, None, &mut buf).ok()?, None, - gix_worktree::cache::state::ignore::Source::WorktreeThenIdMappingIfNotSkipped, + gix_worktree::stack::state::ignore::Source::WorktreeThenIdMappingIfNotSkipped, )); - Some(gix_worktree::Cache::new( + Some(gix_worktree::Stack::new( work_tree, state, case, From a78caba1e70adfae7beb2b4f6a18b8124efba46c Mon Sep 17 00:00:00 2001 From: Sebastian Thiel Date: Fri, 29 Dec 2023 09:57:47 +0100 Subject: [PATCH 8/9] upgrade tabled and setup wordwrapping --- Cargo.lock | 125 +++++++++++++++++++++++++++++++++++++-- Cargo.toml | 5 +- src/plumbing/progress.rs | 18 +++++- 3 files changed, 139 insertions(+), 9 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 28b99a4df6f..de1fb134cbe 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -51,6 +51,15 @@ version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4b46cbb362ab8752921c97e041f5e366ee6297bd428a31275b9fcf1e380f7299" +[[package]] +name = "ansi-str" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1cf4578926a981ab0ca955dc023541d19de37112bc24c1a197bd806d3d86ad1d" +dependencies = [ + "ansitok", +] + [[package]] name = "ansiterm" version = "0.12.2" @@ -60,6 +69,16 @@ dependencies = [ "winapi", ] +[[package]] +name = "ansitok" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "220044e6a1bb31ddee4e3db724d29767f352de47445a6cd75e1a173142136c83" +dependencies = [ + "nom", + "vte", +] + [[package]] name = "anstream" version = "0.6.4" @@ -120,6 +139,12 @@ version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bddcadddf5e9015d310179a59bb28c4d4b9920ad0f11e8e14dbadf654890c9a6" +[[package]] +name = "arrayvec" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b" + [[package]] name = "arrayvec" version = "0.7.4" @@ -1260,6 +1285,7 @@ dependencies = [ "prodash 28.0.0", "serde_derive", "tabled", + "terminal_size", "time", "tracing", "tracing-forest", @@ -3453,6 +3479,12 @@ version = "0.3.17" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" +[[package]] +name = "minimal-lexical" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" + [[package]] name = "miniz_oxide" version = "0.7.1" @@ -3505,6 +3537,16 @@ dependencies = [ "pin-utils", ] +[[package]] +name = "nom" +version = "7.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a" +dependencies = [ + "memchr", + "minimal-lexical", +] + [[package]] name = "ntapi" version = "0.4.1" @@ -3663,10 +3705,12 @@ checksum = "caff54706df99d2a78a5a4e3455ff45448d81ef1bb63c22cd14052ca0e993a3f" [[package]] name = "papergrid" -version = "0.7.1" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1526bb6aa9f10ec339fb10360f22c57edf81d5678d0278e93bc12a47ffbe4b01" +checksum = "9ad43c07024ef767f9160710b3a6773976194758c7919b17e63b863db0bdf7fb" dependencies = [ + "ansi-str", + "ansitok", "bytecount", "fnv", "unicode-width", @@ -3832,6 +3876,30 @@ dependencies = [ "toml_edit", ] +[[package]] +name = "proc-macro-error" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" +dependencies = [ + "proc-macro-error-attr", + "proc-macro2", + "quote", + "syn 1.0.109", + "version_check", +] + +[[package]] +name = "proc-macro-error-attr" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" +dependencies = [ + "proc-macro2", + "quote", + "version_check", +] + [[package]] name = "proc-macro2" version = "1.0.69" @@ -4576,14 +4644,30 @@ dependencies = [ [[package]] name = "tabled" -version = "0.10.0" +version = "0.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56c3ee73732ffceaea7b8f6b719ce3bb17f253fa27461ffeaf568ebd0cdb4b85" +checksum = "4c998b0c8b921495196a48aabaf1901ff28be0760136e31604f7967b0792050e" dependencies = [ + "ansi-str", + "ansitok", "papergrid", + "tabled_derive", "unicode-width", ] +[[package]] +name = "tabled_derive" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c138f99377e5d653a371cdad263615634cfc8467685dfe8e73e2b8e98f44b17" +dependencies = [ + "heck", + "proc-macro-error", + "proc-macro2", + "quote", + "syn 1.0.109", +] + [[package]] name = "tar" version = "0.4.40" @@ -4617,6 +4701,16 @@ dependencies = [ "winapi-util", ] +[[package]] +name = "terminal_size" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "21bebf2b7c9e0a515f6e0f8c51dc0f8e4696391e6f1ff30379559f8365fb0df7" +dependencies = [ + "rustix 0.38.21", + "windows-sys 0.48.0", +] + [[package]] name = "thiserror" version = "1.0.49" @@ -4935,7 +5029,7 @@ version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "794a32261a1f5eb6a4462c81b59cec87b5c27d5deea7dd1ac8fc781c41d226db" dependencies = [ - "arrayvec", + "arrayvec 0.7.4", ] [[package]] @@ -5030,6 +5124,27 @@ version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" +[[package]] +name = "vte" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6cbce692ab4ca2f1f3047fcf732430249c0e971bfdd2b234cf2c47ad93af5983" +dependencies = [ + "arrayvec 0.5.2", + "utf8parse", + "vte_generate_state_changes", +] + +[[package]] +name = "vte_generate_state_changes" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d257817081c7dffcdbab24b9e62d2def62e2ff7d00b1c20062551e6cccc145ff" +dependencies = [ + "proc-macro2", + "quote", +] + [[package]] name = "waker-fn" version = "1.1.1" diff --git a/Cargo.toml b/Cargo.toml index 6b39d76f281..a3814485cf0 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -185,7 +185,10 @@ tracing = { version = "0.1.37", optional = true } # for progress owo-colors = "4.0.0" -tabled = { version = "0.10.0", default-features = false } + +# for config-tree +tabled = { version = "0.15.0", features = ["ansi"] } +terminal_size = "0.3.0" # Avoid pre-compiled binaries, see https://github.com/serde-rs/serde/issues/2538 and https://github.com/serde-rs/serde/pull/2590 serde_derive = ">=1.0.185" diff --git a/src/plumbing/progress.rs b/src/plumbing/progress.rs index 7059da02060..f381e48fd22 100644 --- a/src/plumbing/progress.rs +++ b/src/plumbing/progress.rs @@ -5,7 +5,9 @@ use std::{ use crosstermion::crossterm::style::Stylize; use owo_colors::OwoColorize; -use tabled::{Style, TableIteratorExt, Tabled}; +use tabled::settings::peaker::PriorityMax; +use tabled::settings::{Extract, Style, Width}; +use tabled::Tabled; #[derive(Clone)] enum Usage { @@ -95,7 +97,7 @@ impl Tabled for Record { } fn headers() -> Vec> { - vec![] + vec!["icon".into(), "key".into(), "info".into()] } } @@ -572,7 +574,17 @@ pub fn show_progress() -> anyhow::Result<()> { .filter(|e| matches!(e.usage, NotApplicable { .. })) .count() )?; - println!("{}", sorted.table().with(Style::blank())); + + let mut table = tabled::Table::new(sorted); + let table = table.with(Style::blank()).with(Extract::rows(1..)); + println!( + "{}", + if let Some((terminal_size::Width(w), _)) = terminal_size::terminal_size() { + table.with(Width::wrap(w as usize).keep_words().priority::()) + } else { + table + } + ); println!("{buf}"); Ok(()) } From aea89c3ad52f1a800abb620e9a4701bdf904ff7d Mon Sep 17 00:00:00 2001 From: Sebastian Thiel Date: Fri, 29 Dec 2023 10:25:13 +0100 Subject: [PATCH 9/9] chore: upgrade MSRV to v1.70 Our MSRV follows the one of `helix`, which in turn follows Firefox. --- .github/workflows/msrv.yml | 2 +- Cargo.lock | 821 ++++++++++++++-------------- clippy.toml | 2 +- etc/msrv-badge.svg | 2 +- gix-actor/Cargo.toml | 2 +- gix-archive/Cargo.toml | 2 +- gix-attributes/Cargo.toml | 2 +- gix-bitmap/Cargo.toml | 2 +- gix-chunk/Cargo.toml | 2 +- gix-command/Cargo.toml | 2 +- gix-commitgraph/Cargo.toml | 2 +- gix-config-value/Cargo.toml | 2 +- gix-config/Cargo.toml | 2 +- gix-config/tests/Cargo.toml | 2 +- gix-credentials/Cargo.toml | 2 +- gix-date/Cargo.toml | 2 +- gix-diff/Cargo.toml | 2 +- gix-diff/tests/Cargo.toml | 2 +- gix-discover/Cargo.toml | 2 +- gix-features/Cargo.toml | 2 +- gix-fetchhead/Cargo.toml | 2 +- gix-filter/Cargo.toml | 2 +- gix-fs/Cargo.toml | 2 +- gix-fsck/Cargo.toml | 2 +- gix-glob/Cargo.toml | 2 +- gix-hash/Cargo.toml | 2 +- gix-hashtable/Cargo.toml | 2 +- gix-ignore/Cargo.toml | 2 +- gix-index/Cargo.toml | 2 +- gix-index/tests/Cargo.toml | 2 +- gix-lfs/Cargo.toml | 2 +- gix-lock/Cargo.toml | 2 +- gix-macros/Cargo.toml | 2 +- gix-mailmap/Cargo.toml | 2 +- gix-negotiate/Cargo.toml | 2 +- gix-note/Cargo.toml | 2 +- gix-object/Cargo.toml | 2 +- gix-odb/Cargo.toml | 2 +- gix-odb/tests/Cargo.toml | 2 +- gix-pack/Cargo.toml | 2 +- gix-pack/tests/Cargo.toml | 2 +- gix-packetline-blocking/Cargo.toml | 2 +- gix-packetline/Cargo.toml | 2 +- gix-path/Cargo.toml | 2 +- gix-pathspec/Cargo.toml | 2 +- gix-prompt/Cargo.toml | 2 +- gix-protocol/Cargo.toml | 2 +- gix-quote/Cargo.toml | 2 +- gix-rebase/Cargo.toml | 2 +- gix-ref/Cargo.toml | 2 +- gix-ref/tests/Cargo.toml | 2 +- gix-refspec/Cargo.toml | 2 +- gix-revision/Cargo.toml | 2 +- gix-revwalk/Cargo.toml | 2 +- gix-sec/Cargo.toml | 2 +- gix-sequencer/Cargo.toml | 2 +- gix-status/Cargo.toml | 2 +- gix-status/tests/Cargo.toml | 2 +- gix-submodule/Cargo.toml | 2 +- gix-tempfile/Cargo.toml | 2 +- gix-tix/Cargo.toml | 2 +- gix-trace/Cargo.toml | 2 +- gix-transport/Cargo.toml | 2 +- gix-traverse/Cargo.toml | 2 +- gix-traverse/tests/Cargo.toml | 2 +- gix-tui/Cargo.toml | 2 +- gix-url/Cargo.toml | 2 +- gix-utils/Cargo.toml | 2 +- gix-validate/Cargo.toml | 2 +- gix-worktree-state/Cargo.toml | 2 +- gix-worktree-state/tests/Cargo.toml | 2 +- gix-worktree-stream/Cargo.toml | 2 +- gix-worktree/Cargo.toml | 2 +- gix-worktree/tests/Cargo.toml | 2 +- gix/Cargo.toml | 2 +- 75 files changed, 470 insertions(+), 499 deletions(-) diff --git a/.github/workflows/msrv.yml b/.github/workflows/msrv.yml index 26ddc0352a6..2f094e5bff7 100644 --- a/.github/workflows/msrv.yml +++ b/.github/workflows/msrv.yml @@ -20,6 +20,6 @@ jobs: runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@v3 - - uses: dtolnay/rust-toolchain@1.65.0 # dictated by `firefox` to support the `helix` editor, IMPORTANT: adjust etc/msrv-badge.svg as well + - uses: dtolnay/rust-toolchain@1.70.0 # dictated by `firefox` to support the `helix` editor, IMPORTANT: adjust etc/msrv-badge.svg as well - uses: extractions/setup-just@v1 - run: just ci-check-msrv diff --git a/Cargo.lock b/Cargo.lock index de1fb134cbe..c7e87fdeb33 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -81,9 +81,9 @@ dependencies = [ [[package]] name = "anstream" -version = "0.6.4" +version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ab91ebe16eb252986481c5b62f6098f3b698a45e34b5b98200cf20dd2484a44" +checksum = "d664a92ecae85fd0a7392615844904654d1d5f5514837f471ddef4a057aba1b6" dependencies = [ "anstyle", "anstyle-parse", @@ -101,37 +101,37 @@ checksum = "7079075b41f533b8c61d2a4d073c4676e1f8b249ff94a393b0595db304e0dd87" [[package]] name = "anstyle-parse" -version = "0.2.2" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "317b9a89c1868f5ea6ff1d9539a69f45dffc21ce321ac1fd1160dfa48c8e2140" +checksum = "c75ac65da39e5fe5ab759307499ddad880d724eed2f6ce5b5e8a26f4f387928c" dependencies = [ "utf8parse", ] [[package]] name = "anstyle-query" -version = "1.0.0" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ca11d4be1bab0c8bc8734a9aa7bf4ee8316d462a08c6ac5052f888fef5b494b" +checksum = "e28923312444cdd728e4738b3f9c9cac739500909bb3d3c94b43551b16517648" dependencies = [ - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] name = "anstyle-wincon" -version = "3.0.1" +version = "3.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0699d10d2f4d628a98ee7b57b289abbc98ff3bad977cb3152709d4bf2330628" +checksum = "1cd54b81ec8d6180e24654d0b371ad22fc3dd083b6ff8ba325b72e00c87660a7" dependencies = [ "anstyle", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] name = "anyhow" -version = "1.0.75" +version = "1.0.77" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6" +checksum = "c9d19de80eff169429ac1e9f48fffb163916b448a44e8e046186232046d9e1f9" [[package]] name = "arc-swap" @@ -185,7 +185,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1ca33f4bc4ed1babef42cad36cc1f51fa88be00420404e5b1e80ab1b18f7678c" dependencies = [ "concurrent-queue", - "event-listener 4.0.0", + "event-listener 4.0.1", "event-listener-strategy", "futures-core", "pin-project-lite", @@ -193,30 +193,30 @@ dependencies = [ [[package]] name = "async-executor" -version = "1.5.4" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c1da3ae8dabd9c00f453a329dfe1fb28da3c0a72e2478cdcd93171740c20499" +checksum = "17ae5ebefcc48e7452b4987947920dac9450be1110cadf34d1b8c116bdbaf97c" dependencies = [ - "async-lock 2.8.0", + "async-lock 3.2.0", "async-task", "concurrent-queue", "fastrand 2.0.1", - "futures-lite 1.13.0", + "futures-lite 2.1.0", "slab", ] [[package]] name = "async-global-executor" -version = "2.3.1" +version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1b6f5d7df27bd294849f8eec66ecfc63d11814df7a4f5d74168a2394467b776" +checksum = "05b1b633a2115cd122d73b955eadd9916c18c8f510ec9cd1686404c60ad1c29c" dependencies = [ - "async-channel 1.9.0", + "async-channel 2.1.1", "async-executor", - "async-io 1.13.0", - "async-lock 2.8.0", + "async-io 2.2.2", + "async-lock 3.2.0", "blocking", - "futures-lite 1.13.0", + "futures-lite 2.1.0", "once_cell", ] @@ -234,17 +234,17 @@ dependencies = [ "log", "parking", "polling 2.8.0", - "rustix 0.37.25", + "rustix 0.37.27", "slab", - "socket2 0.4.9", + "socket2 0.4.10", "waker-fn", ] [[package]] name = "async-io" -version = "2.2.1" +version = "2.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6d3b15875ba253d1110c740755e246537483f152fa334f91abd7fe84c88b3ff" +checksum = "6afaa937395a620e33dc6a742c593c01aced20aa376ffb0f628121198578ccc7" dependencies = [ "async-lock 3.2.0", "cfg-if", @@ -253,7 +253,7 @@ dependencies = [ "futures-lite 2.1.0", "parking", "polling 3.3.1", - "rustix 0.38.21", + "rustix 0.38.28", "slab", "tracing", "windows-sys 0.52.0", @@ -274,7 +274,7 @@ version = "3.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7125e42787d53db9dd54261812ef17e937c95a51e4d291373b670342fa44310c" dependencies = [ - "event-listener 4.0.0", + "event-listener 4.0.1", "event-listener-strategy", "pin-project-lite", ] @@ -285,7 +285,7 @@ version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b948000fad4873c1c9339d60f2623323a0cfd3816e5181033c6a5cb68b2accf7" dependencies = [ - "async-io 2.2.1", + "async-io 2.2.2", "blocking", "futures-lite 2.1.0", ] @@ -319,19 +319,19 @@ dependencies = [ [[package]] name = "async-task" -version = "4.4.1" +version = "4.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9441c6b2fe128a7c2bf680a44c34d0df31ce09e5b7e401fcca3faa483dbc921" +checksum = "e1d90cd0b264dfdd8eb5bad0a2c217c1f88fa96a8573f40e7b12de23fb468f46" [[package]] name = "async-trait" -version = "0.1.73" +version = "0.1.75" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc00ceb34980c03614e35a3a4e218276a0a824e911d07651cd0d858a51e8c0f0" +checksum = "fdf6721fb0140e4f897002dd086c06f6c27775df19cfe1fccb21181a48fd2c98" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.43", ] [[package]] @@ -369,15 +369,15 @@ checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" [[package]] name = "base64" -version = "0.21.4" +version = "0.21.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ba43ea6f343b788c8764558649e08df62f86c6ef251fdaeb1ffd010a9ae50a2" +checksum = "35636a1494ede3b646cc98f74f8e62c773a38a659ebc777a2cf26b9b74171df9" [[package]] name = "basic-toml" -version = "0.1.4" +version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7bfc506e7a2370ec239e1d072507b2a80c833083699d3c6fa176fbb4de8448c6" +checksum = "2f2139706359229bfa8f19142ac1155b4b80beafb7a60471ac5dd109d4a19778" dependencies = [ "serde", ] @@ -390,9 +390,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.4.0" +version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4682ae6287fcf752ecaabbfcc7b6f9b72aa33933dc23a554d853aea8eea8635" +checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" dependencies = [ "serde", ] @@ -408,25 +408,25 @@ dependencies = [ [[package]] name = "blocking" -version = "1.4.1" +version = "1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c36a4d0d48574b3dd360b4b7d95cc651d2b6557b6402848a27d4b228a473e2a" +checksum = "6a37913e8dc4ddcc604f0c6d3bf2887c995153af3611de9e23c352b44c1b9118" dependencies = [ - "async-channel 1.9.0", - "async-lock 2.8.0", + "async-channel 2.1.1", + "async-lock 3.2.0", "async-task", "fastrand 2.0.1", "futures-io", - "futures-lite 1.13.0", + "futures-lite 2.1.0", "piper", "tracing", ] [[package]] name = "bstr" -version = "1.7.0" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c79ad7fb2dd38f3dabd76b09c6a5a20c038fc0213ef1e9afd30eb777f120f019" +checksum = "c48f0051a4b4c5e0b6d365cd04af53aeaa209e3cc15ec2cdb69e73cc87fbd0dc" dependencies = [ "memchr", "regex-automata", @@ -450,9 +450,9 @@ checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec" [[package]] name = "bytecount" -version = "0.6.4" +version = "0.6.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad152d03a2c813c80bb94fedbf3a3f02b28f793e39e7c214c8a0bcc196343de7" +checksum = "e1e5f035d16fc623ae5f74981db80a439803888314e3a555fd6f04acd51a3205" [[package]] name = "byteorder" @@ -537,9 +537,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.4.6" +version = "4.4.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d04704f56c2cde07f43e8e2c154b43f216dc5c92fc98ada720177362f953b956" +checksum = "dcfab8ba68f3668e89f6ff60f5b205cea56aa7b769451a59f34b8682f51c056d" dependencies = [ "clap_builder", "clap_derive", @@ -547,9 +547,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.4.6" +version = "4.4.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e231faeaca65ebd1ea3c737966bf858971cd38c3849107aa3ea7de90a804e45" +checksum = "fb7fb5e4e979aec3be7791562fcba452f94ad85e954da024396433e0e25a79e9" dependencies = [ "anstream", "anstyle", @@ -559,30 +559,30 @@ dependencies = [ [[package]] name = "clap_complete" -version = "4.4.3" +version = "4.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3ae8ba90b9d8b007efe66e55e48fb936272f5ca00349b5b0e89877520d35ea7" +checksum = "a51919c5608a32e34ea1d6be321ad070065e17613e168c5b6977024290f2630b" dependencies = [ "clap", ] [[package]] name = "clap_derive" -version = "4.4.2" +version = "4.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0862016ff20d69b84ef8247369fabf5c008a7417002411897d40ee1f4532b873" +checksum = "cf9804afaaf59a91e75b022a30fb7229a7901f60c755489cc61c9b423b836442" dependencies = [ "heck", "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.43", ] [[package]] name = "clap_lex" -version = "0.5.1" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd7cc57abe963c6d3b9d8be5b06ba7c8957a930305ca90304f24ef040aa6f961" +checksum = "702fc72eb24e5a1e48ce58027a675bc24edd52096d5397d4aea7c6dd9eca0bd1" [[package]] name = "clru" @@ -607,9 +607,9 @@ checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" [[package]] name = "concurrent-queue" -version = "2.3.0" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f057a694a54f12365049b0958a1685bb52d567f5593b355fbf685838e873d400" +checksum = "d16048cd947b08fa32c24458a22f5dc5e835264f689f4f5653210c69fd107363" dependencies = [ "crossbeam-utils", ] @@ -625,9 +625,9 @@ dependencies = [ [[package]] name = "core-foundation" -version = "0.9.3" +version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "194a7a9e6de53fa55116934067c844d9d749312f75c6f6d0980e8c252f8c2146" +checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f" dependencies = [ "core-foundation-sys", "libc", @@ -635,15 +635,15 @@ dependencies = [ [[package]] name = "core-foundation-sys" -version = "0.8.4" +version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa" +checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" [[package]] name = "cpufeatures" -version = "0.2.9" +version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a17b76ff3a4162b0b27f354a0c87015ddad39d35f9c0c36607a3bdd175dde1f1" +checksum = "ce420fe07aecd3e67c5f910618fe65e94158f6dcc0adf44e00d69ce2bdfe0fd0" dependencies = [ "libc", ] @@ -659,9 +659,9 @@ dependencies = [ [[package]] name = "crc-catalog" -version = "2.2.0" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cace84e55f07e7301bae1c519df89cdad8cc3cd868413d3fdbdeca9ff3db484" +checksum = "19d374276b40fb8bbdee95aef7c7fa6b5316ec764510eb64b8dd0e2ed0d7e7f5" [[package]] name = "crc32fast" @@ -710,9 +710,9 @@ dependencies = [ [[package]] name = "crossbeam" -version = "0.8.2" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2801af0d36612ae591caa9568261fddce32ce6e08a7275ea334a06a4ad021a2c" +checksum = "6eb9105919ca8e40d437fc9cbb8f1975d916f1bd28afe795a48aae32a2cc8920" dependencies = [ "cfg-if", "crossbeam-channel", @@ -724,9 +724,9 @@ dependencies = [ [[package]] name = "crossbeam-channel" -version = "0.5.8" +version = "0.5.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a33c2bf77f2df06183c3aa30d1e96c0695a313d4f9c453cc3762a6db39f99200" +checksum = "82a9b73a36529d9c47029b9fb3a6f0ea3cc916a261195352ba19e770fc1748b2" dependencies = [ "cfg-if", "crossbeam-utils", @@ -734,9 +734,9 @@ dependencies = [ [[package]] name = "crossbeam-deque" -version = "0.8.3" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce6fd6f855243022dcecf8702fef0c297d4338e226845fe067f6341ad9fa0cef" +checksum = "fca89a0e215bab21874660c67903c5f143333cab1da83d041c7ded6053774751" dependencies = [ "cfg-if", "crossbeam-epoch", @@ -745,22 +745,20 @@ dependencies = [ [[package]] name = "crossbeam-epoch" -version = "0.9.15" +version = "0.9.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae211234986c545741a7dc064309f67ee1e5ad243d0e48335adc0484d960bcc7" +checksum = "0e3681d554572a651dda4186cd47240627c3d0114d45a95f6ad27f2f22e7548d" dependencies = [ "autocfg", "cfg-if", "crossbeam-utils", - "memoffset 0.9.0", - "scopeguard", ] [[package]] name = "crossbeam-queue" -version = "0.3.8" +version = "0.3.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1cfb3ea8a53f37c40dea2c7bedcbd88bdfae54f5e2175d6ecaff1c988353add" +checksum = "adc6598521bb5a83d491e8c1fe51db7296019d2ca3cb93cc6c2a20369a4d78a2" dependencies = [ "cfg-if", "crossbeam-utils", @@ -768,9 +766,9 @@ dependencies = [ [[package]] name = "crossbeam-utils" -version = "0.8.16" +version = "0.8.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a22b2d63d4d1dc0b7f1b6b2747dd0088008a9be28b6ddf0b1e7d335e3037294" +checksum = "c3a430a770ebd84726f584a90ee7f020d28db52c6d02138900f22341f866d39c" dependencies = [ "cfg-if", ] @@ -781,7 +779,7 @@ version = "0.27.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f476fe445d41c9e991fd07515a6f463074b782242ccf4a5b7b1d1012e70824df" dependencies = [ - "bitflags 2.4.0", + "bitflags 2.4.1", "crossterm_winapi", "futures-core", "libc", @@ -838,7 +836,7 @@ dependencies = [ "openssl-probe", "openssl-sys", "schannel", - "socket2 0.4.9", + "socket2 0.4.10", "winapi", ] @@ -865,7 +863,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856" dependencies = [ "cfg-if", - "hashbrown 0.14.1", + "hashbrown 0.14.3", "lock_api", "once_cell", "parking_lot_core", @@ -873,9 +871,9 @@ dependencies = [ [[package]] name = "data-encoding" -version = "2.4.0" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2e66c9d817f1720209181c316d28635c050fa304f9c79e47a520882661b7308" +checksum = "7e962a19be5cfc3f3bf6dd8f61eb50107f356ad6270fbb3ed41476571db78be5" [[package]] name = "defer" @@ -883,6 +881,15 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "647605a6345d5e89c3950a36a638c56478af9b414c55c6f2477c73b115f9acde" +[[package]] +name = "deranged" +version = "0.3.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8eb30d70a07a3b04884d2677f06bec33509dc67ca60d92949e5535352d3191dc" +dependencies = [ + "powerfmt", +] + [[package]] name = "diff" version = "0.1.13" @@ -901,9 +908,9 @@ dependencies = [ [[package]] name = "document-features" -version = "0.2.7" +version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e493c573fce17f00dcab13b6ac057994f3ce17d1af4dc39bfd482b83c6eb6157" +checksum = "ef5282ad69563b5fc40319526ba27e0e7363d552a896f0297d54f767717f9b95" dependencies = [ "litrs", ] @@ -938,14 +945,14 @@ dependencies = [ "heck", "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.43", ] [[package]] name = "env_logger" -version = "0.10.0" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85cdab6a89accf66733ad5a1693a4dcced6aeff64602b634530dd73c1f3ee9f0" +checksum = "95b3f3e67048839cb0d0781f445682a35113da7121f7c949db0e2be96a4fbece" dependencies = [ "humantime", "is-terminal", @@ -961,12 +968,12 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "errno" -version = "0.3.5" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac3e13f66a2f95e32a39eaa81f6b95d42878ca0e1db0c7543723dfe12557e860" +checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245" dependencies = [ "libc", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] @@ -977,9 +984,9 @@ checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" [[package]] name = "event-listener" -version = "4.0.0" +version = "4.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "770d968249b5d99410d61f5bf89057f3199a077a04d087092f58e7d10692baae" +checksum = "84f2cdcf274580f2d63697192d744727b3198894b1bf02923643bf59e2c26712" dependencies = [ "concurrent-queue", "parking", @@ -992,7 +999,7 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "958e4d70b6d5e81971bebec42271ec641e7ff4e170a6fa605f2b8a8b65cb97d3" dependencies = [ - "event-listener 4.0.0", + "event-listener 4.0.1", "pin-project-lite", ] @@ -1020,15 +1027,6 @@ version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7360491ce676a36bf9bb3c56c1aa791658183a54d2744120f27285738d90465a" -[[package]] -name = "faster-hex" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "239f7bfb930f820ab16a9cd95afc26f88264cf6905c960b340a615384aa3338a" -dependencies = [ - "serde", -] - [[package]] name = "faster-hex" version = "0.9.0" @@ -1055,14 +1053,14 @@ checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" [[package]] name = "filetime" -version = "0.2.22" +version = "0.2.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4029edd3e734da6fe05b6cd7bd2960760a616bd2ddd0d59a0124746d6272af0" +checksum = "1ee447700ac8aa0b2f2bd7bc4462ad686ba06baa6727ac149a2d6277f0d240fd" dependencies = [ "cfg-if", "libc", - "redox_syscall 0.3.5", - "windows-sys 0.48.0", + "redox_syscall", + "windows-sys 0.52.0", ] [[package]] @@ -1109,9 +1107,12 @@ dependencies = [ [[package]] name = "fs-err" -version = "2.9.0" +version = "2.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0845fa252299212f0389d64ba26f34fa32cfe41588355f21ed507c59a0f64541" +checksum = "88a41f105fe1d5b6b34b2055e3dc59bb79b46b48b2040b9e6c7b4b5de097aa41" +dependencies = [ + "autocfg", +] [[package]] name = "fs_extra" @@ -1121,9 +1122,9 @@ checksum = "42703706b716c37f96a77aea830392ad231f44c9e9a67872fa5548707e11b11c" [[package]] name = "futures" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23342abe12aba583913b2e62f22225ff9c950774065e4bfb61a19cd9770fec40" +checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0" dependencies = [ "futures-channel", "futures-core", @@ -1136,9 +1137,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "955518d47e09b25bbebc7a18df10b81f0c766eaf4c4f1cccef2fca5f2a4fb5f2" +checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78" dependencies = [ "futures-core", "futures-sink", @@ -1146,15 +1147,15 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bca583b7e26f571124fe5b7561d49cb2868d79116cfa0eefce955557c6fee8c" +checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d" [[package]] name = "futures-executor" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ccecee823288125bd88b4d7f565c9e58e41858e47ab72e8ea2d64e93624386e0" +checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d" dependencies = [ "futures-core", "futures-task", @@ -1163,9 +1164,9 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fff74096e71ed47f8e023204cfd0aa1289cd54ae5430a9523be060cdb849964" +checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1" [[package]] name = "futures-lite" @@ -1195,39 +1196,27 @@ dependencies = [ "pin-project-lite", ] -[[package]] -name = "futures-macro" -version = "0.3.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.38", -] - [[package]] name = "futures-sink" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f43be4fe21a13b9781a69afa4985b0f6ee0e1afab2c6f454a8cf30e2b2237b6e" +checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5" [[package]] name = "futures-task" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76d3d132be6c0e6aa1534069c705a74a5997a356c0dc2f86a47765e5617c5b65" +checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004" [[package]] name = "futures-util" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26b01e40b772d54cf6c6d721c1d1abd0647a0106a12ecaa1c186273392a69533" +checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48" dependencies = [ "futures-channel", "futures-core", "futures-io", - "futures-macro", "futures-sink", "futures-task", "memchr", @@ -1248,9 +1237,9 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.10" +version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427" +checksum = "fe9006bed769170c11f845cf00c7c1e9092aeb3f268e007c3e760ac68008070f" dependencies = [ "cfg-if", "js-sys", @@ -1261,9 +1250,9 @@ dependencies = [ [[package]] name = "gimli" -version = "0.28.0" +version = "0.28.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6fb8d784f27acf97159b40fc4db5ecd8aa23b9ad5ef69cdd136d3bc80665f0c0" +checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" [[package]] name = "gitoxide" @@ -1297,7 +1286,7 @@ name = "gitoxide-core" version = "0.34.0" dependencies = [ "anyhow", - "async-io 2.2.1", + "async-io 2.2.2", "async-net", "async-trait", "blocking", @@ -1508,18 +1497,18 @@ dependencies = [ [[package]] name = "gix-bitmap" -version = "0.2.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ccab4bc576844ddb51b78d81b4a42d73e6229660fa614dfc3d3999c874d1959" +version = "0.2.8" dependencies = [ + "gix-testtools", "thiserror", ] [[package]] name = "gix-bitmap" version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d49e1a13a30d3f88be4bceae184dd13a2d3fb9ffa7515f7ed7ae771b857f4916" dependencies = [ - "gix-testtools", "thiserror", ] @@ -1559,7 +1548,7 @@ dependencies = [ "bstr", "gix-chunk 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)", "gix-features 0.35.0", - "gix-hash 0.13.2", + "gix-hash 0.13.3 (registry+https://github.com/rust-lang/crates.io-index)", "memmap2 0.7.1", "thiserror", ] @@ -1575,7 +1564,7 @@ dependencies = [ "gix-features 0.36.1", "gix-hash 0.13.3", "gix-testtools", - "memmap2 0.9.0", + "memmap2 0.9.3", "serde", "thiserror", ] @@ -1620,7 +1609,7 @@ dependencies = [ name = "gix-config-value" version = "0.14.1" dependencies = [ - "bitflags 2.4.0", + "bitflags 2.4.1", "bstr", "document-features", "gix-path 0.10.1", @@ -1719,7 +1708,7 @@ checksum = "a45d5cf0321178883e38705ab2b098f625d609a7d4c391b33ac952eff2c490f2" dependencies = [ "bstr", "dunce", - "gix-hash 0.13.2", + "gix-hash 0.13.3 (registry+https://github.com/rust-lang/crates.io-index)", "gix-path 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)", "gix-ref 0.38.0", "gix-sec 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1750,7 +1739,7 @@ version = "0.35.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9b9ff423ae4983f762659040d13dd7a5defbd54b6a04ac3cc7347741cec828cd" dependencies = [ - "gix-hash 0.13.2", + "gix-hash 0.13.3 (registry+https://github.com/rust-lang/crates.io-index)", "gix-trace 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", "libc", "prodash 26.2.2", @@ -1787,7 +1776,7 @@ version = "0.36.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4d46a4a5c6bb5bebec9c0d18b65ada20e6517dbd7cf855b87dd4bbdce3a771b2" dependencies = [ - "gix-hash 0.13.2", + "gix-hash 0.13.3 (registry+https://github.com/rust-lang/crates.io-index)", "gix-trace 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", "libc", "prodash 26.2.2", @@ -1865,7 +1854,7 @@ version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a9d76e85f11251dcf751d2c5e918a14f562db5be6f727fd24775245653e9b19d" dependencies = [ - "bitflags 2.4.0", + "bitflags 2.4.1", "bstr", "gix-features 0.35.0", "gix-path 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1875,7 +1864,7 @@ dependencies = [ name = "gix-glob" version = "0.14.1" dependencies = [ - "bitflags 2.4.0", + "bitflags 2.4.1", "bstr", "document-features", "gix-features 0.36.1", @@ -1886,23 +1875,23 @@ dependencies = [ [[package]] name = "gix-hash" -version = "0.13.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99c1e554a87759e672c7d2e37211e761aa390c61ffcd3753a57c51173143f3cb" +version = "0.13.3" dependencies = [ - "faster-hex 0.8.1", + "document-features", + "faster-hex", + "gix-features 0.36.1", + "gix-testtools", + "serde", "thiserror", ] [[package]] name = "gix-hash" version = "0.13.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f8cf8c2266f63e582b7eb206799b63aa5fa68ee510ad349f637dfe2d0653de0" dependencies = [ - "document-features", - "faster-hex 0.9.0", - "gix-features 0.36.1", - "gix-testtools", - "serde", + "faster-hex", "thiserror", ] @@ -1911,7 +1900,7 @@ name = "gix-hashtable" version = "0.4.1" dependencies = [ "gix-hash 0.13.3", - "hashbrown 0.14.1", + "hashbrown 0.14.3", "parking_lot", ] @@ -1921,8 +1910,8 @@ version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "feb61880816d7ec4f0b20606b498147d480860ddd9133ba542628df2f548d3ca" dependencies = [ - "gix-hash 0.13.2", - "hashbrown 0.14.1", + "gix-hash 0.13.3 (registry+https://github.com/rust-lang/crates.io-index)", + "hashbrown 0.14.3", "parking_lot", ] @@ -1958,14 +1947,14 @@ version = "0.25.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f54d63a9d13c13088f41f5a3accbec284e492ac8f4f707fcc307c139622e17b7" dependencies = [ - "bitflags 2.4.0", + "bitflags 2.4.1", "bstr", "btoi", "filetime", - "gix-bitmap 0.2.7", + "gix-bitmap 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", "gix-features 0.35.0", "gix-fs 0.7.0", - "gix-hash 0.13.2", + "gix-hash 0.13.3 (registry+https://github.com/rust-lang/crates.io-index)", "gix-lock 10.0.0", "gix-object 0.37.0", "gix-traverse 0.33.0", @@ -1979,7 +1968,7 @@ dependencies = [ name = "gix-index" version = "0.27.1" dependencies = [ - "bitflags 2.4.0", + "bitflags 2.4.1", "bstr", "btoi", "document-features", @@ -1993,8 +1982,8 @@ dependencies = [ "gix-traverse 0.35.0", "itoa", "libc", - "memmap2 0.9.0", - "rustix 0.38.21", + "memmap2 0.9.3", + "rustix 0.38.28", "serde", "smallvec", "thiserror", @@ -2024,28 +2013,28 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "47fc96fa8b6b6d33555021907c81eb3b27635daecf6e630630bdad44f8feaa95" dependencies = [ "gix-tempfile 10.0.0", - "gix-utils 0.1.5", + "gix-utils 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", "thiserror", ] [[package]] name = "gix-lock" -version = "11.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4feb1dcd304fe384ddc22edba9dd56a42b0800032de6537728cea2f033a4f37" +version = "11.0.1" dependencies = [ - "gix-tempfile 11.0.1 (registry+https://github.com/rust-lang/crates.io-index)", - "gix-utils 0.1.5", + "gix-tempfile 11.0.1", + "gix-utils 0.1.6", + "tempfile", "thiserror", ] [[package]] name = "gix-lock" version = "11.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7e5c65e6a29830a435664891ced3f3c1af010f14900226019590ee0971a22f37" dependencies = [ - "gix-tempfile 11.0.1", - "gix-utils 0.1.6", - "tempfile", + "gix-tempfile 11.0.1 (registry+https://github.com/rust-lang/crates.io-index)", + "gix-utils 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", "thiserror", ] @@ -2055,7 +2044,7 @@ version = "0.1.1" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.43", "trybuild", ] @@ -2076,7 +2065,7 @@ dependencies = [ name = "gix-negotiate" version = "0.10.0" dependencies = [ - "bitflags 2.4.0", + "bitflags 2.4.1", "gix-commitgraph 0.22.1", "gix-date 0.8.1", "gix-hash 0.13.3", @@ -2104,7 +2093,7 @@ dependencies = [ "gix-actor 0.27.0", "gix-date 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", "gix-features 0.35.0", - "gix-hash 0.13.2", + "gix-hash 0.13.3 (registry+https://github.com/rust-lang/crates.io-index)", "gix-validate 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", "itoa", "smallvec", @@ -2123,7 +2112,7 @@ dependencies = [ "gix-actor 0.28.1 (registry+https://github.com/rust-lang/crates.io-index)", "gix-date 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", "gix-features 0.36.1 (registry+https://github.com/rust-lang/crates.io-index)", - "gix-hash 0.13.2", + "gix-hash 0.13.3 (registry+https://github.com/rust-lang/crates.io-index)", "gix-validate 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", "itoa", "smallvec", @@ -2205,7 +2194,7 @@ dependencies = [ "gix-tempfile 11.0.1", "gix-testtools", "gix-traverse 0.35.0", - "memmap2 0.9.0", + "memmap2 0.9.3", "parking_lot", "serde", "smallvec", @@ -2226,7 +2215,7 @@ dependencies = [ "gix-testtools", "gix-traverse 0.35.0", "maplit", - "memmap2 0.9.0", + "memmap2 0.9.3", ] [[package]] @@ -2236,7 +2225,7 @@ dependencies = [ "async-std", "bstr", "document-features", - "faster-hex 0.9.0", + "faster-hex", "futures-io", "futures-lite 2.1.0", "gix-hash 0.13.3", @@ -2255,7 +2244,7 @@ version = "0.17.0" dependencies = [ "bstr", "document-features", - "faster-hex 0.9.0", + "faster-hex", "gix-trace 0.1.4", "serde", "thiserror", @@ -2290,7 +2279,7 @@ dependencies = [ name = "gix-pathspec" version = "0.4.1" dependencies = [ - "bitflags 2.4.0", + "bitflags 2.4.1", "bstr", "gix-attributes 0.20.1", "gix-config-value", @@ -2311,7 +2300,7 @@ dependencies = [ "gix-config-value", "gix-testtools", "parking_lot", - "rustix 0.38.21", + "rustix 0.38.28", "serial_test", "thiserror", ] @@ -2374,8 +2363,8 @@ dependencies = [ "gix-date 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", "gix-features 0.36.1 (registry+https://github.com/rust-lang/crates.io-index)", "gix-fs 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", - "gix-hash 0.13.2", - "gix-lock 11.0.0", + "gix-hash 0.13.3 (registry+https://github.com/rust-lang/crates.io-index)", + "gix-lock 11.0.1 (registry+https://github.com/rust-lang/crates.io-index)", "gix-object 0.38.0", "gix-path 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)", "gix-tempfile 11.0.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2401,7 +2390,7 @@ dependencies = [ "gix-tempfile 11.0.1", "gix-testtools", "gix-validate 0.8.1", - "memmap2 0.9.0", + "memmap2 0.9.3", "serde", "thiserror", "winnow", @@ -2465,7 +2454,7 @@ checksum = "e9870c6b1032f2084567710c3b2106ac603377f8d25766b8a6b7c33e6e3ca279" dependencies = [ "gix-commitgraph 0.21.0", "gix-date 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", - "gix-hash 0.13.2", + "gix-hash 0.13.3 (registry+https://github.com/rust-lang/crates.io-index)", "gix-hashtable 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", "gix-object 0.37.0", "smallvec", @@ -2489,7 +2478,7 @@ dependencies = [ name = "gix-sec" version = "0.10.1" dependencies = [ - "bitflags 2.4.0", + "bitflags 2.4.1", "document-features", "gix-path 0.10.1", "libc", @@ -2504,7 +2493,7 @@ version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a36ea2c5907d64a9b4b5d3cc9f430e6c30f0509646b5e38eb275ca57c5bf29e2" dependencies = [ - "bitflags 2.4.0", + "bitflags 2.4.1", "gix-path 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)", "libc", "windows 0.48.0", @@ -2652,7 +2641,7 @@ version = "0.39.0" dependencies = [ "async-std", "async-trait", - "base64 0.21.4", + "base64 0.21.5", "blocking", "bstr", "curl", @@ -2683,7 +2672,7 @@ checksum = "22ef04ab3643acba289b5cedd25d6f53c0430770b1d689d1d654511e6fb81ba0" dependencies = [ "gix-commitgraph 0.21.0", "gix-date 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", - "gix-hash 0.13.2", + "gix-hash 0.13.3 (registry+https://github.com/rust-lang/crates.io-index)", "gix-hashtable 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", "gix-object 0.37.0", "gix-revwalk 0.8.0", @@ -2739,9 +2728,7 @@ dependencies = [ [[package]] name = "gix-utils" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b85d89dc728613e26e0ed952a19583744e7f5240fcd4aa30d6c824ffd8b52f0f" +version = "0.1.6" dependencies = [ "fastrand 2.0.1", ] @@ -2749,6 +2736,8 @@ dependencies = [ [[package]] name = "gix-utils" version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9f82c41937f00e15a1f6cb0b55307f0ca1f77f4407ff2bf440be35aa688c6a3e" dependencies = [ "fastrand 2.0.1", ] @@ -2783,7 +2772,7 @@ dependencies = [ "gix-features 0.35.0", "gix-fs 0.7.0", "gix-glob 0.13.0", - "gix-hash 0.13.2", + "gix-hash 0.13.3 (registry+https://github.com/rust-lang/crates.io-index)", "gix-ignore 0.8.0", "gix-index 0.25.0", "gix-object 0.37.0", @@ -2905,9 +2894,9 @@ dependencies = [ [[package]] name = "h2" -version = "0.3.21" +version = "0.3.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91fc23aa11be92976ef4729127f1a74adf36d8436f7816b185d18df956790833" +checksum = "4d6250322ef6e60f93f9a2162799302cd6f68f79f6e5d85c8c16f14d1d958178" dependencies = [ "bytes", "fnv", @@ -2915,7 +2904,7 @@ dependencies = [ "futures-sink", "futures-util", "http", - "indexmap 1.9.3", + "indexmap", "slab", "tokio", "tokio-util", @@ -2936,9 +2925,9 @@ checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" [[package]] name = "hashbrown" -version = "0.14.1" +version = "0.14.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7dfda62a12f55daeae5015f81b0baea145391cb4520f86c248fc615d72640d12" +checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" dependencies = [ "ahash", "allocator-api2", @@ -2950,7 +2939,7 @@ version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e8094feaf31ff591f651a2664fb9cfd92bba7a60ce3197265e9482ebe753c8f7" dependencies = [ - "hashbrown 0.14.1", + "hashbrown 0.14.3", ] [[package]] @@ -2967,11 +2956,11 @@ checksum = "d77f7ec81a6d05a3abb01ab6eb7590f6083d08449fe5a1c8b1e620283546ccb7" [[package]] name = "home" -version = "0.5.5" +version = "0.5.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5444c27eef6923071f7ebcc33e3444508466a76f7a2b93da00ed6e19f30c1ddb" +checksum = "e3d1354bf6b7235cb4a0576c2619fd4ed18183f689b12b006a0ee7329eeff9a5" dependencies = [ - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] @@ -2987,9 +2976,9 @@ dependencies = [ [[package]] name = "http" -version = "0.2.9" +version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd6effc99afb63425aff9b05836f029929e345a6148a14b7ecd5ab67af944482" +checksum = "8947b1a6fad4393052c7ba1f4cd97bed3e953a95c79c92ad9b051a04611d9fbb" dependencies = [ "bytes", "fnv", @@ -2998,9 +2987,9 @@ dependencies = [ [[package]] name = "http-body" -version = "0.4.5" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1" +checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2" dependencies = [ "bytes", "http", @@ -3033,9 +3022,9 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" [[package]] name = "hyper" -version = "0.14.27" +version = "0.14.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffb1cfd654a8219eaef89881fdb3bb3b1cdc5fa75ded05d6933b2b382e395468" +checksum = "bf96e135eb83a2a8ddf766e426a841d8ddd7449d5f00d34ea02b41d2f19eef80" dependencies = [ "bytes", "futures-channel", @@ -3048,7 +3037,7 @@ dependencies = [ "httpdate", "itoa", "pin-project-lite", - "socket2 0.4.9", + "socket2 0.5.5", "tokio", "tower-service", "tracing", @@ -3057,9 +3046,9 @@ dependencies = [ [[package]] name = "hyper-rustls" -version = "0.24.1" +version = "0.24.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d78e1e73ec14cf7375674f74d7dde185c8206fd9dea6fb6295e8a98098aaa97" +checksum = "ec3efd23720e2049821a693cbc7e65ea87c72f1c58ff2f9522ff332b1491e590" dependencies = [ "futures-util", "http", @@ -3114,22 +3103,12 @@ dependencies = [ [[package]] name = "indexmap" -version = "1.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" -dependencies = [ - "autocfg", - "hashbrown 0.12.3", -] - -[[package]] -name = "indexmap" -version = "2.0.2" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8adf3ddd720272c6ea8bf59463c04e0f93d0bbf7c5439b691bca2987e0270897" +checksum = "d530e1a18b1cb4c484e6e34556a0d948706958449fca0cab753d649f2bce3d1f" dependencies = [ "equivalent", - "hashbrown 0.14.1", + "hashbrown 0.14.3", ] [[package]] @@ -3174,7 +3153,7 @@ version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b58db92f96b720de98181bbbe63c831e87005ab460c1bf306eb2622b4707997f" dependencies = [ - "socket2 0.5.4", + "socket2 0.5.5", "widestring", "windows-sys 0.48.0", "winreg", @@ -3182,9 +3161,9 @@ dependencies = [ [[package]] name = "ipnet" -version = "2.8.0" +version = "2.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28b29a3cd74f0f4598934efe3aeba42bae0eb4680554128851ebbecb02af14e6" +checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3" [[package]] name = "is-docker" @@ -3197,13 +3176,13 @@ dependencies = [ [[package]] name = "is-terminal" -version = "0.4.9" +version = "0.4.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b" +checksum = "0bad00257d07be169d870ab665980b06cdb366d792ad690bf2e76876dc503455" dependencies = [ "hermit-abi", - "rustix 0.38.21", - "windows-sys 0.48.0", + "rustix 0.38.28", + "windows-sys 0.52.0", ] [[package]] @@ -3242,15 +3221,15 @@ dependencies = [ [[package]] name = "itoa" -version = "1.0.9" +version = "1.0.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" +checksum = "b1a46d1a171d865aa5f83f92695765caa047a9b4cbae2cbf37dbd613a793fd4c" [[package]] name = "js-sys" -version = "0.3.64" +version = "0.3.66" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5f195fe497f702db0f318b07fdd68edb16955aed830df8363d837542f8f935a" +checksum = "cee9c64da59eae3b50095c18d3e74f8b73c0b86d2792824ff01bbce68ba229ca" dependencies = [ "wasm-bindgen", ] @@ -3350,21 +3329,21 @@ checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" [[package]] name = "linux-raw-sys" -version = "0.4.10" +version = "0.4.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da2479e8c062e40bf0066ffa0bc823de0a9368974af99c9f6df941d2c231e03f" +checksum = "c4cd1a83af159aa67994778be9070f0ae1bd732942279cabb14f86f986a21456" [[package]] name = "litrs" -version = "0.2.3" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9275e0933cf8bb20f008924c0cb07a0692fe54d8064996520bf998de9eb79aa" +checksum = "b4ce301924b7887e9d637144fdade93f9dfff9b60981d4ac161db09720d39aa5" [[package]] name = "lock_api" -version = "0.4.10" +version = "0.4.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1cc9717a20b1bb222f333e6a92fd32f7d8a18ddc5a3191a11af45dcbf4dcd16" +checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45" dependencies = [ "autocfg", "scopeguard", @@ -3385,7 +3364,7 @@ version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2994eeba8ed550fd9b47a0b38f0242bc3344e496483c6180b69139cc2fa5d1d7" dependencies = [ - "hashbrown 0.14.1", + "hashbrown 0.14.3", ] [[package]] @@ -3433,9 +3412,9 @@ dependencies = [ [[package]] name = "memchr" -version = "2.6.4" +version = "2.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167" +checksum = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149" [[package]] name = "memmap2" @@ -3448,9 +3427,9 @@ dependencies = [ [[package]] name = "memmap2" -version = "0.9.0" +version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "deaba38d7abf1d4cca21cc89e932e542ba2b9258664d2a9ef0e61512039c9375" +checksum = "45fd3a57831bf88bc63f8cebc0cf956116276e97fef3966103e96416209f7c92" dependencies = [ "libc", ] @@ -3464,15 +3443,6 @@ dependencies = [ "autocfg", ] -[[package]] -name = "memoffset" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c" -dependencies = [ - "autocfg", -] - [[package]] name = "mime" version = "0.3.17" @@ -3496,9 +3466,9 @@ dependencies = [ [[package]] name = "mio" -version = "0.8.8" +version = "0.8.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "927a765cd3fc26206e66b296465fa9d3e5ab003e651c1b3c060e7956d96b19d2" +checksum = "8f3d0b296e374a4e6f3c7b0a1f5a51d748a0d34c85e7dc48fc3fa9a87657fe09" dependencies = [ "libc", "log", @@ -3533,7 +3503,7 @@ dependencies = [ "bitflags 1.3.2", "cfg-if", "libc", - "memoffset 0.7.1", + "memoffset", "pin-utils", ] @@ -3617,18 +3587,18 @@ dependencies = [ [[package]] name = "object" -version = "0.32.1" +version = "0.32.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cf5f9dd3933bd50a9e1f149ec995f39ae2c496d31fd772c1fd45ebc27e902b0" +checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441" dependencies = [ "memchr", ] [[package]] name = "once_cell" -version = "1.18.0" +version = "1.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" +checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" [[package]] name = "oorandom" @@ -3638,9 +3608,9 @@ checksum = "0ab1bc2a289d34bd04a330323ac98a1b4bc82c9d9fcb1e66b63caa84da26b575" [[package]] name = "open" -version = "5.0.0" +version = "5.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cfabf1927dce4d6fdf563d63328a0a506101ced3ec780ca2135747336c98cef8" +checksum = "90878fb664448b54c4e592455ad02831e23a3f7e157374a8b95654731aac7349" dependencies = [ "is-wsl", "libc", @@ -3649,11 +3619,11 @@ dependencies = [ [[package]] name = "openssl" -version = "0.10.57" +version = "0.10.62" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bac25ee399abb46215765b1cb35bc0212377e58a061560d8b29b024fd0430e7c" +checksum = "8cde4d2d9200ad5909f8dac647e29482e07c3a35de8a13fce7c9c7747ad9f671" dependencies = [ - "bitflags 2.4.0", + "bitflags 2.4.1", "cfg-if", "foreign-types", "libc", @@ -3670,7 +3640,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.43", ] [[package]] @@ -3681,9 +3651,9 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "openssl-sys" -version = "0.9.93" +version = "0.9.98" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db4d56a4c0478783083cfafcc42493dd4a981d41669da64b4572a2a089b51b1d" +checksum = "c1665caf8ab2dc9aef43d1c0023bd904633a6a05cb30b0ad59bec2ae986e57a7" dependencies = [ "cc", "libc", @@ -3734,13 +3704,13 @@ dependencies = [ [[package]] name = "parking_lot_core" -version = "0.9.8" +version = "0.9.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93f00c865fe7cabf650081affecd3871070f26767e7b2070a3ffae14c654b447" +checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e" dependencies = [ "cfg-if", "libc", - "redox_syscall 0.3.5", + "redox_syscall", "smallvec", "windows-targets 0.48.5", ] @@ -3788,9 +3758,9 @@ dependencies = [ [[package]] name = "pkg-config" -version = "0.3.27" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" +checksum = "69d3587f8a9e599cc7ec2c00e331f71c4e69a5f9a4b8a6efd5b07466b9736f9a" [[package]] name = "plotters" @@ -3845,11 +3815,17 @@ dependencies = [ "cfg-if", "concurrent-queue", "pin-project-lite", - "rustix 0.38.21", + "rustix 0.38.28", "tracing", "windows-sys 0.52.0", ] +[[package]] +name = "powerfmt" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" + [[package]] name = "ppv-lite86" version = "0.2.17" @@ -3902,9 +3878,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.69" +version = "1.0.71" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da" +checksum = "75cb1540fadbd5b8fbccc4dddad2734eba435053f725621c070711a14bb5f4b8" dependencies = [ "unicode-ident", ] @@ -3921,7 +3897,7 @@ version = "28.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "744a264d26b88a6a7e37cbad97953fa233b94d585236310bcbc88474b4092d79" dependencies = [ - "async-io 2.2.1", + "async-io 2.2.2", "bytesize", "crosstermion", "futures-core", @@ -3999,7 +3975,7 @@ version = "0.25.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a5659e52e4ba6e07b2dad9f1158f578ef84a73762625ddb51536019f34d180eb" dependencies = [ - "bitflags 2.4.0", + "bitflags 2.4.1", "cassowary", "crossterm", "indoc", @@ -4032,15 +4008,6 @@ dependencies = [ "crossbeam-utils", ] -[[package]] -name = "redox_syscall" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" -dependencies = [ - "bitflags 1.3.2", -] - [[package]] name = "redox_syscall" version = "0.4.1" @@ -4052,9 +4019,9 @@ dependencies = [ [[package]] name = "regex" -version = "1.10.0" +version = "1.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d119d7c7ca818f8a53c300863d4f87566aac09943aef5b355bb83969dae75d87" +checksum = "380b951a9c5e80ddfd6136919eef32310721aa4aacd4889a8d39124b026ab343" dependencies = [ "aho-corasick", "memchr", @@ -4064,9 +4031,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.4.1" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "465c6fc0621e4abc4187a2bda0937bfd4f722c2730b29562e19689ea796c9a4b" +checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f" dependencies = [ "aho-corasick", "memchr", @@ -4075,17 +4042,17 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.8.1" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56d84fdd47036b038fc80dd333d10b6aab10d5d31f4a366e20014def75328d33" +checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" [[package]] name = "reqwest" -version = "0.11.22" +version = "0.11.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "046cd98826c46c2ac8ddecae268eb5c2e58628688a5fc7a2643704a73faba95b" +checksum = "37b1ae8d9ac08420c66222fb9096fc5de435c3c48542bc5336c51892cffafb41" dependencies = [ - "base64 0.21.4", + "base64 0.21.5", "bytes", "encoding_rs", "futures-core", @@ -4105,7 +4072,7 @@ dependencies = [ "percent-encoding", "pin-project-lite", "rustls 0.21.10", - "rustls-pemfile 1.0.3", + "rustls-pemfile 1.0.4", "serde", "serde_json", "serde_urlencoded", @@ -4150,9 +4117,9 @@ dependencies = [ [[package]] name = "ring" -version = "0.17.3" +version = "0.17.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9babe80d5c16becf6594aa32ad2be8fe08498e7ae60b77de8df700e67f191d7e" +checksum = "688c63d65483050968b2a8937f7995f443e27041a0f7700aa59b0822aedebb74" dependencies = [ "cc", "getrandom", @@ -4168,7 +4135,7 @@ version = "0.30.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a78046161564f5e7cd9008aff3b2990b3850dc8e0349119b98e8f251e099f24d" dependencies = [ - "bitflags 2.4.0", + "bitflags 2.4.1", "fallible-iterator", "fallible-streaming-iterator", "hashlink", @@ -4184,9 +4151,9 @@ checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" [[package]] name = "rustix" -version = "0.37.25" +version = "0.37.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4eb579851244c2c03e7c24f501c3432bed80b8f720af1d6e5b0e0f01555a035" +checksum = "fea8ca367a3a01fe35e6943c400addf443c0f57670e6ec51196f71a4b8762dd2" dependencies = [ "bitflags 1.3.2", "errno", @@ -4198,15 +4165,15 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.21" +version = "0.38.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b426b0506e5d50a7d8dafcf2e81471400deb602392c7dd110815afb4eaf02a3" +checksum = "72e572a5e8ca657d7366229cdde4bd14c4eb5499a9573d4d366fe1b599daa316" dependencies = [ - "bitflags 2.4.0", + "bitflags 2.4.1", "errno", "libc", - "linux-raw-sys 0.4.10", - "windows-sys 0.48.0", + "linux-raw-sys 0.4.12", + "windows-sys 0.52.0", ] [[package]] @@ -4228,7 +4195,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f9d5a6813c0759e4609cd494e8e725babae6a2ca7b62a5536a13daaec6fcb7ba" dependencies = [ "log", - "ring 0.17.3", + "ring 0.17.7", "rustls-webpki", "sct", ] @@ -4259,11 +4226,11 @@ dependencies = [ [[package]] name = "rustls-pemfile" -version = "1.0.3" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d3987094b1d07b653b7dfdc3f70ce9a1da9c51ac18c1b06b662e4f9a0e9f4b2" +checksum = "1c74cae0a4cf6ccbbf5f359f08efdf8ee7e1dc532573bf0db71968cb56b1448c" dependencies = [ - "base64 0.21.4", + "base64 0.21.5", ] [[package]] @@ -4272,7 +4239,7 @@ version = "0.101.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8b6275d1ee7a1cd780b64aca7726599a1dbc893b1e64144529e55c3c2f745765" dependencies = [ - "ring 0.17.3", + "ring 0.17.7", "untrusted 0.9.0", ] @@ -4284,9 +4251,9 @@ checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4" [[package]] name = "ryu" -version = "1.0.15" +version = "1.0.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741" +checksum = "f98d2aa92eebf49b69786be48e4477826b256916e84a57ff2a4f21923b48eb4c" [[package]] name = "same-file" @@ -4299,11 +4266,11 @@ dependencies = [ [[package]] name = "schannel" -version = "0.1.22" +version = "0.1.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c3733bf4cf7ea0880754e19cb5a462007c4a8c1914bff372ccc95b464f1df88" +checksum = "fbc91545643bcf3a0bbb6569265615222618bdf33ce4ffbbd13c4bbd4c093534" dependencies = [ - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] @@ -4318,7 +4285,7 @@ version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "da046153aa2352493d6cb7da4b6e5c0c057d8a1d0a9aa8560baffdd945acd414" dependencies = [ - "ring 0.17.3", + "ring 0.17.7", "untrusted 0.9.0", ] @@ -4347,29 +4314,29 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.189" +version = "1.0.193" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e422a44e74ad4001bdc8eede9a4570ab52f71190e9c076d14369f38b9200537" +checksum = "25dd9975e68d0cb5aa1120c288333fc98731bd1dd12f561e468ea4728c042b89" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.189" +version = "1.0.193" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e48d1f918009ce3145511378cf68d613e3b3d9137d67272562080d68a2b32d5" +checksum = "43576ca501357b9b071ac53cdc7da8ef0cbd9493d8df094cd821777ea6e894d3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.43", ] [[package]] name = "serde_json" -version = "1.0.107" +version = "1.0.108" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b420ce6e3d8bd882e9b243c6eed35dbc9a6110c9769e74b584e0d68d1f20c65" +checksum = "3d1c7e3eac408d115102c4c24ad393e0821bb3a5df4d506a80f85f7a742a526b" dependencies = [ "itoa", "ryu", @@ -4410,7 +4377,7 @@ checksum = "91d129178576168c589c9ec973feedf7d3126c01ac2bf08795109aa35b69fb8f" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.43", ] [[package]] @@ -4496,18 +4463,18 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.11.1" +version = "1.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "942b4a808e05215192e39f4ab80813e599068285906cc91aa64f923db842bd5a" +checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970" dependencies = [ "serde", ] [[package]] name = "socket2" -version = "0.4.9" +version = "0.4.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64a4a911eed85daf18834cfaa86a79b7d266ff93ff5ba14005426219480ed662" +checksum = "9f7916fc008ca5542385b89a3d3ce689953c143e9304a9bf8beec1de48994c0d" dependencies = [ "libc", "winapi", @@ -4515,9 +4482,9 @@ dependencies = [ [[package]] name = "socket2" -version = "0.5.4" +version = "0.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4031e820eb552adee9295814c0ced9e5cf38ddf1e8b7d566d6de8e2538ea989e" +checksum = "7b5fac59a5cb5dd637972e5fca70daf0523c9067fcdc4842f053dae04a18f8e9" dependencies = [ "libc", "windows-sys 0.48.0", @@ -4576,7 +4543,7 @@ dependencies = [ "proc-macro2", "quote", "rustversion", - "syn 2.0.38", + "syn 2.0.43", ] [[package]] @@ -4598,9 +4565,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.38" +version = "2.0.43" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e96b79aaa137db8f61e26363a0c9b47d8b4ec75da28b7d1d614c2303e232408b" +checksum = "ee659fb5f3d355364e1f3e5bc10fb82068efbf824a1e9d1c9504244a6469ad53" dependencies = [ "proc-macro2", "quote", @@ -4681,22 +4648,22 @@ dependencies = [ [[package]] name = "tempfile" -version = "3.8.1" +version = "3.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ef1adac450ad7f4b3c28589471ade84f25f731a7a0fe30d71dfa9f60fd808e5" +checksum = "01ce4141aa927a6d1bd34a041795abd0db1cccba5d5f24b009f694bdf3a1f3fa" dependencies = [ "cfg-if", "fastrand 2.0.1", - "redox_syscall 0.4.1", - "rustix 0.38.21", - "windows-sys 0.48.0", + "redox_syscall", + "rustix 0.38.28", + "windows-sys 0.52.0", ] [[package]] name = "termcolor" -version = "1.3.0" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6093bad37da69aab9d123a8091e4be0aa4a03e4d601ec641c327398315f62b64" +checksum = "ff1bc3d3f05aff0403e8ac0d92ced918ec05b666a43f83297ccef5bea8a3d449" dependencies = [ "winapi-util", ] @@ -4707,28 +4674,28 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "21bebf2b7c9e0a515f6e0f8c51dc0f8e4696391e6f1ff30379559f8365fb0df7" dependencies = [ - "rustix 0.38.21", + "rustix 0.38.28", "windows-sys 0.48.0", ] [[package]] name = "thiserror" -version = "1.0.49" +version = "1.0.52" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1177e8c6d7ede7afde3585fd2513e611227efd6481bd78d2e82ba1ce16557ed4" +checksum = "83a48fd946b02c0a526b2e9481c8e2a17755e47039164a86c4070446e3a4614d" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.49" +version = "1.0.52" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10712f02019e9288794769fba95cd6847df9874d49d871d062172f9dd41bc4cc" +checksum = "e7fbe9b594d6568a6a1443250a7e67d80b74e1e96f6d1715e1e21cc1888291d3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.43", ] [[package]] @@ -4743,13 +4710,15 @@ dependencies = [ [[package]] name = "time" -version = "0.3.23" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59e399c068f43a5d116fedaf73b203fa4f9c519f17e2b34f63221d3792f81446" +checksum = "f657ba42c3f86e7680e53c8cd3af8abbe56b5491790b46e22e19c0d57463583e" dependencies = [ + "deranged", "itoa", "libc", "num_threads", + "powerfmt", "serde", "time-core", "time-macros", @@ -4757,15 +4726,15 @@ dependencies = [ [[package]] name = "time-core" -version = "0.1.1" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7300fbefb4dadc1af235a9cef3737cea692a9d97e1b9cbcd4ebdae6f8868e6fb" +checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" [[package]] name = "time-macros" -version = "0.2.10" +version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96ba15a897f3c86766b757e5ac7221554c6750054d74d5b28844fce5fb36a6c4" +checksum = "26197e33420244aeb70c3e8c78376ca46571bc4e701e4791c2cd9f57dcb3a43f" dependencies = [ "time-core", ] @@ -4797,9 +4766,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.33.0" +version = "1.35.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f38200e3ef7995e5ef13baec2f432a6da0aa9ac495b2c0e8f3b7eec2c92d653" +checksum = "c89b4efa943be685f629b149f53829423f8f5531ea21249408e8e2f8671ec104" dependencies = [ "backtrace", "bytes", @@ -4807,7 +4776,7 @@ dependencies = [ "mio", "num_cpus", "pin-project-lite", - "socket2 0.5.4", + "socket2 0.5.5", "windows-sys 0.48.0", ] @@ -4833,9 +4802,9 @@ dependencies = [ [[package]] name = "tokio-util" -version = "0.7.9" +version = "0.7.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d68074620f57a0b21594d9735eb2e98ab38b17f80d3fcb189fca266771ca60d" +checksum = "5419f34732d9eb6ee4c3578b7989078579b7f039cbbb9ca2c4da015749371e15" dependencies = [ "bytes", "futures-core", @@ -4847,9 +4816,9 @@ dependencies = [ [[package]] name = "toml_datetime" -version = "0.6.3" +version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7cda73e2f1397b1262d6dfdcef8aafae14d1de7748d66822d3bfeeb6d03e5e4b" +checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1" [[package]] name = "toml_edit" @@ -4857,7 +4826,7 @@ version = "0.19.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" dependencies = [ - "indexmap 2.0.2", + "indexmap", "toml_datetime", "winnow", ] @@ -4887,7 +4856,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.43", ] [[package]] @@ -4915,20 +4884,20 @@ dependencies = [ [[package]] name = "tracing-log" -version = "0.1.3" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78ddad33d2d10b1ed7eb9d1f518a5674713876e97e5bb9b7345a7984fbb4f922" +checksum = "ee855f1f400bd0e5c02d150ae5de3840039a3f54b025156404e34c23c03f47c3" dependencies = [ - "lazy_static", "log", + "once_cell", "tracing-core", ] [[package]] name = "tracing-subscriber" -version = "0.3.17" +version = "0.3.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30a651bc37f915e81f087d86e62a18eec5f79550c7faff886f7090b4ea757c77" +checksum = "ad0f048c97dbd9faa9b7df56362b8ebcaa52adb06b498c050d2f4e32f90a7a8b" dependencies = [ "nu-ansi-term", "sharded-slab", @@ -4940,9 +4909,9 @@ dependencies = [ [[package]] name = "trust-dns-proto" -version = "0.23.1" +version = "0.23.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "559ac980345f7f5020883dd3bcacf176355225e01916f8c2efecad7534f682c6" +checksum = "3119112651c157f4488931a01e586aa459736e9d6046d3bd9105ffb69352d374" dependencies = [ "async-trait", "cfg-if", @@ -4965,9 +4934,9 @@ dependencies = [ [[package]] name = "trust-dns-resolver" -version = "0.23.1" +version = "0.23.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c723b0e608b24ad04c73b2607e0241b2c98fd79795a95e98b068b6966138a29d" +checksum = "10a3e6c3aff1718b3c73e395d1f35202ba2ffa847c6a62eea0db8fb4cfe30be6" dependencies = [ "cfg-if", "futures-util", @@ -4986,15 +4955,15 @@ dependencies = [ [[package]] name = "try-lock" -version = "0.2.4" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed" +checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" [[package]] name = "trybuild" -version = "1.0.85" +version = "1.0.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "196a58260a906cedb9bf6d8034b6379d0c11f552416960452f267402ceeddff1" +checksum = "8419ecd263363827c5730386f418715766f584e2f874d32c23c5b00bd9727e7e" dependencies = [ "basic-toml", "glob", @@ -5034,15 +5003,15 @@ dependencies = [ [[package]] name = "unicode-bidi" -version = "0.3.13" +version = "0.3.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" +checksum = "6f2528f27a9eb2b21e69c95319b30bd0efd85d09c379741b0f78ea1d86be2416" [[package]] name = "unicode-bom" -version = "2.0.2" +version = "2.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "98e90c70c9f0d4d1ee6d0a7d04aa06cb9bbd53d8cfbdd62a0269a7c2eb640552" +checksum = "7eec5d1121208364f6793f7d2e222bf75a915c19557537745b195b253dd64217" [[package]] name = "unicode-ident" @@ -5108,9 +5077,9 @@ checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" [[package]] name = "value-bag" -version = "1.4.1" +version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d92ccd67fb88503048c01b59152a04effd0782d035a83a6d256ce6085f08f4a3" +checksum = "4a72e1902dde2bd6441347de2b70b7f5d59bf157c6c62f0c44572607a1d55bbe" [[package]] name = "vcpkg" @@ -5178,9 +5147,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.87" +version = "0.2.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7706a72ab36d8cb1f80ffbf0e071533974a60d0a308d01a5d0375bf60499a342" +checksum = "0ed0d4f68a3015cc185aff4db9506a015f4b96f95303897bfa23f846db54064e" dependencies = [ "cfg-if", "wasm-bindgen-macro", @@ -5188,24 +5157,24 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.87" +version = "0.2.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ef2b6d3c510e9625e5fe6f509ab07d66a760f0885d858736483c32ed7809abd" +checksum = "1b56f625e64f3a1084ded111c4d5f477df9f8c92df113852fa5a374dbda78826" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.43", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-futures" -version = "0.4.37" +version = "0.4.39" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c02dbc21516f9f1f04f187958890d7e6026df8d16540b7ad9492bc34a67cea03" +checksum = "ac36a15a220124ac510204aec1c3e5db8a22ab06fd6706d881dc6149f8ed9a12" dependencies = [ "cfg-if", "js-sys", @@ -5215,9 +5184,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.87" +version = "0.2.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dee495e55982a3bd48105a7b947fd2a9b4a8ae3010041b9e0faab3f9cd028f1d" +checksum = "0162dbf37223cd2afce98f3d0785506dcb8d266223983e4b5b525859e6e182b2" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -5225,28 +5194,28 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.87" +version = "0.2.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" +checksum = "f0eb82fcb7930ae6219a7ecfd55b217f5f0893484b7a13022ebb2b2bf20b5283" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.43", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.87" +version = "0.2.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1" +checksum = "7ab9b36309365056cd639da3134bf87fa8f3d86008abf99e612384a6eecd459f" [[package]] name = "web-sys" -version = "0.3.64" +version = "0.3.66" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b85cbef8c220a6abc02aefd892dfc0fc23afb1c6a426316ec33253a3877249b" +checksum = "50c24a44ec86bb68fbecd1b3efed7e85ea5621b39b35ef2766b66cd984f8010f" dependencies = [ "js-sys", "wasm-bindgen", @@ -5258,15 +5227,15 @@ version = "0.22.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ed63aea5ce73d0ff405984102c42de94fc55a6b75765d621c65262469b3c9b53" dependencies = [ - "ring 0.17.3", + "ring 0.17.7", "untrusted 0.9.0", ] [[package]] name = "webpki-roots" -version = "0.25.2" +version = "0.25.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14247bb57be4f377dfb94c72830b8ce8fc6beac03cf4bf7b9732eadd414123fc" +checksum = "1778a42e8b3b90bff8d0f5032bf22250792889a5cdc752aa0020c84abe3aaf10" [[package]] name = "widestring" @@ -5552,9 +5521,9 @@ checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04" [[package]] name = "winnow" -version = "0.5.24" +version = "0.5.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0383266b19108dfc6314a56047aa545a1b4d1be60e799b4dbdd407b56402704b" +checksum = "97a4882e6b134d6c28953a387571f1acdd3496830d5e36c5e3a1075580ea641c" dependencies = [ "memchr", ] @@ -5571,11 +5540,13 @@ dependencies = [ [[package]] name = "xattr" -version = "1.0.1" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4686009f71ff3e5c4dbcf1a282d0a44db3f021ba69350cd42086b3e5f1c6985" +checksum = "914566e6413e7fa959cc394fb30e563ba80f3541fbd40816d4c05a0fc3f2a0f1" dependencies = [ "libc", + "linux-raw-sys 0.4.12", + "rustix 0.38.28", ] [[package]] @@ -5610,7 +5581,7 @@ checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.43", ] [[package]] diff --git a/clippy.toml b/clippy.toml index e034672c769..1645c19f32b 100644 --- a/clippy.toml +++ b/clippy.toml @@ -1 +1 @@ -msrv = "1.65.0" +msrv = "1.70.0" diff --git a/etc/msrv-badge.svg b/etc/msrv-badge.svg index 72186a6c94c..ec94eb9880b 100644 --- a/etc/msrv-badge.svg +++ b/etc/msrv-badge.svg @@ -1 +1 @@ -rustc: 1.59.0+rustc1.65.0+ +rustc: 1.70.0+rustc1.70.0+ diff --git a/gix-actor/Cargo.toml b/gix-actor/Cargo.toml index 010247ca9fc..b0c8e351d1c 100644 --- a/gix-actor/Cargo.toml +++ b/gix-actor/Cargo.toml @@ -7,7 +7,7 @@ repository = "https://github.com/Byron/gitoxide" license = "MIT OR Apache-2.0" edition = "2021" include = ["src/**/*", "LICENSE-*"] -rust-version = "1.65" +rust-version = "1.70" [lib] doctest = false diff --git a/gix-archive/Cargo.toml b/gix-archive/Cargo.toml index 721a39e28ea..3dc4e20726b 100644 --- a/gix-archive/Cargo.toml +++ b/gix-archive/Cargo.toml @@ -6,7 +6,7 @@ license = "MIT OR Apache-2.0" description = "archive generation from of a worktree stream" authors = ["Sebastian Thiel "] edition = "2021" -rust-version = "1.65" +rust-version = "1.70" include = ["src/**/*", "LICENSE-*"] [lib] diff --git a/gix-attributes/Cargo.toml b/gix-attributes/Cargo.toml index 1518ea6f838..45c57dd60ab 100644 --- a/gix-attributes/Cargo.toml +++ b/gix-attributes/Cargo.toml @@ -7,7 +7,7 @@ description = "A crate of the gitoxide project dealing .gitattributes files" authors = ["Sebastian Thiel "] edition = "2021" include = ["src/**/*", "LICENSE-*"] -rust-version = "1.65" +rust-version = "1.70" [lib] doctest = false diff --git a/gix-bitmap/Cargo.toml b/gix-bitmap/Cargo.toml index ccb247283c6..b25da5fda6e 100644 --- a/gix-bitmap/Cargo.toml +++ b/gix-bitmap/Cargo.toml @@ -6,7 +6,7 @@ license = "MIT OR Apache-2.0" description = "A crate of the gitoxide project dedicated implementing the standard git bitmap format" authors = ["Sebastian Thiel "] edition = "2021" -rust-version = "1.65" +rust-version = "1.70" exclude = ["CHANGELOG.md"] [lib] diff --git a/gix-chunk/Cargo.toml b/gix-chunk/Cargo.toml index fb800637440..6b136637f2b 100644 --- a/gix-chunk/Cargo.toml +++ b/gix-chunk/Cargo.toml @@ -8,7 +8,7 @@ documentation = "https://github.com/git/git/blob/seen/Documentation/technical/ch license = "MIT OR Apache-2.0" edition = "2021" include = ["src/**/*", "LICENSE-*"] -rust-version = "1.65" +rust-version = "1.70" [lib] doctest = false diff --git a/gix-command/Cargo.toml b/gix-command/Cargo.toml index e6347d67901..7d8b3d50ba9 100644 --- a/gix-command/Cargo.toml +++ b/gix-command/Cargo.toml @@ -6,7 +6,7 @@ license = "MIT OR Apache-2.0" description = "A crate of the gitoxide project handling internal git command execution" authors = ["Sebastian Thiel "] edition = "2021" -rust-version = "1.65" +rust-version = "1.70" include = ["src/lib.rs", "LICENSE-*"] [lib] diff --git a/gix-commitgraph/Cargo.toml b/gix-commitgraph/Cargo.toml index f2a4907d0a4..580fa33db25 100644 --- a/gix-commitgraph/Cargo.toml +++ b/gix-commitgraph/Cargo.toml @@ -8,7 +8,7 @@ description = "Read-only access to the git commitgraph file format" authors = ["Conor Davis ", "Sebastian Thiel "] edition = "2021" include = ["src/**/*", "LICENSE-*"] -rust-version = "1.65" +rust-version = "1.70" [lib] doctest = false diff --git a/gix-config-value/Cargo.toml b/gix-config-value/Cargo.toml index ecddf32ef8c..b3df4befea7 100644 --- a/gix-config-value/Cargo.toml +++ b/gix-config-value/Cargo.toml @@ -6,7 +6,7 @@ license = "MIT OR Apache-2.0" description = "A crate of the gitoxide project providing git-config value parsing" authors = ["Sebastian Thiel "] edition = "2021" -rust-version = "1.65" +rust-version = "1.70" include = ["src/**/*", "LICENSE-*"] [lib] diff --git a/gix-config/Cargo.toml b/gix-config/Cargo.toml index 4e3053fb590..f36adea6606 100644 --- a/gix-config/Cargo.toml +++ b/gix-config/Cargo.toml @@ -9,7 +9,7 @@ edition = "2021" keywords = ["git-config", "git", "config", "gitoxide"] categories = ["config", "parser-implementations"] include = ["src/**/*", "LICENSE-*", "README.md"] -rust-version = "1.65" +rust-version = "1.70" autotests = false [features] diff --git a/gix-config/tests/Cargo.toml b/gix-config/tests/Cargo.toml index 8fc8775d239..f46966d85ff 100644 --- a/gix-config/tests/Cargo.toml +++ b/gix-config/tests/Cargo.toml @@ -6,7 +6,7 @@ description = "Tests for the gix-config crate" license = "MIT OR Apache-2.0" authors = ["Edward Shen "] edition = "2021" -rust-version = "1.65" +rust-version = "1.70" publish = false diff --git a/gix-credentials/Cargo.toml b/gix-credentials/Cargo.toml index 48b616e889a..521ad405181 100644 --- a/gix-credentials/Cargo.toml +++ b/gix-credentials/Cargo.toml @@ -6,7 +6,7 @@ license = "MIT OR Apache-2.0" description = "A crate of the gitoxide project to interact with git credentials helpers" authors = ["Sebastian Thiel "] edition = "2021" -rust-version = "1.65" +rust-version = "1.70" include = ["src/**/*", "LICENSE-*"] [lib] diff --git a/gix-date/Cargo.toml b/gix-date/Cargo.toml index dc967b44c56..6963833ee2e 100644 --- a/gix-date/Cargo.toml +++ b/gix-date/Cargo.toml @@ -7,7 +7,7 @@ description = "A crate of the gitoxide project parsing dates the way git does" authors = ["Sebastian Thiel "] edition = "2021" include = ["src/**/*", "LICENSE-*"] -rust-version = "1.65" +rust-version = "1.70" [lib] doctest = false diff --git a/gix-diff/Cargo.toml b/gix-diff/Cargo.toml index 2e724627d69..a2aaad94880 100644 --- a/gix-diff/Cargo.toml +++ b/gix-diff/Cargo.toml @@ -7,7 +7,7 @@ description = "Calculate differences between various git objects" authors = ["Sebastian Thiel "] edition = "2021" include = ["src/**/*", "LICENSE-*"] -rust-version = "1.65" +rust-version = "1.70" autotests = false [features] diff --git a/gix-diff/tests/Cargo.toml b/gix-diff/tests/Cargo.toml index e63c3d5a320..e694b7de21c 100644 --- a/gix-diff/tests/Cargo.toml +++ b/gix-diff/tests/Cargo.toml @@ -7,7 +7,7 @@ license = "MIT OR Apache-2.0" description = "Tests for the gix-diff crate" authors = ["Sebastian Thiel "] edition = "2021" -rust-version = "1.65" +rust-version = "1.70" [[test]] doctest = false diff --git a/gix-discover/Cargo.toml b/gix-discover/Cargo.toml index 633711c66f7..336916d955f 100644 --- a/gix-discover/Cargo.toml +++ b/gix-discover/Cargo.toml @@ -7,7 +7,7 @@ description = "Discover git repositories and check if a directory is a git repos authors = ["Sebastian Thiel "] edition = "2021" include = ["src/**/*", "LICENSE-*"] -rust-version = "1.65" +rust-version = "1.70" [lib] doctest = false diff --git a/gix-features/Cargo.toml b/gix-features/Cargo.toml index 8744788b196..64a644c68de 100644 --- a/gix-features/Cargo.toml +++ b/gix-features/Cargo.toml @@ -6,7 +6,7 @@ version = "0.36.1" authors = ["Sebastian Thiel "] license = "MIT OR Apache-2.0" edition = "2021" -rust-version = "1.65" +rust-version = "1.70" include = ["src/**/*", "LICENSE-*"] [lib] diff --git a/gix-fetchhead/Cargo.toml b/gix-fetchhead/Cargo.toml index 7d1a293f9f1..fe13f062b23 100644 --- a/gix-fetchhead/Cargo.toml +++ b/gix-fetchhead/Cargo.toml @@ -6,7 +6,7 @@ license = "MIT OR Apache-2.0" description = "A crate of the gitoxide project to read and write .git/FETCH_HEAD" authors = ["Sebastian Thiel "] edition = "2021" -rust-version = "1.65" +rust-version = "1.70" [lib] doctest = false diff --git a/gix-filter/Cargo.toml b/gix-filter/Cargo.toml index 339ddcd3cd6..9c42c30fa06 100644 --- a/gix-filter/Cargo.toml +++ b/gix-filter/Cargo.toml @@ -6,7 +6,7 @@ license = "MIT OR Apache-2.0" description = "A crate of the gitoxide project implementing git filters" authors = ["Sebastian Thiel "] edition = "2021" -rust-version = "1.65" +rust-version = "1.70" include = ["src/**/*", "LICENSE-*"] [lib] diff --git a/gix-fs/Cargo.toml b/gix-fs/Cargo.toml index 532ea1145f4..d522617a289 100644 --- a/gix-fs/Cargo.toml +++ b/gix-fs/Cargo.toml @@ -6,7 +6,7 @@ license = "MIT OR Apache-2.0" description = "A crate providing file system specific utilities to `gitoxide`" authors = ["Sebastian Thiel "] edition = "2021" -rust-version = "1.65" +rust-version = "1.70" include = ["src/**/*", "LICENSE-*"] [lib] diff --git a/gix-fsck/Cargo.toml b/gix-fsck/Cargo.toml index 76278e1c897..125966d3322 100644 --- a/gix-fsck/Cargo.toml +++ b/gix-fsck/Cargo.toml @@ -7,7 +7,7 @@ license = "MIT OR Apache-2.0" description = "Verifies the connectivity and validity of objects in the database" edition = "2021" include = ["src/**/*", "LICENSE-*"] -rust-version = "1.65" +rust-version = "1.70" [lib] doctest = false diff --git a/gix-glob/Cargo.toml b/gix-glob/Cargo.toml index 14ab8da42f2..4bdb6d3847f 100644 --- a/gix-glob/Cargo.toml +++ b/gix-glob/Cargo.toml @@ -6,7 +6,7 @@ license = "MIT OR Apache-2.0" description = "A crate of the gitoxide project dealing with pattern matching" authors = ["Sebastian Thiel "] edition = "2021" -rust-version = "1.65" +rust-version = "1.70" include = ["src/**/*", "LICENSE-*"] [lib] diff --git a/gix-hash/Cargo.toml b/gix-hash/Cargo.toml index d30a864a910..72acccca924 100644 --- a/gix-hash/Cargo.toml +++ b/gix-hash/Cargo.toml @@ -7,7 +7,7 @@ repository = "https://github.com/Byron/gitoxide" license = "MIT OR Apache-2.0" edition = "2021" include = ["src/**/*", "LICENSE-*"] -rust-version = "1.65" +rust-version = "1.70" [lib] doctest = false diff --git a/gix-hashtable/Cargo.toml b/gix-hashtable/Cargo.toml index a8f6d63acb3..10b0cabbb7e 100644 --- a/gix-hashtable/Cargo.toml +++ b/gix-hashtable/Cargo.toml @@ -7,7 +7,7 @@ description = "A crate that provides hashtable based data structures optimized t authors = ["Pascal Kuthe "] edition = "2021" include = ["src/**/*", "LICENSE-*"] -rust-version = "1.65" +rust-version = "1.70" [lib] doctest = false diff --git a/gix-ignore/Cargo.toml b/gix-ignore/Cargo.toml index ac7238bc580..d29a81cb398 100644 --- a/gix-ignore/Cargo.toml +++ b/gix-ignore/Cargo.toml @@ -7,7 +7,7 @@ description = "A crate of the gitoxide project dealing .gitignore files" authors = ["Sebastian Thiel "] edition = "2021" include = ["src/**/*", "LICENSE-*"] -rust-version = "1.65" +rust-version = "1.70" [lib] doctest = false diff --git a/gix-index/Cargo.toml b/gix-index/Cargo.toml index 9dae045bc39..675746d05a3 100644 --- a/gix-index/Cargo.toml +++ b/gix-index/Cargo.toml @@ -7,7 +7,7 @@ description = "A work-in-progress crate of the gitoxide project dedicated implem authors = ["Sebastian Thiel "] edition = "2021" include = ["src/**/*", "LICENSE-*", "README.md"] -rust-version = "1.65" +rust-version = "1.70" autotests = false diff --git a/gix-index/tests/Cargo.toml b/gix-index/tests/Cargo.toml index 4d15e5aed4f..f30bdbca45c 100644 --- a/gix-index/tests/Cargo.toml +++ b/gix-index/tests/Cargo.toml @@ -7,7 +7,7 @@ license = "MIT OR Apache-2.0" description = "Integration tests for gix-index" authors = ["Sebastian Thiel "] edition = "2021" -rust-version = "1.65" +rust-version = "1.70" [[test]] name = "integrate" diff --git a/gix-lfs/Cargo.toml b/gix-lfs/Cargo.toml index 348f6b5408c..af967872f22 100644 --- a/gix-lfs/Cargo.toml +++ b/gix-lfs/Cargo.toml @@ -6,7 +6,7 @@ license = "MIT OR Apache-2.0" description = "A crate of the gitoxide project dealing with handling git large file support" authors = ["Sebastian Thiel "] edition = "2021" -rust-version = "1.65" +rust-version = "1.70" [lib] doctest = false diff --git a/gix-lock/Cargo.toml b/gix-lock/Cargo.toml index 72e7171a378..e9ba15a15ec 100644 --- a/gix-lock/Cargo.toml +++ b/gix-lock/Cargo.toml @@ -7,7 +7,7 @@ description = "A git-style lock-file implementation" authors = ["Sebastian Thiel "] edition = "2021" include = ["src/**/*", "LICENSE-*", "README.md"] -rust-version = "1.65" +rust-version = "1.70" [lib] doctest = false diff --git a/gix-macros/Cargo.toml b/gix-macros/Cargo.toml index 64912a9afd5..625a96aacd3 100644 --- a/gix-macros/Cargo.toml +++ b/gix-macros/Cargo.toml @@ -11,7 +11,7 @@ authors = [ repository = "https://github.com/Byron/gitoxide" license = "MIT OR Apache-2.0" include = ["src/**/*", "LICENSE-*"] -rust-version = "1.65" +rust-version = "1.70" [lib] proc_macro = true diff --git a/gix-mailmap/Cargo.toml b/gix-mailmap/Cargo.toml index 9090a207d43..74a4e650db8 100644 --- a/gix-mailmap/Cargo.toml +++ b/gix-mailmap/Cargo.toml @@ -6,7 +6,7 @@ license = "MIT OR Apache-2.0" description = "A crate of the gitoxide project for parsing mailmap files" authors = ["Sebastian Thiel "] edition = "2021" -rust-version = "1.65" +rust-version = "1.70" include = ["src/**/*", "LICENSE-*"] [lib] diff --git a/gix-negotiate/Cargo.toml b/gix-negotiate/Cargo.toml index 03d9c913c04..96496374b1e 100644 --- a/gix-negotiate/Cargo.toml +++ b/gix-negotiate/Cargo.toml @@ -6,7 +6,7 @@ license = "MIT OR Apache-2.0" description = "A crate of the gitoxide project implementing negotiation algorithms" authors = ["Sebastian Thiel "] edition = "2021" -rust-version = "1.65" +rust-version = "1.70" include = ["src/**/*", "LICENSE-*"] [lib] diff --git a/gix-note/Cargo.toml b/gix-note/Cargo.toml index c6e1a10ed72..588abd09329 100644 --- a/gix-note/Cargo.toml +++ b/gix-note/Cargo.toml @@ -6,7 +6,7 @@ license = "MIT OR Apache-2.0" description = "A crate of the gitoxide project dealing with git notes" authors = ["Sebastian Thiel "] edition = "2021" -rust-version = "1.65" +rust-version = "1.70" [lib] doctest = false diff --git a/gix-object/Cargo.toml b/gix-object/Cargo.toml index 0fc3410188f..be26e4b0de3 100644 --- a/gix-object/Cargo.toml +++ b/gix-object/Cargo.toml @@ -7,7 +7,7 @@ repository = "https://github.com/Byron/gitoxide" license = "MIT OR Apache-2.0" edition = "2021" include = ["src/**/*", "LICENSE-*"] -rust-version = "1.65" +rust-version = "1.70" [lib] doctest = false diff --git a/gix-odb/Cargo.toml b/gix-odb/Cargo.toml index e82f9b044d0..9ff86ca2c44 100644 --- a/gix-odb/Cargo.toml +++ b/gix-odb/Cargo.toml @@ -7,7 +7,7 @@ license = "MIT OR Apache-2.0" description = "Implements various git object databases" edition = "2021" include = ["src/**/*", "LICENSE-*"] -rust-version = "1.65" +rust-version = "1.70" autotests = false [lib] diff --git a/gix-odb/tests/Cargo.toml b/gix-odb/tests/Cargo.toml index 2c26eb6b801..bc75d7487b1 100644 --- a/gix-odb/tests/Cargo.toml +++ b/gix-odb/tests/Cargo.toml @@ -6,7 +6,7 @@ authors = ["Sebastian Thiel "] license = "MIT OR Apache-2.0" description = "Tests for gix-odb with feature-toggle support" edition = "2021" -rust-version = "1.65" +rust-version = "1.70" publish = false [features] diff --git a/gix-pack/Cargo.toml b/gix-pack/Cargo.toml index c3c65dd4ce6..477e8c1d886 100644 --- a/gix-pack/Cargo.toml +++ b/gix-pack/Cargo.toml @@ -7,7 +7,7 @@ license = "MIT OR Apache-2.0" description = "Implements git packs and related data structures" edition = "2021" include = ["src/**/*", "LICENSE-*"] -rust-version = "1.65" +rust-version = "1.70" autotests = false [lib] diff --git a/gix-pack/tests/Cargo.toml b/gix-pack/tests/Cargo.toml index d5da0761c41..184ee8f0bfe 100644 --- a/gix-pack/tests/Cargo.toml +++ b/gix-pack/tests/Cargo.toml @@ -6,7 +6,7 @@ authors = ["Sebastian Thiel "] license = "MIT OR Apache-2.0" description = "Please use `gix-` instead ('git' -> 'gix')" edition = "2021" -rust-version = "1.65" +rust-version = "1.70" [features] gix-features-parallel = ["gix-features/parallel"] diff --git a/gix-packetline-blocking/Cargo.toml b/gix-packetline-blocking/Cargo.toml index 9ebe76873fd..98d4aca8821 100644 --- a/gix-packetline-blocking/Cargo.toml +++ b/gix-packetline-blocking/Cargo.toml @@ -7,7 +7,7 @@ description = "A duplicate of `gix-packetline` with the `blocking-io` feature pr authors = ["Sebastian Thiel "] edition = "2021" include = ["src/**/*", "LICENSE-*"] -rust-version = "1.65" +rust-version = "1.70" [lib] doctest = false diff --git a/gix-packetline/Cargo.toml b/gix-packetline/Cargo.toml index c0050f452f1..a2755c87c56 100644 --- a/gix-packetline/Cargo.toml +++ b/gix-packetline/Cargo.toml @@ -7,7 +7,7 @@ description = "A crate of the gitoxide project implementing the pkt-line seriali authors = ["Sebastian Thiel "] edition = "2021" include = ["src/**/*", "LICENSE-*"] -rust-version = "1.65" +rust-version = "1.70" [lib] doctest = false diff --git a/gix-path/Cargo.toml b/gix-path/Cargo.toml index 5f5d55ceed3..a3b038f7e6b 100644 --- a/gix-path/Cargo.toml +++ b/gix-path/Cargo.toml @@ -7,7 +7,7 @@ description = "A crate of the gitoxide project dealing paths and their conversio authors = ["Sebastian Thiel "] edition = "2021" include = ["src/**/*", "LICENSE-*"] -rust-version = "1.65" +rust-version = "1.70" [lib] doctest = false diff --git a/gix-pathspec/Cargo.toml b/gix-pathspec/Cargo.toml index 9fb461920f1..f202822d789 100644 --- a/gix-pathspec/Cargo.toml +++ b/gix-pathspec/Cargo.toml @@ -6,7 +6,7 @@ license = "MIT OR Apache-2.0" description = "A crate of the gitoxide project dealing magical pathspecs" authors = ["Sebastian Thiel "] edition = "2021" -rust-version = "1.65" +rust-version = "1.70" include = ["src/**/*", "LICENSE-*", "README.md"] [lib] diff --git a/gix-prompt/Cargo.toml b/gix-prompt/Cargo.toml index ba345c694f0..11096009ec0 100644 --- a/gix-prompt/Cargo.toml +++ b/gix-prompt/Cargo.toml @@ -7,7 +7,7 @@ description = "A crate of the gitoxide project for handling prompts in the termi authors = ["Sebastian Thiel "] edition = "2021" include = ["src/**/*", "LICENSE-*", "README.md"] -rust-version = "1.65" +rust-version = "1.70" [lib] doctest = false diff --git a/gix-protocol/Cargo.toml b/gix-protocol/Cargo.toml index 221f405db03..fb2e7b677d9 100644 --- a/gix-protocol/Cargo.toml +++ b/gix-protocol/Cargo.toml @@ -7,7 +7,7 @@ description = "A crate of the gitoxide project for implementing git protocols" authors = ["Sebastian Thiel "] edition = "2021" include = ["src/**/*", "LICENSE-*", "!**/tests/**/*"] -rust-version = "1.65" +rust-version = "1.70" [lib] doctest = false diff --git a/gix-quote/Cargo.toml b/gix-quote/Cargo.toml index bca648e59e3..9e125571968 100644 --- a/gix-quote/Cargo.toml +++ b/gix-quote/Cargo.toml @@ -6,7 +6,7 @@ license = "MIT OR Apache-2.0" description = "A crate of the gitoxide project dealing with various quotations used by git" authors = ["Sebastian Thiel "] edition = "2021" -rust-version = "1.65" +rust-version = "1.70" include = ["src/**/*", "LICENSE-*"] [lib] diff --git a/gix-rebase/Cargo.toml b/gix-rebase/Cargo.toml index 21bf5590b48..10c6122ddb8 100644 --- a/gix-rebase/Cargo.toml +++ b/gix-rebase/Cargo.toml @@ -6,7 +6,7 @@ license = "MIT OR Apache-2.0" description = "A crate of the gitoxide project dealing rebases" authors = ["Sebastian Thiel "] edition = "2021" -rust-version = "1.65" +rust-version = "1.70" [lib] doctest = false diff --git a/gix-ref/Cargo.toml b/gix-ref/Cargo.toml index 143808428c1..bb68e043d24 100644 --- a/gix-ref/Cargo.toml +++ b/gix-ref/Cargo.toml @@ -7,7 +7,7 @@ description = "A crate to handle git references" authors = ["Sebastian Thiel "] edition = "2021" include = ["src/**/*", "LICENSE-*"] -rust-version = "1.65" +rust-version = "1.70" autotests = false [lib] diff --git a/gix-ref/tests/Cargo.toml b/gix-ref/tests/Cargo.toml index 1bb2fdc559c..01e537d43ff 100644 --- a/gix-ref/tests/Cargo.toml +++ b/gix-ref/tests/Cargo.toml @@ -7,7 +7,7 @@ license = "MIT OR Apache-2.0" description = "Test the gix-ref crate with feature toggles" authors = ["Sebastian Thiel "] edition = "2021" -rust-version = "1.65" +rust-version = "1.70" [features] gix-features-parallel = ["gix-features/parallel"] # test sorted parallel loose file traversal diff --git a/gix-refspec/Cargo.toml b/gix-refspec/Cargo.toml index 0b00a3b5baf..7ead38230c8 100644 --- a/gix-refspec/Cargo.toml +++ b/gix-refspec/Cargo.toml @@ -7,7 +7,7 @@ description = "A crate of the gitoxide project for parsing and representing refs authors = ["Sebastian Thiel "] edition = "2021" include = ["src/**/*", "LICENSE-*", "README.md"] -rust-version = "1.65" +rust-version = "1.70" [lib] doctest = false diff --git a/gix-revision/Cargo.toml b/gix-revision/Cargo.toml index a3952aaa8bc..7ebcf714cda 100644 --- a/gix-revision/Cargo.toml +++ b/gix-revision/Cargo.toml @@ -7,7 +7,7 @@ description = "A crate of the gitoxide project dealing with finding names for re authors = ["Sebastian Thiel "] edition = "2021" include = ["src/**/*", "LICENSE-*", "README.md"] -rust-version = "1.65" +rust-version = "1.70" [lib] doctest = false diff --git a/gix-revwalk/Cargo.toml b/gix-revwalk/Cargo.toml index 8785cd1a90a..3e0107d29d0 100644 --- a/gix-revwalk/Cargo.toml +++ b/gix-revwalk/Cargo.toml @@ -7,7 +7,7 @@ description = "A crate providing utilities for walking the revision graph" authors = ["Sebastian Thiel "] edition = "2021" include = ["src/**/*", "LICENSE-*"] -rust-version = "1.65" +rust-version = "1.70" [lib] doctest = false diff --git a/gix-sec/Cargo.toml b/gix-sec/Cargo.toml index c96fb28656c..908d3b5cdc2 100644 --- a/gix-sec/Cargo.toml +++ b/gix-sec/Cargo.toml @@ -7,7 +7,7 @@ description = "A crate of the gitoxide project providing a shared trust model" authors = ["Sebastian Thiel "] edition = "2021" include = ["src/**/*", "LICENSE-*"] -rust-version = "1.65" +rust-version = "1.70" [lib] doctest = false diff --git a/gix-sequencer/Cargo.toml b/gix-sequencer/Cargo.toml index 071cc463fa9..b78a5e745f4 100644 --- a/gix-sequencer/Cargo.toml +++ b/gix-sequencer/Cargo.toml @@ -6,7 +6,7 @@ license = "MIT OR Apache-2.0" description = "A crate of the gitoxide project handling sequences of human-aided operations" authors = ["Sebastian Thiel "] edition = "2021" -rust-version = "1.65" +rust-version = "1.70" [lib] doctest = false diff --git a/gix-status/Cargo.toml b/gix-status/Cargo.toml index fc0c5a2f55c..50bb6d40329 100644 --- a/gix-status/Cargo.toml +++ b/gix-status/Cargo.toml @@ -7,7 +7,7 @@ description = "A crate of the gitoxide project dealing with 'git status'-like fu authors = ["Sebastian Thiel ", "Pascal Kuthe "] edition = "2021" include = ["src/**/*", "LICENSE-*"] -rust-version = "1.65" +rust-version = "1.70" autotests = false [lib] diff --git a/gix-status/tests/Cargo.toml b/gix-status/tests/Cargo.toml index 9ca28ff6ea4..42af02630cd 100644 --- a/gix-status/tests/Cargo.toml +++ b/gix-status/tests/Cargo.toml @@ -7,7 +7,7 @@ description = "A crate to drive gix-status tests with different features" authors = ["Sebastian Thiel ", "Pascal Kuthe "] edition = "2021" publish = false -rust-version = "1.65" +rust-version = "1.70" [[test]] name = "worktree" diff --git a/gix-submodule/Cargo.toml b/gix-submodule/Cargo.toml index 8762f8812ee..038c1becacd 100644 --- a/gix-submodule/Cargo.toml +++ b/gix-submodule/Cargo.toml @@ -6,7 +6,7 @@ license = "MIT OR Apache-2.0" description = "A crate of the gitoxide project dealing git submodules" authors = ["Sebastian Thiel "] edition = "2021" -rust-version = "1.65" +rust-version = "1.70" include = ["src/**/*", "LICENSE-*"] [lib] diff --git a/gix-tempfile/Cargo.toml b/gix-tempfile/Cargo.toml index a042edf0bfc..30f23c7c1df 100644 --- a/gix-tempfile/Cargo.toml +++ b/gix-tempfile/Cargo.toml @@ -7,7 +7,7 @@ description = "A tempfile implementation with a global registry to assure cleanu authors = ["Sebastian Thiel "] edition = "2021" include = ["src/**/*", "LICENSE-*", "README.md"] -rust-version = "1.65" +rust-version = "1.70" [[example]] name = "delete-tempfiles-on-sigterm" diff --git a/gix-tix/Cargo.toml b/gix-tix/Cargo.toml index 7024a0f8699..00634dce36d 100644 --- a/gix-tix/Cargo.toml +++ b/gix-tix/Cargo.toml @@ -6,7 +6,7 @@ license = "MIT OR Apache-2.0" description = "A tool like `tig`, but minimal, fast and efficient" authors = ["Sebastian Thiel "] edition = "2021" -rust-version = "1.65" +rust-version = "1.70" [lib] doctest = false diff --git a/gix-trace/Cargo.toml b/gix-trace/Cargo.toml index 68c5b0f9bc4..41b0d0a220c 100644 --- a/gix-trace/Cargo.toml +++ b/gix-trace/Cargo.toml @@ -6,7 +6,7 @@ version = "0.1.4" authors = ["Sebastian Thiel "] license = "MIT OR Apache-2.0" edition = "2021" -rust-version = "1.65" +rust-version = "1.70" include = ["src/**/*", "LICENSE-*"] [lib] diff --git a/gix-transport/Cargo.toml b/gix-transport/Cargo.toml index 7803989b33d..371f14790f4 100644 --- a/gix-transport/Cargo.toml +++ b/gix-transport/Cargo.toml @@ -7,7 +7,7 @@ description = "A crate of the gitoxide project dedicated to implementing the git authors = ["Sebastian Thiel "] edition = "2021" include = ["src/**/*", "LICENSE-*"] -rust-version = "1.65" +rust-version = "1.70" [lib] doctest = false diff --git a/gix-traverse/Cargo.toml b/gix-traverse/Cargo.toml index 1da06efc114..f636141ee82 100644 --- a/gix-traverse/Cargo.toml +++ b/gix-traverse/Cargo.toml @@ -7,7 +7,7 @@ description = "A crate of the gitoxide project" authors = ["Sebastian Thiel "] edition = "2021" include = ["src/**/*", "LICENSE-*"] -rust-version = "1.65" +rust-version = "1.70" autotests = false [lib] diff --git a/gix-traverse/tests/Cargo.toml b/gix-traverse/tests/Cargo.toml index 053683f7be7..dd160c12258 100644 --- a/gix-traverse/tests/Cargo.toml +++ b/gix-traverse/tests/Cargo.toml @@ -6,7 +6,7 @@ license = "MIT OR Apache-2.0" description = "Integration tests for the gix-traverse crate" authors = ["Sebastian Thiel "] edition = "2021" -rust-version = "1.65" +rust-version = "1.70" [[test]] name ="test" diff --git a/gix-tui/Cargo.toml b/gix-tui/Cargo.toml index fd2a126505f..d59ad1ee204 100644 --- a/gix-tui/Cargo.toml +++ b/gix-tui/Cargo.toml @@ -6,7 +6,7 @@ license = "MIT OR Apache-2.0" description = "A crate of the gitoxide project dedicated to a terminal user interface to interact with git repositories" authors = ["Sebastian Thiel "] edition = "2021" -rust-version = "1.65" +rust-version = "1.70" [[bin]] name = "gixi" diff --git a/gix-url/Cargo.toml b/gix-url/Cargo.toml index 82e30bc9ae7..5885ceddfc2 100644 --- a/gix-url/Cargo.toml +++ b/gix-url/Cargo.toml @@ -7,7 +7,7 @@ description = "A crate of the gitoxide project implementing parsing and serializ authors = ["Sebastian Thiel "] edition = "2021" include = ["src/**/*", "LICENSE-*", "tests/baseline/**/*"] -rust-version = "1.65" +rust-version = "1.70" [lib] doctest = false diff --git a/gix-utils/Cargo.toml b/gix-utils/Cargo.toml index b02491dba92..108b1953ef0 100644 --- a/gix-utils/Cargo.toml +++ b/gix-utils/Cargo.toml @@ -6,7 +6,7 @@ license = "MIT OR Apache-2.0" description = "A crate with `gitoxide` utilities that don't need feature toggles" authors = ["Sebastian Thiel "] edition = "2021" -rust-version = "1.65" +rust-version = "1.70" include = ["src/**/*", "LICENSE-*"] [lib] diff --git a/gix-validate/Cargo.toml b/gix-validate/Cargo.toml index 628b4ee8933..e4e40b4ea6f 100644 --- a/gix-validate/Cargo.toml +++ b/gix-validate/Cargo.toml @@ -7,7 +7,7 @@ description = "Validation functions for various kinds of names in git" authors = ["Sebastian Thiel "] edition = "2021" include = ["src/**/*", "LICENSE-*"] -rust-version = "1.65" +rust-version = "1.70" [lib] doctest = false diff --git a/gix-worktree-state/Cargo.toml b/gix-worktree-state/Cargo.toml index b54a6a07bfb..8685f7de706 100644 --- a/gix-worktree-state/Cargo.toml +++ b/gix-worktree-state/Cargo.toml @@ -7,7 +7,7 @@ description = "A crate of the gitoxide project implementing setting the worktree authors = ["Sebastian Thiel "] edition = "2021" include = ["src/**/*", "LICENSE-*"] -rust-version = "1.65" +rust-version = "1.70" autotests = false [lib] diff --git a/gix-worktree-state/tests/Cargo.toml b/gix-worktree-state/tests/Cargo.toml index 9cabe4709dc..61f3347a65e 100644 --- a/gix-worktree-state/tests/Cargo.toml +++ b/gix-worktree-state/tests/Cargo.toml @@ -7,7 +7,7 @@ description = "A crate for running tests with feature toggles on gix-worktree-st authors = ["Sebastian Thiel "] edition = "2021" publish = false -rust-version = "1.65" +rust-version = "1.70" [[test]] name = "worktree" diff --git a/gix-worktree-stream/Cargo.toml b/gix-worktree-stream/Cargo.toml index 8ae2692c529..998272d5f40 100644 --- a/gix-worktree-stream/Cargo.toml +++ b/gix-worktree-stream/Cargo.toml @@ -6,7 +6,7 @@ license = "MIT OR Apache-2.0" description = "generate a byte-stream from a git-tree" authors = ["Sebastian Thiel "] edition = "2021" -rust-version = "1.65" +rust-version = "1.70" include = ["src/**/*", "LICENSE-*"] [lib] diff --git a/gix-worktree/Cargo.toml b/gix-worktree/Cargo.toml index b1f9d2e29b7..92340cbc792 100644 --- a/gix-worktree/Cargo.toml +++ b/gix-worktree/Cargo.toml @@ -7,7 +7,7 @@ description = "A crate of the gitoxide project for shared worktree related types authors = ["Sebastian Thiel "] edition = "2021" include = ["src/**/*", "LICENSE-*"] -rust-version = "1.65" +rust-version = "1.70" autotests = false [lib] diff --git a/gix-worktree/tests/Cargo.toml b/gix-worktree/tests/Cargo.toml index 227ee3e36b4..a4e57cb83a0 100644 --- a/gix-worktree/tests/Cargo.toml +++ b/gix-worktree/tests/Cargo.toml @@ -6,7 +6,7 @@ license = "MIT OR Apache-2.0" description = "A crate for testing the gix-worktree crate with feature toggles" authors = ["Sebastian Thiel "] edition = "2021" -rust-version = "1.65" +rust-version = "1.70" publish = false [[test]] diff --git a/gix/Cargo.toml b/gix/Cargo.toml index 14f3ae08e2a..39766bd7870 100644 --- a/gix/Cargo.toml +++ b/gix/Cargo.toml @@ -7,7 +7,7 @@ version = "0.56.0" authors = ["Sebastian Thiel "] edition = "2021" include = ["src/**/*", "LICENSE-*"] -rust-version = "1.65" +rust-version = "1.70" [lib] doctest = false