diff options
author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-06-07 05:48:48 +0000 |
---|---|---|
committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-06-07 05:48:48 +0000 |
commit | ef24de24a82fe681581cc130f342363c47c0969a (patch) | |
tree | 0d494f7e1a38b95c92426f58fe6eaa877303a86c /vendor/gix-ref/src | |
parent | Releasing progress-linux version 1.74.1+dfsg1-1~progress7.99u1. (diff) | |
download | rustc-ef24de24a82fe681581cc130f342363c47c0969a.tar.xz rustc-ef24de24a82fe681581cc130f342363c47c0969a.zip |
Merging upstream version 1.75.0+dfsg1.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'vendor/gix-ref/src')
-rw-r--r-- | vendor/gix-ref/src/lib.rs | 2 | ||||
-rw-r--r-- | vendor/gix-ref/src/name.rs | 2 | ||||
-rw-r--r-- | vendor/gix-ref/src/store/packed/transaction.rs | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/vendor/gix-ref/src/lib.rs b/vendor/gix-ref/src/lib.rs index 2c714d47a..aea2da812 100644 --- a/vendor/gix-ref/src/lib.rs +++ b/vendor/gix-ref/src/lib.rs @@ -5,7 +5,7 @@ //! Refs are the way to keep track of objects and come in two flavors. //! //! * symbolic refs are pointing to another reference -//! * peeled refs point to the an object by its [`ObjectId`][gix_hash::ObjectId] +//! * peeled refs point to the an object by its [`ObjectId`] //! //! They can be identified by a relative path and stored in various flavors. //! diff --git a/vendor/gix-ref/src/name.rs b/vendor/gix-ref/src/name.rs index 81b90a020..353328537 100644 --- a/vendor/gix-ref/src/name.rs +++ b/vendor/gix-ref/src/name.rs @@ -4,7 +4,7 @@ use gix_object::bstr::{BStr, BString, ByteSlice, ByteVec}; use crate::{Category, FullName, FullNameRef, PartialName, PartialNameRef}; -/// The error used in the [`PartialNameRef`][super::PartialNameRef]`::try_from`(…) implementations. +/// The error used in the [`PartialNameRef`]`::try_from`(…) implementations. pub type Error = gix_validate::reference::name::Error; impl<'a> Category<'a> { diff --git a/vendor/gix-ref/src/store/packed/transaction.rs b/vendor/gix-ref/src/store/packed/transaction.rs index 4c503d711..e2955f8e0 100644 --- a/vendor/gix-ref/src/store/packed/transaction.rs +++ b/vendor/gix-ref/src/store/packed/transaction.rs @@ -78,7 +78,7 @@ impl packed::Transaction { edit.peeled = loop { let kind = find(next_id, &mut buf)?; match kind { - Some(kind) if kind == gix_object::Kind::Tag => { + Some(gix_object::Kind::Tag) => { next_id = gix_object::TagRefIter::from_bytes(&buf).target_id().map_err(|_| { prepare::Error::Resolve( format!("Couldn't get target object id from tag {next_id}").into(), |