Merge pull request #2266 from budde25/traits

imp: added more common derives App, Arg, and ArgMatches
clap-rs · Dec 26, 2020 · 7728000 · 7728000
2 parents db3f10c + c26d1a4
commit 7728000
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 8 deletions.
diff --git a/src/build/app/mod.rs b/src/build/app/mod.rs
@@ -60,7 +60,7 @@ use crate::{
 /// // Your program logic starts here...
 /// ```
 /// [`App::get_matches`]: ./struct.App.html#method.get_matches
-#[derive(Default, Debug, Clone)]
+#[derive(Default, Debug, Clone, PartialEq, Eq)]
 pub struct App<'help> {
     pub(crate) id: Id,
     pub(crate) name: String,

diff --git a/src/build/app/settings.rs b/src/build/app/settings.rs
@@ -51,7 +51,7 @@ bitflags! {
     }
 }
 
-#[derive(Debug, Copy, Clone, PartialEq)]
+#[derive(Debug, Copy, Clone, PartialEq, Eq)]
 pub(crate) struct AppFlags(Flags);
 
 impl BitOr for AppFlags {

diff --git a/src/build/arg_group.rs b/src/build/arg_group.rs
@@ -75,7 +75,7 @@ use yaml_rust::Yaml;
 /// [arguments]: ./struct.Arg.html
 /// [conflict]: ./struct.Arg.html#method.conflicts_with
 /// [requirement]: ./struct.Arg.html#method.requires
-#[derive(Default, Debug)]
+#[derive(Default, Debug, PartialEq, Eq)]
 pub struct ArgGroup<'help> {
     pub(crate) id: Id,
     pub(crate) name: &'help str,

diff --git a/src/mkeymap.rs b/src/mkeymap.rs
@@ -5,13 +5,13 @@ use std::{
     ops::Index,
 };
 
-#[derive(PartialEq, Debug, Clone)]
+#[derive(PartialEq, Eq, Debug, Clone)]
 pub(crate) struct Key {
     pub(crate) key: KeyType,
     pub(crate) index: usize,
 }
 
-#[derive(Default, PartialEq, Debug, Clone)]
+#[derive(Default, PartialEq, Eq, Debug, Clone)]
 pub(crate) struct MKeyMap<'help> {
     pub(crate) keys: Vec<Key>,
     pub(crate) args: Vec<Arg<'help>>,

diff --git a/src/parse/matches/arg_matches.rs b/src/parse/matches/arg_matches.rs
@@ -18,7 +18,7 @@ use crate::{
     {Error, INVALID_UTF8},
 };
 
-#[derive(Debug, Clone)]
+#[derive(Debug, Clone, PartialEq, Eq)]
 pub(crate) struct SubCommand {
     pub(crate) id: Id,
     pub(crate) name: String,
@@ -72,7 +72,7 @@ pub(crate) struct SubCommand {
 /// }
 /// ```
 /// [`App::get_matches`]: ./struct.App.html#method.get_matches
-#[derive(Debug, Clone)]
+#[derive(Debug, Clone, PartialEq, Eq)]
 pub struct ArgMatches {
     pub(crate) args: IndexMap<Id, MatchedArg>,
     pub(crate) subcommand: Option<Box<SubCommand>>,

diff --git a/src/parse/matches/matched_arg.rs b/src/parse/matches/matched_arg.rs
@@ -9,7 +9,7 @@ pub(crate) enum ValueType {
     DefaultValue,
 }
 
-#[derive(Debug, Clone)]
+#[derive(Debug, Clone, PartialEq, Eq)]
 pub(crate) struct MatchedArg {
     pub(crate) occurs: u64,
     pub(crate) ty: ValueType,