fix: compatibility with bstr v1.3, use *.as_bytes() instead of .as_ref().

Byron · Byron · commit 135d317065aa · 2023-02-20T16:11:59.000+01:00
`as_ref()` relies on a known target type which isn't always present. However, once
there is only one implementation, that's no problem, but when that changes compilation
fails due to ambiguity.
diff --git a/gix-actor/Cargo.toml b/gix-actor/Cargo.toml
@@ -22,7 +22,7 @@ gix-date = { version = "^0.4.2", path = "../gix-date" }
 
 quick-error = "2.0.0"
 btoi = "0.4.2"
-bstr = { version = "1.0.1", default-features = false, features = ["std", "unicode"]}
+bstr = { version = "1.3.0", default-features = false, features = ["std", "unicode"]}
 nom = { version = "7", default-features = false, features = ["std"]}
 itoa = "1.0.1"
 serde = { version = "1.0.114", optional = true, default-features = false, features = ["derive"]}
diff --git a/gix-attributes/Cargo.toml b/gix-attributes/Cargo.toml
@@ -22,7 +22,7 @@ gix-path = { version = "^0.7.1", path = "../gix-path" }
 gix-quote = { version = "^0.4.1", path = "../gix-quote" }
 gix-glob = { version = "^0.5.4", path = "../gix-glob" }
 
-bstr = { version = "1.0.1", default-features = false, features = ["std", "unicode"]}
+bstr = { version = "1.3.0", default-features = false, features = ["std", "unicode"]}
 unicode-bom = "1.1.4"
 thiserror = "1.0.26"
 serde = { version = "1.0.114", optional = true, default-features = false, features = ["derive"]}
diff --git a/gix-command/Cargo.toml b/gix-command/Cargo.toml
@@ -12,7 +12,7 @@ rust-version = "1.64"
 doctest = false
 
 [dependencies]
-bstr = "1.0.1"
+bstr = "1.3.0"
 
 [dev-dependencies]
 gix-testtools = { path = "../tests/tools" }
diff --git a/gix-commitgraph/Cargo.toml b/gix-commitgraph/Cargo.toml
@@ -22,7 +22,7 @@ gix-features = { version = "^0.26.4", path = "../gix-features", features = ["rus
 gix-hash = { version = "^0.10.2", path = "../gix-hash" }
 gix-chunk = { version = "^0.4.1", path = "../gix-chunk" }
 
-bstr = { version = "1.0.1", default-features = false, features = ["std"] }
+bstr = { version = "1.3.0", default-features = false, features = ["std"] }
 memmap2 = "0.5.0"
 serde = { version = "1.0.114", optional = true, default-features = false, features = ["derive"] }
 thiserror = "1.0.26"
diff --git a/gix-config/Cargo.toml b/gix-config/Cargo.toml
@@ -28,7 +28,7 @@ nom = { version = "7", default_features = false, features = [ "std" ] }
 memchr = "2"
 thiserror = "1.0.26"
 unicode-bom = "1.1.4"
-bstr = { version = "1.0.1", default-features = false, features = ["std"] }
+bstr = { version = "1.3.0", default-features = false, features = ["std"] }
 serde = { version = "1.0.114", optional = true, default-features = false, features = ["derive"]}
 smallvec = "1.9.0"
 once_cell = "1.14.0"
diff --git a/gix-config/src/file/access/read_only.rs b/gix-config/src/file/access/read_only.rs
@@ -1,6 +1,6 @@
 use std::{borrow::Cow, convert::TryFrom};
 
-use bstr::BStr;
+use bstr::{BStr, ByteSlice};
 use gix_features::threading::OwnShared;
 use smallvec::SmallVec;
 
@@ -348,6 +348,6 @@ impl<'event> File<'event> {
     }
 
     pub(crate) fn detect_newline_style_smallvec(&self) -> SmallVec<[u8; 2]> {
-        self.detect_newline_style().as_ref().into()
+        self.detect_newline_style().as_bytes().into()
     }
 }
diff --git a/gix-config/src/file/init/from_env.rs b/gix-config/src/file/init/from_env.rs
@@ -1,6 +1,6 @@
 use std::convert::TryFrom;
 
-use bstr::BStr;
+use bstr::{BStr, ByteSlice};
 
 use crate::{file, file::init, parse, parse::section, path::interpolate, File};
 
@@ -75,7 +75,7 @@ impl File<'static> {
                                 index: i,
                                 kind: "value",
                             })?
