adapt to changes in gix-ref.

Author: Byron

gix-negotiate/tests/baseline/mod.rs

@@ -71,7 +71,7 @@ fn run() -> crate::Result {
                 // }
                 for tip in lookup_names(&["HEAD"]).into_iter().chain(
                     refs.iter()?
-                        .prefixed(b"refs/heads".as_bstr())?
+                        .prefixed(b"refs/heads")?
                         .filter_map(Result::ok)
                         .map(|r| r.target.into_id()),
                 ) {

gix/src/open/repository.rs

@@ -1,10 +1,7 @@
 #![allow(clippy::result_large_err)]
-use gix_features::threading::OwnShared;
-use std::ffi::OsStr;
-use std::{borrow::Cow, path::PathBuf};
-
 use super::{Error, Options};
 use crate::{
+    bstr,
     bstr::BString,
     config,
     config::{
@@ -14,6 +11,9 @@ use crate::{
     open::Permissions,
     ThreadSafeRepository,
 };
+use gix_features::threading::OwnShared;
+use std::ffi::OsStr;
+use std::{borrow::Cow, path::PathBuf};
 
 #[derive(Default, Clone)]
 pub(crate) struct EnvironmentOverrides {
@@ -347,9 +347,10 @@ impl ThreadSafeRepository {
         refs.namespace.clone_from(&config.refs_namespace);
         let replacements = replacement_objects_refs_prefix(&config.resolved, lenient_config, filter_config_section)?
             .and_then(|prefix| {
+                use bstr::ByteSlice;
                 let _span = gix_trace::detail!("find replacement objects");
                 let platform = refs.iter().ok()?;
-                let iter = platform.prefixed(prefix.clone()).ok()?;
+                let iter = platform.prefixed(prefix.as_bstr()).ok()?;
                 let replacements = iter
                     .filter_map(Result::ok)
                     .filter_map(|r: gix_ref::Reference| {

gix/src/reference/iter.rs

@@ -2,10 +2,7 @@
 #![allow(clippy::empty_docs)]
 use std::borrow::Cow;
 
-use gix_ref::{
-    bstr::{BStr, ByteSlice},
-    file::ReferenceExt,
-};
+use gix_ref::{bstr::BStr, file::ReferenceExt};
 
 /// A platform to create iterators over references.
 #[must_use = "Iterators should be obtained from this iterator platform"]
@@ -49,34 +46,31 @@ impl Platform<'_> {
     // TODO: Create a custom `Path` type that enforces the requirements of git naturally, this type is surprising possibly on windows
     //       and when not using a trailing '/' to signal directories.
     pub fn prefixed<'a>(&self, prefix: impl Into<Cow<'a, BStr>>) -> Result<Iter<'_>, init::Error> {
-        Ok(Iter::new(self.repo, self.platform.prefixed(prefix.into())?))
+        Ok(Iter::new(self.repo, self.platform.prefixed(prefix.into().as_ref())?))
     }
 
     // TODO: tests
     /// Return an iterator over all references that are tags.
     ///
     /// They are all prefixed with `refs/tags`.
     pub fn tags(&self) -> Result<Iter<'_>, init::Error> {
-        Ok(Iter::new(self.repo, self.platform.prefixed(b"refs/tags/".as_bstr())?))
+        Ok(Iter::new(self.repo, self.platform.prefixed(b"refs/tags/")?))
     }
 
     // TODO: tests
     /// Return an iterator over all local branches.
     ///
     /// They are all prefixed with `refs/heads`.
     pub fn local_branches(&self) -> Result<Iter<'_>, init::Error> {
-        Ok(Iter::new(self.repo, self.platform.prefixed(b"refs/heads/".as_bstr())?))
+        Ok(Iter::new(self.repo, self.platform.prefixed(b"refs/heads/")?))
     }
 
     // TODO: tests
     /// Return an iterator over all remote branches.
     ///
     /// They are all prefixed with `refs/remotes`.
     pub fn remote_branches(&self) -> Result<Iter<'_>, init::Error> {
-        Ok(Iter::new(
-            self.repo,
-            self.platform.prefixed(b"refs/remotes/".as_bstr())?,
-        ))
+        Ok(Iter::new(self.repo, self.platform.prefixed(b"refs/remotes/")?))
     }
 }
 
@@ -123,7 +117,7 @@ impl<'r> Iterator for Iter<'r> {
 
 ///
 pub mod init {
-    /// The error returned by [`Platform::all()`][super::Platform::all()] or [`Platform::prefixed()`][super::Platform::prefixed()].
+    /// The error returned by [`Platform::all()`](super::Platform::all()) or [`Platform::prefixed()`](super::Platform::prefixed()).
     #[derive(Debug, thiserror::Error)]
     #[allow(missing_docs)]
     pub enum Error {