Replace Deref for BString by u8

Author: cruessler

gix-object/src/tree/mod.rs

@@ -1,9 +1,11 @@
+use bstr::ByteSlice;
+
 use crate::{
     bstr::{BStr, BString},
     tree, Tree, TreeRef,
 };
-use std::cell::RefCell;
 use std::cmp::Ordering;
+use std::{cell::RefCell, u8};
 
 ///
 pub mod editor;
@@ -262,13 +264,43 @@ pub struct RepositoryPathPuf {
     inner: BString,
 }
 
+impl RepositoryPathPuf {
+    fn len(&self) -> usize {
+        self.inner.len()
+    }
+
+    fn get(&self, index: usize) -> std::option::Option<&u8> {
+        self.inner.get(index)
+    }
+
+    fn find_byte(&self, byte: u8) -> std::option::Option<usize> {
+        self.inner.find_byte(byte)
+    }
+
+    /// TODO
+    pub fn to_bstring(&self) -> BString {
+        self.inner.clone()
+    }
+}
+
 impl std::fmt::Display for RepositoryPathPuf {
     #[inline]
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         self.inner.fmt(f)
     }
 }
 
+impl std::ops::Index<std::ops::RangeTo<usize>> for RepositoryPathPuf {
+    type Output = BStr;
+
+    #[inline]
+    fn index(&self, r: std::ops::RangeTo<usize>) -> &BStr {
+        use bstr::ByteSlice;
+
+        BStr::new(&self.inner.as_bytes()[..r.end])
+    }
+}
+
 impl From<&str> for RepositoryPathPuf {
     fn from(value: &str) -> Self {
         Self { inner: value.into() }
@@ -288,10 +320,10 @@ impl From<BString> for RepositoryPathPuf {
 }
 
 impl std::ops::Deref for RepositoryPathPuf {
-    type Target = BString;
+    type Target = [u8];
 
     #[inline]
-    fn deref(&self) -> &BString {
+    fn deref(&self) -> &[u8] {
         &self.inner
     }
 }

gix-object/src/tree/write.rs

@@ -40,11 +40,9 @@ impl crate::WriteTo for Tree {
             out.write_all(mode.as_bytes(&mut buf))?;
             out.write_all(SPACE)?;
 
-            let name: &BString = filename;
-
             if filename.find_byte(0).is_some() {
                 return Err(Error::NullbyteInFilename {
-                    name: (*name).to_owned(),
+                    name: filename.to_bstring(),
                 }
                 .into());
             }

gix/src/object/tree/editor.rs

@@ -287,21 +287,15 @@ fn write_cursor<'repo>(cursor: &mut Cursor<'_, 'repo>) -> Result<Id<'repo>, writ
                         .then_some(gix_validate::path::component::Mode::Symlink),
                     cursor.validate,
                 )
-                .map_err(|err| {
-                    let filename: &BString = &entry.filename;
-
-                    write::Error::InvalidFilename {
-                        filename: filename.clone(),
-                        kind: entry.mode.into(),
-                        id: entry.oid,
-                        source: err,
-                    }
+                .map_err(|err| write::Error::InvalidFilename {
+                    filename: entry.filename.to_bstring(),
+                    kind: entry.mode.into(),
+                    id: entry.oid,
+                    source: err,
                 })?;
                 if !entry.mode.is_commit() && !cursor.repo.has_object(entry.oid) {
-                    let filename: &BString = &entry.filename;
-
                     return Err(write::Error::MissingObject {
-                        filename: filename.clone(),
+                        filename: entry.filename.to_bstring(),
                         kind: entry.mode.into(),
                         id: entry.oid,
                     });