refactor

Author: Byron

gitoxide-core/src/repository/branch.rs

@@ -5,21 +5,6 @@ pub enum Kind {
     All,
 }
 
-impl Kind {
-    fn includes_local_branches(&self) -> bool {
-        match self {
-            Self::Local | Self::All => true,
-        }
-    }
-
-    fn includes_remote_branches(&self) -> bool {
-        match self {
-            Self::Local => false,
-            Self::All => true,
-        }
-    }
-}
-
 pub struct Options {
     pub kind: Kind,
 }
@@ -36,7 +21,12 @@ pub fn list(
 
     let platform = repo.references()?;
 
-    if options.kind.includes_local_branches() {
+    let (show_local, show_remotes) = match options.kind {
+        Kind::Local => (true, false),
+        Kind::All => (true, true),
+    };
+
+    if show_local {
         let mut branch_names: Vec<String> = platform
             .local_branches()?
             .flatten()
@@ -50,7 +40,7 @@ pub fn list(
         }
     }
 
-    if options.kind.includes_remote_branches() {
+    if show_remotes {
         let mut branch_names: Vec<String> = platform
             .remote_branches()?
             .flatten()

src/plumbing/main.rs

@@ -511,10 +511,14 @@ pub fn main() -> Result<()> {
         ),
         Subcommands::Branch(platform) => match platform.cmds {
             Some(branch::Subcommands::List) | None => {
-                use core::repository::branch::{Kind, Options};
+                use core::repository::branch;
 
-                let kind = if platform.all { Kind::All } else { Kind::Local };
-                let options = Options { kind };
+                let kind = if platform.all {
+                    branch::Kind::All
+                } else {
+                    branch::Kind::Local
+                };
+                let options = branch::Options { kind };
 
                 prepare_and_run(
                     "branch-list",