-                            .as_ref()
+                            .as_bytes()
                             .into(),
                     ),
                 );
diff --git a/gix-config/tests/Cargo.toml b/gix-config/tests/Cargo.toml
@@ -32,7 +32,7 @@ serial_test = "1.0.0"
 serde_derive = "1.0"
 criterion = "0.4.0"
 tempfile = "3.2.0"
-bstr = { version = "1.0.1", default-features = false, features = ["std"] }
+bstr = { version = "1.3.0", default-features = false, features = ["std"] }
 
 [package.metadata.docs.rs]
 all-features = true
diff --git a/gix-credentials/Cargo.toml b/gix-credentials/Cargo.toml
@@ -25,7 +25,7 @@ gix-prompt = { version = "^0.3.2", path = "../gix-prompt" }
 
 thiserror = "1.0.32"
 serde = { version = "1.0.114", optional = true, default-features = false, features = ["derive"] }
-bstr = { version = "1.0.1", default-features = false, features = ["std"]}
+bstr = { version = "1.3.0", default-features = false, features = ["std"]}
 
 
 
diff --git a/gix-date/Cargo.toml b/gix-date/Cargo.toml
@@ -17,7 +17,7 @@ doctest = false
 serde1 = ["serde", "bstr/serde"]
 
 [dependencies]
-bstr = { version = "1.0.1", default-features = false, features = ["std"]}
+bstr = { version = "1.3.0", default-features = false, features = ["std"]}
 serde = { version = "1.0.114", optional = true, default-features = false, features = ["derive"]}
 itoa = "1.0.1"
 time = { version = "0.3.17", default-features = false, features = ["local-offset", "formatting", "macros", "parsing"] }
diff --git a/gix-discover/Cargo.toml b/gix-discover/Cargo.toml
@@ -18,7 +18,7 @@ gix-path = { version = "^0.7.1", path = "../gix-path" }
 gix-ref = { version = "^0.24.0", path = "../gix-ref" }
 gix-hash = { version = "^0.10.2", path = "../gix-hash" }
 
-bstr = { version = "1.0.1", default-features = false, features = ["std", "unicode"] }
+bstr = { version = "1.3.0", default-features = false, features = ["std", "unicode"] }
 thiserror = "1.0.26"
 
 [target.'cfg(windows)'.dependencies]
diff --git a/gix-features/Cargo.toml b/gix-features/Cargo.toml
@@ -136,7 +136,7 @@ document-features = { version = "0.2.0", optional = true }
 libc = { version = "0.2.119" }
 
 [dev-dependencies]
-bstr = { version = "1.0.1", default-features = false }
+bstr = { version = "1.3.0", default-features = false }
 
 
 # Assembly doesn't yet compile on MSVC on windows, but does on GNU, see https://github.com/RustCrypto/asm-hashes/issues/17
diff --git a/gix-glob/Cargo.toml b/gix-glob/Cargo.toml
@@ -16,7 +16,7 @@ doctest = false
 serde1 = ["serde", "bstr/serde"]
 
 [dependencies]
-bstr = { version = "1.0.1", default-features = false, features = ["std"]}
+bstr = { version = "1.3.0", default-features = false, features = ["std"]}
 bitflags = "1.3.2"
 serde = { version = "1.0.114", optional = true, default-features = false, features = ["derive"]}
 
diff --git a/gix-index/Cargo.toml b/gix-index/Cargo.toml
@@ -30,7 +30,7 @@ gix-lock = { version = "^3.0.0", path = "../gix-lock" }
 thiserror = "1.0.32"
 memmap2 = "0.5.0"
 filetime = "0.2.15"
