refactor (#331)

Byron · Jul 22, 2022 · a437abe · a437abe
1 parent 8e5b796
commit a437abe
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 30 deletions.
diff --git a/src/plumbing/main.rs b/src/plumbing/main.rs
@@ -503,7 +503,7 @@ pub fn main() -> Result<()> {
                 )
             },
         ),
-        Subcommands::Revision { cmd } => match cmd {
+        Subcommands::Revision(cmd) => match cmd {
             revision::Subcommands::Explain { spec } => prepare_and_run(
                 "repository-commit-describe",
                 verbose,
@@ -513,7 +513,7 @@ pub fn main() -> Result<()> {
                 move |_progress, out, _err| core::repository::revision::explain(repository()?.into(), spec, out),
             ),
         },
-        Subcommands::Commit { cmd } => match cmd {
+        Subcommands::Commit(cmd) => match cmd {
             commit::Subcommands::Describe {
                 annotated_tags,
                 all_refs,
@@ -548,7 +548,7 @@ pub fn main() -> Result<()> {
                 },
             ),
         },
-        Subcommands::Tree { cmd } => match cmd {
+        Subcommands::Tree(cmd) => match cmd {
             tree::Subcommands::Entries {
                 treeish,
                 recursive,
@@ -581,7 +581,7 @@ pub fn main() -> Result<()> {
                 },
             ),
         },
-        Subcommands::Odb { cmd } => match cmd {
+        Subcommands::Odb(cmd) => match cmd {
             odb::Subcommands::Entries => prepare_and_run(
                 "repository-odb-entries",
                 verbose,
@@ -599,7 +599,7 @@ pub fn main() -> Result<()> {
                 move |_progress, out, err| core::repository::odb::info(repository()?.into(), format, out, err),
             ),
         },
-        Subcommands::Mailmap { cmd } => match cmd {
+        Subcommands::Mailmap(cmd) => match cmd {
             mailmap::Subcommands::Entries => prepare_and_run(
                 "repository-mailmap-entries",
                 verbose,
@@ -609,7 +609,7 @@ pub fn main() -> Result<()> {
                 move |_progress, out, err| core::repository::mailmap::entries(repository()?.into(), format, out, err),
             ),
         },
-        Subcommands::Exclude { cmd } => match cmd {
+        Subcommands::Exclude(cmd) => match cmd {
             exclude::Subcommands::Query {
                 patterns,
                 pathspecs,

diff --git a/src/plumbing/options.rs b/src/plumbing/options.rs
@@ -52,40 +52,28 @@ pub struct Args {
 #[derive(Debug, clap::Subcommand)]
 pub enum Subcommands {
     /// Interact with the object database.
-    Odb {
-        #[clap(subcommand)]
-        cmd: odb::Subcommands,
-    },
+    #[clap(subcommand)]
+    Odb(odb::Subcommands),
     /// Interact with tree objects.
-    Tree {
-        #[clap(subcommand)]
-        cmd: tree::Subcommands,
-    },
+    #[clap(subcommand)]
+    Tree(tree::Subcommands),
     /// Interact with commit objects.
-    Commit {
-        #[clap(subcommand)]
-        cmd: commit::Subcommands,
-    },
+    #[clap(subcommand)]
+    Commit(commit::Subcommands),
     /// Verify the integrity of the entire repository
     Verify {
         #[clap(flatten)]
         args: free::pack::VerifyOptions,
     },
     /// Query and obtain information about revisions.
-    Revision {
-        #[clap(subcommand)]
-        cmd: revision::Subcommands,
-    },
+    #[clap(subcommand)]
+    Revision(revision::Subcommands),
     /// Interact with the mailmap.
-    Mailmap {
-        #[clap(subcommand)]
-        cmd: mailmap::Subcommands,
-    },
+    #[clap(subcommand)]
+    Mailmap(mailmap::Subcommands),
     /// Interact with the exclude files like .gitignore.
-    Exclude {
-        #[clap(subcommand)]
-        cmd: exclude::Subcommands,
-    },
+    #[clap(subcommand)]
+    Exclude(exclude::Subcommands),
     /// Subcommands that need no git repository to run.
     #[clap(subcommand)]
     Free(free::Subcommands),