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/src/reference | |
| 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/src/reference')
| -rw-r--r-- | vendor/gix/src/reference/errors.rs | 23 | ||||
| -rw-r--r-- | vendor/gix/src/reference/mod.rs | 2 |
2 files changed, 20 insertions, 5 deletions
diff --git a/vendor/gix/src/reference/errors.rs b/vendor/gix/src/reference/errors.rs index a931b3974..ff3802e94 100644 --- a/vendor/gix/src/reference/errors.rs +++ b/vendor/gix/src/reference/errors.rs @@ -22,8 +22,8 @@ pub mod edit { /// pub mod peel { - /// The error returned by [`Reference::peel_to_id_in_place(…)`][crate::Reference::peel_to_id_in_place()] and - /// [`Reference::into_fully_peeled_id(…)`][crate::Reference::into_fully_peeled_id()]. + /// The error returned by [`Reference::peel_to_id_in_place(…)`](crate::Reference::peel_to_id_in_place()) and + /// [`Reference::into_fully_peeled_id(…)`](crate::Reference::into_fully_peeled_id()). #[derive(Debug, thiserror::Error)] #[allow(missing_docs)] pub enum Error { @@ -36,7 +36,7 @@ pub mod peel { /// pub mod head_id { - /// The error returned by [`Repository::head_id(…)`][crate::Repository::head_id()]. + /// The error returned by [`Repository::head_id(…)`](crate::Repository::head_id()). #[derive(Debug, thiserror::Error)] #[allow(missing_docs)] pub enum Error { @@ -51,7 +51,7 @@ pub mod head_id { /// pub mod head_commit { - /// The error returned by [`Repository::head_commit`(…)][crate::Repository::head_commit()]. + /// The error returned by [`Repository::head_commit`(…)](crate::Repository::head_commit()). #[derive(Debug, thiserror::Error)] #[allow(missing_docs)] pub enum Error { @@ -63,6 +63,21 @@ pub mod head_commit { } /// +pub mod head_tree_id { + /// The error returned by [`Repository::head_tree_id`(…)](crate::Repository::head_tree_id()). + #[derive(Debug, thiserror::Error)] + #[allow(missing_docs)] + pub enum Error { + #[error(transparent)] + Head(#[from] crate::reference::find::existing::Error), + #[error(transparent)] + PeelToCommit(#[from] crate::head::peel::to_commit::Error), + #[error(transparent)] + DecodeCommit(#[from] gix_object::decode::Error), + } +} + +/// pub mod find { /// pub mod existing { diff --git a/vendor/gix/src/reference/mod.rs b/vendor/gix/src/reference/mod.rs index e80057fb4..2d32f595d 100644 --- a/vendor/gix/src/reference/mod.rs +++ b/vendor/gix/src/reference/mod.rs @@ -10,7 +10,7 @@ pub mod iter; pub mod remote; mod errors; -pub use errors::{edit, find, head_commit, head_id, peel}; +pub use errors::{edit, find, head_commit, head_id, head_tree_id, peel}; use crate::ext::ObjectIdExt; |