-bstr = { version = "1.0.1", default-features = false }
+bstr = { version = "1.3.0", default-features = false }
 
 serde = { version = "1.0.114", optional = true, default-features = false, features = ["derive"] }
 smallvec = "1.7.0"
diff --git a/gix-index/tests/Cargo.toml b/gix-index/tests/Cargo.toml
@@ -36,7 +36,7 @@ gix-testtools = { path = "../../tests/tools"}
 gix = { path = "../../gix"}
 gix-hash = { path = "../../gix-hash"}
 filetime = "0.2.15"
-bstr = { version = "1.0.1", default-features = false }
+bstr = { version = "1.3.0", default-features = false }
 
 [package.metadata.docs.rs]
 features = ["document-features", "serde1"]
diff --git a/gix-mailmap/Cargo.toml b/gix-mailmap/Cargo.toml
@@ -17,7 +17,7 @@ serde1 = ["serde", "bstr/serde", "gix-actor/serde1"]
 
 [dependencies]
 gix-actor = { version = "^0.17.1", path = "../gix-actor" }
-bstr = { version = "1.0.1", default-features = false, features = ["std", "unicode"]}
+bstr = { version = "1.3.0", default-features = false, features = ["std", "unicode"]}
 quick-error = "2.0.0"
 serde = { version = "1.0.114", optional = true, default-features = false, features = ["derive"]}
 
diff --git a/gix-object/Cargo.toml b/gix-object/Cargo.toml
@@ -31,7 +31,7 @@ btoi = "0.4.2"
 itoa = "1.0.1"
 thiserror = "1.0.34"
 hex = "0.4.2"
-bstr = { version = "1.0.1", default-features = false, features = ["std", "unicode"] }
+bstr = { version = "1.3.0", default-features = false, features = ["std", "unicode"] }
 nom = { version = "7", default-features = false, features = ["std"]}
 smallvec = { version = "1.4.0", features = ["write"] }
 serde = { version = "1.0.114", optional = true, default-features = false, features = ["derive"]}
diff --git a/gix-pack/tests/Cargo.toml b/gix-pack/tests/Cargo.toml
@@ -40,7 +40,7 @@ gix-features = { version = "^0.26.1", path = "../../gix-features" }
 gix-testtools = { path = "../../tests/tools"}
 gix-odb = { path = "../../gix-odb" }
 tempfile = "3.1.0"
-bstr = { version = "1.0.1", default-features = false, features = ["std"] }
+bstr = { version = "1.3.0", default-features = false, features = ["std"] }
 maplit = "1.0.2"
 gix-object = {  path = "../../gix-object" }
 gix-traverse = {  path = "../../gix-traverse" }
diff --git a/gix-packetline/Cargo.toml b/gix-packetline/Cargo.toml
@@ -42,7 +42,7 @@ required-features = ["blocking-io", "maybe-async/is_sync"]
 serde = { version = "1.0.114", optional = true, default-features = false, features = ["std", "derive"]}
 thiserror = "1.0.34"
 hex = "0.4.2"
-bstr = { version = "1.0.1", default-features = false, features = ["std"] }
+bstr = { version = "1.3.0", default-features = false, features = ["std"] }
 # async support
 futures-io = { version = "0.3.16", optional = true }
 futures-lite = { version  = "1.12.0", optional = true }
diff --git a/gix-path/Cargo.toml b/gix-path/Cargo.toml
@@ -13,7 +13,7 @@ rust-version = "1.64"
 doctest = false
 
 [dependencies]
-bstr = { version = "1.0.1", default-features = false, features = ["std"] }
+bstr = { version = "1.3.0", default-features = false, features = ["std"] }
 thiserror = "1.0.26"
 
 [dev-dependencies]
diff --git a/gix-pathspec/Cargo.toml b/gix-pathspec/Cargo.toml
@@ -15,7 +15,7 @@ doctest = false
 gix-glob = { version = "^0.5.4", path = "../gix-glob" }
 gix-attributes = { version = "^0.8.2", path = "../gix-attributes" }
 
-bstr = { version = "1.0.1", default-features = false, features = ["std"]}
+bstr = { version = "1.3.0", default-features = false, features = ["std"]}
 bitflags = "1.3.2"
 thiserror = "1.0.26"
 
