Use gix::remote::Name for type-safety.

Author: Byron

Cargo.lock

@@ -204,10 +204,10 @@ fn branch_group_to_branch(
     });
 
     // TODO(ST): keep the type alive, don't reduce to BString
-    let mut remotes: Vec<BString> = Vec::new();
+    let mut remotes: Vec<gix::remote::Name<'static>> = Vec::new();
     for branch in remote_branches.iter() {
         if let Some(remote_name) = branch.remote_name(gix::remote::Direction::Fetch) {
-            remotes.push(remote_name.as_bstr().into());
+            remotes.push(remote_name.to_owned());
         }
     }
 
@@ -347,8 +347,8 @@ pub struct BranchListing {
     pub name: BranchIdentity,
     /// This is a list of remotes that this branch can be found on (e.g. `origin`, `upstream` etc.),
     /// by collecting remotes from all local branches with the same identity that have a tracking setup.
-    #[serde(serialize_with = "gitbutler_serde::as_string_lossy_vec")]
-    pub remotes: Vec<BString>,
+    #[serde(serialize_with = "gitbutler_serde::as_string_lossy_vec_remote_name")]
+    pub remotes: Vec<gix::remote::Name<'static>>,
     /// The branch may or may not have a virtual branch associated with it.
     pub virtual_branch: Option<VirtualBranchReference>,
     /// Timestamp in milliseconds since the branch was last updated.

crates/gitbutler-branch-actions/src/branch.rs

@@ -7,5 +7,6 @@ publish = false
 
 [dependencies]
 git2.workspace = true
+gix.workspace = true
 serde = { workspace = true, features = ["std"]}
 bstr = "1.10.0"

crates/gitbutler-serde/Cargo.toml

@@ -16,6 +16,17 @@ where
     vec.serialize(s)
 }
 
+pub fn as_string_lossy_vec_remote_name<S>(
+    v: &[gix::remote::Name<'static>],
+    s: S,
+) -> Result<S::Ok, S::Error>
+where
+    S: serde::Serializer,
+{
+    let vec: Vec<String> = v.iter().map(|v| v.as_bstr().to_string()).collect();
+    vec.serialize(s)
+}
+
 pub fn as_time_seconds_from_unix_epoch<S>(v: &git2::Time, s: S) -> Result<S::Ok, S::Error>
 where
     S: serde::Serializer,