From c23a457e72abe608715ac76f076f47dc42af07a5 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Thu, 30 May 2024 20:31:44 +0200 Subject: Merging upstream version 1.74.1+dfsg1. Signed-off-by: Daniel Baumann --- vendor/gix-ref/src/namespace.rs | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'vendor/gix-ref/src/namespace.rs') diff --git a/vendor/gix-ref/src/namespace.rs b/vendor/gix-ref/src/namespace.rs index 2723052ec..34040f606 100644 --- a/vendor/gix-ref/src/namespace.rs +++ b/vendor/gix-ref/src/namespace.rs @@ -21,9 +21,8 @@ impl Namespace { gix_path::from_byte_slice(&self.0) } /// Append the given `prefix` to this namespace so it becomes usable for prefixed iteration. - pub fn into_namespaced_prefix(mut self, prefix: impl AsRef) -> PathBuf { - let path = prefix.as_ref(); - let prefix = gix_path::into_bstr(path); + pub fn into_namespaced_prefix(mut self, prefix: &Path) -> PathBuf { + let prefix = gix_path::into_bstr(prefix); self.0.push_str(prefix.as_ref()); gix_path::to_native_path_on_windows(self.0).into_owned() } @@ -36,10 +35,10 @@ impl Namespace { /// Given a `namespace` 'foo we output 'refs/namespaces/foo', and given 'foo/bar' we output 'refs/namespaces/foo/refs/namespaces/bar'. /// /// For more information, consult the [git namespace documentation](https://git-scm.com/docs/gitnamespaces). -pub fn expand<'a, Name, E>(namespace: Name) -> Result +pub fn expand<'a, Name, E>(namespace: Name) -> Result where Name: TryInto<&'a PartialNameRef, Error = E>, - gix_validate::refname::Error: From, + gix_validate::reference::name::Error: From, { let namespace = &namespace.try_into()?.0; let mut out = BString::default(); -- cgit v1.2.3