diff --git a/gix-protocol/Cargo.toml b/gix-protocol/Cargo.toml
@@ -47,7 +47,7 @@ gix-credentials = { version = "^0.9.1", path = "../gix-credentials" }
 
 thiserror = "1.0.32"
 serde = { version = "1.0.114", optional = true, default-features = false, features = ["derive"]}
-bstr = { version = "1.0.1", default-features = false, features = ["std", "unicode"] }
+bstr = { version = "1.3.0", default-features = false, features = ["std", "unicode"] }
 nom = { version = "7", default-features = false, features = ["std"]}
 btoi = "0.4.2"
 
diff --git a/gix-quote/Cargo.toml b/gix-quote/Cargo.toml
@@ -12,6 +12,6 @@ rust-version = "1.64"
 doctest = false
 
 [dependencies]
-bstr = { version = "1.0.1", default-features = false, features = ["std"]}
+bstr = { version = "1.3.0", default-features = false, features = ["std"]}
 quick-error = "2.0.0"
 btoi = "0.4.2"
diff --git a/gix-ref/src/fullname.rs b/gix-ref/src/fullname.rs
@@ -106,7 +106,7 @@ impl FullNameRef {
     pub fn category_and_short_name(&self) -> Option<(Category<'_>, &BStr)> {
         let name = self.0.as_bstr();
         for category in &[Category::Tag, Category::LocalBranch, Category::RemoteBranch] {
-            if let Some(shortened) = name.strip_prefix(category.prefix().as_ref()) {
+            if let Some(shortened) = name.strip_prefix(category.prefix().as_bytes()) {
                 return Some((*category, shortened.as_bstr()));
             }
         }
@@ -129,14 +129,14 @@ impl FullNameRef {
 
         if is_pseudo_ref(name) {
             Some((Category::PseudoRef, name))
-        } else if let Some(shortened) = name.strip_prefix(Category::MainPseudoRef.prefix().as_ref()) {
+        } else if let Some(shortened) = name.strip_prefix(Category::MainPseudoRef.prefix().as_bytes()) {
             if shortened.starts_with_str("refs/") {
                 (Category::MainRef, shortened.as_bstr()).into()
             } else {
                 is_pseudo_ref(shortened).then(|| (Category::MainPseudoRef, shortened.as_bstr()))
             }
         } else if let Some(shortened_with_worktree_name) =
-            name.strip_prefix(Category::LinkedPseudoRef { name: "".into() }.prefix().as_ref())
+            name.strip_prefix(Category::LinkedPseudoRef { name: "".into() }.prefix().as_bytes())
         {
             let (name, shortened) = shortened_with_worktree_name.find_byte(b'/').map(|pos| {
                 (
diff --git a/gix-ref/src/raw.rs b/gix-ref/src/raw.rs
@@ -73,7 +73,7 @@ mod access {
             self.name
                 .0
                 .as_bstr()
-                .strip_prefix(namespace.0.as_bstr().as_ref())
+                .strip_prefix(namespace.0.as_bytes())
                 .map(|stripped| FullNameRef::new_unchecked(stripped.as_bstr()))
         }
 
diff --git a/gix-ref/src/store/packed/find.rs b/gix-ref/src/store/packed/find.rs
@@ -92,7 +92,7 @@ impl packed::Buffer {
             let ofs = b as *const u8 as usize - a.as_ptr() as usize;
             let line = &a[search_start_of_record(ofs)..];
             packed::decode::reference::<()>(line)
-                .map(|(_rest, r)| r.name.as_bstr().as_ref())
+                .map(|(_rest, r)| r.name.as_bstr().as_bytes())
                 .map_err(|err| {
                     encountered_parse_failure = true;
                     err
diff --git a/gix-refspec/Cargo.toml b/gix-refspec/Cargo.toml
@@ -17,7 +17,7 @@ gix-revision = { version = "^0.10.3", path = "../gix-revision" }
 gix-validate = { version = "^0.7.2", path = "../gix-validate" }
 gix-hash = { version = "^0.10.2", path = "../gix-hash" }
 
-bstr = { version = "1.0.1", default-features = false, features = ["std"]}
+bstr = { version = "1.3.0", default-features = false, features = ["std"]}
 thiserror = "1.0.26"
 smallvec = "1.9.0"
 
diff --git a/gix-revision/Cargo.toml b/gix-revision/Cargo.toml
@@ -23,7 +23,7 @@ gix-object = { version = "^0.26.1", path = "../gix-object" }
 gix-date = { version = "^0.4.2", path = "../gix-date" }
 gix-hashtable = { version = "^0.1.1", path = "../gix-hashtable" }
 
-bstr = { version = "1.0.1", default-features = false, features = ["std"]}
+bstr = { version = "1.3.0", default-features = false, features = ["std"]}
 thiserror = "1.0.26"
 serde = { version = "1.0.114", optional = true, default-features = false, features = ["derive"] }
 document-features = { version = "0.2.1", optional = true }
diff --git a/gix-revision/src/spec/parse/function.rs b/gix-revision/src/spec/parse/function.rs
@@ -322,7 +322,7 @@ where
     fn consume_all(res: Option<()>) -> Result<&'static BStr, Error> {
         res.ok_or(Error::Delegate).map(|_| "".into())
     }
-    match input.as_ref() {
+    match input.as_bytes() {
         [b':'] => return Err(Error::MissingColonSuffix),
         [b':', b'/'] => return Err(Error::EmptyTopLevelRegex),
         [b':', b'/', regex @ ..] => {
@@ -532,7 +532,7 @@ where
                     past_sep.and_then(|past_sep| parens(past_sep).transpose()).transpose()?
                 {
                     cursor += consumed;
-                    let target = match kind.as_ref().as_ref() {
+                    let target = match kind.as_ref().as_bytes() {
                         b"commit" => delegate::PeelTo::ObjectKind(gix_object::Kind::Commit),
                         b"tag" => delegate::PeelTo::ObjectKind(gix_object::Kind::Tag),
                         b"tree" => delegate::PeelTo::ObjectKind(gix_object::Kind::Tree),
diff --git a/gix-revision/tests/Cargo.toml b/gix-revision/tests/Cargo.toml
@@ -26,4 +26,4 @@ gix-object = { path = "../../gix-object" }
 gix-testtools = { path = "../../tests/tools" }
 gix = { path = "../../gix", default-features = false }
 
-bstr = { version = "1.0.1", default-features = false, features = ["std"]}
+bstr = { version = "1.3.0", default-features = false, features = ["std"]}
diff --git a/gix-transport/Cargo.toml b/gix-transport/Cargo.toml
@@ -62,7 +62,7 @@ gix-credentials = { version = "^0.9.1", path = "../gix-credentials", optional =
 gix-quote = { version = "^0.4.1", path = "../gix-quote" }
 
 serde = { version = "1.0.114", optional = true, default-features = false, features = ["std", "derive"]}
-bstr = { version = "1.0.1", default-features = false, features = ["std", "unicode"] }
+bstr = { version = "1.3.0", default-features = false, features = ["std", "unicode"] }
 thiserror = "1.0.26"
 
 # for async-client
diff --git a/gix-url/Cargo.toml b/gix-url/Cargo.toml
@@ -23,7 +23,7 @@ gix-path = { version = "^0.7.1", path = "../gix-path" }
 serde = { version = "1.0.114", optional = true, default-features = false, features = ["std", "derive"]}
 thiserror = "1.0.32"
 url = "2.1.1"
-bstr = { version = "1.0.1", default-features = false, features = ["std"] }
+bstr = { version = "1.3.0", default-features = false, features = ["std"] }
 home = "0.5.3"
 
 document-features = { version = "0.2.0", optional = true }
diff --git a/gix-validate/Cargo.toml b/gix-validate/Cargo.toml
@@ -15,7 +15,7 @@ test = true
 
 [dependencies]
 thiserror = "1.0.34"
-bstr = { version = "1.0.1", default-features = false, features = ["std"] }
+bstr = { version = "1.3.0", default-features = false, features = ["std"] }
 
 [dev-dependencies]
 gix-testtools = { path = "../tests/tools" }
diff --git a/gix-worktree/Cargo.toml b/gix-worktree/Cargo.toml
@@ -41,7 +41,7 @@ gix-features = { version = "^0.26.4", path = "../gix-features" }
 serde = { version = "1.0.114", optional = true, default-features = false, features = ["derive"]}
 
 thiserror = "1.0.26"
-bstr = { version = "1.0.1", default-features = false }
+bstr = { version = "1.3.0", default-features = false }
 
 document-features = { version = "0.2.0", optional = true }
 io-close = "0.3.7"
diff --git a/gix-worktree/src/fs/cache/state.rs b/gix-worktree/src/fs/cache/state.rs
@@ -114,7 +114,7 @@ impl Ignore {
         groups
             .iter()
             .rev()
-            .find_map(|group| group.pattern_matching_relative_path(relative_path.as_ref(), is_dir, case))
+            .find_map(|group| group.pattern_matching_relative_path(relative_path.as_bytes(), is_dir, case))
             .or(dir_match)
     }
 
diff --git a/gix-worktree/tests/worktree/fs/cache/ignore_and_attributes.rs b/gix-worktree/tests/worktree/fs/cache/ignore_and_attributes.rs
@@ -75,7 +75,7 @@ fn special_exclude_cases_we_handle_differently() {
         let match_ = platform.matching_exclude_pattern().expect("match all values");
         let is_excluded = platform.is_excluded();
 
-        match relative_entry.as_ref() {
+        match relative_entry.as_bytes() {
             b"tld" | b"tld/" | b"tld/file" | b"tld/sd" | b"tld/sd/" => {
                 assert_eq!(match_.pattern.to_string(), "tld/");
             }
diff --git a/gix/src/config/tree/sections/core.rs b/gix/src/config/tree/sections/core.rs
@@ -111,6 +111,7 @@ pub type Disambiguate = keys::Any<validate::Disambiguate>;
 mod disambiguate {
     use std::borrow::Cow;
 
+    use crate::bstr::ByteSlice;
     use crate::{bstr::BStr, config, config::tree::core::Disambiguate, revision::spec::parse::ObjectKindHint};
 
     impl Disambiguate {
@@ -119,7 +120,7 @@ mod disambiguate {
             &'static self,
             value: Cow<'_, BStr>,
         ) -> Result<Option<ObjectKindHint>, config::key::GenericErrorWithValue> {
-            let hint = match value.as_ref().as_ref() {
+            let hint = match value.as_ref().as_bytes() {
                 b"none" => return Ok(None),
                 b"commit" => ObjectKindHint::Commit,
                 b"committish" => ObjectKindHint::Committish,
@@ -166,6 +167,7 @@ mod log_all_ref_updates {
 mod check_stat {
     use std::borrow::Cow;
 
+    use crate::bstr::ByteSlice;
     use crate::{bstr::BStr, config, config::tree::core::CheckStat};
 
     impl CheckStat {
@@ -174,7 +176,7 @@ mod check_stat {
             &'static self,
             value: Cow<'_, BStr>,
         ) -> Result<bool, config::key::GenericErrorWithValue> {
-            Ok(match value.as_ref().as_ref() {
+            Ok(match value.as_ref().as_bytes() {
                 b"minimal" => false,
                 b"default" => true,
                 _ => {
diff --git a/gix/src/config/tree/sections/diff.rs b/gix/src/config/tree/sections/diff.rs
diff --git a/gix/src/config/tree/sections/http.rs b/gix/src/config/tree/sections/http.rs
diff --git a/gix/src/config/tree/sections/remote.rs b/gix/src/config/tree/sections/remote.rs
diff --git a/gix/src/config/tree/sections/ssh.rs b/gix/src/config/tree/sections/ssh.rs
diff --git a/gix/src/object/tree/mod.rs b/gix/src/object/tree/mod.rs
diff --git a/gix/src/remote/url/scheme_permission.rs b/gix/src/remote/url/scheme_permission.rs
