summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--asyncgit/src/blame.rs2
-rw-r--r--asyncgit/src/commit_files.rs2
-rw-r--r--asyncgit/src/diff.rs4
-rw-r--r--asyncgit/src/lib.rs2
-rw-r--r--asyncgit/src/progress.rs2
-rw-r--r--asyncgit/src/revlog.rs2
-rw-r--r--asyncgit/src/status.rs2
-rw-r--r--asyncgit/src/sync/commit_details.rs2
-rw-r--r--asyncgit/src/sync/config.rs2
-rw-r--r--asyncgit/src/sync/cred.rs2
-rw-r--r--asyncgit/src/sync/diff.rs4
-rw-r--r--asyncgit/src/sync/hooks.rs2
-rw-r--r--asyncgit/src/sync/rebase.rs4
-rw-r--r--asyncgit/src/sync/remotes/push.rs2
-rw-r--r--asyncgit/src/sync/remotes/tags.rs2
-rw-r--r--asyncgit/src/sync/state.rs2
-rw-r--r--asyncgit/src/sync/status.rs6
-rw-r--r--asyncgit/src/sync/tags.rs2
-rw-r--r--asyncgit/src/sync/tree.rs2
-rw-r--r--asyncgit/src/sync/utils.rs2
-rw-r--r--filetreelist/src/item.rs4
-rw-r--r--src/components/mod.rs4
-rw-r--r--src/components/options_popup.rs2
-rw-r--r--src/components/textinput.rs2
-rw-r--r--src/components/utils/filetree.rs4
-rw-r--r--src/main.rs6
26 files changed, 36 insertions, 36 deletions
diff --git a/asyncgit/src/blame.rs b/asyncgit/src/blame.rs
index 9c848cb0..554b4539 100644
--- a/asyncgit/src/blame.rs
+++ b/asyncgit/src/blame.rs
@@ -14,7 +14,7 @@ use std::{
};
///
-#[derive(Hash, Clone, PartialEq)]
+#[derive(Hash, Clone, PartialEq, Eq)]
pub struct BlameParams {
/// path to the file to blame
pub file_path: String,
diff --git a/asyncgit/src/commit_files.rs b/asyncgit/src/commit_files.rs
index 17a0c2b2..c02e6e8f 100644
--- a/asyncgit/src/commit_files.rs
+++ b/asyncgit/src/commit_files.rs
@@ -13,7 +13,7 @@ type ResultType = Vec<StatusItem>;
struct Request<R, A>(R, A);
///
-#[derive(Debug, Copy, Clone, PartialEq)]
+#[derive(Debug, Copy, Clone, PartialEq, Eq)]
pub struct CommitFilesParams {
///
pub id: CommitId,
diff --git a/asyncgit/src/diff.rs b/asyncgit/src/diff.rs
index a2685b4f..20de8f56 100644
--- a/asyncgit/src/diff.rs
+++ b/asyncgit/src/diff.rs
@@ -14,7 +14,7 @@ use std::{
};
///
-#[derive(Debug, Hash, Clone, PartialEq)]
+#[derive(Debug, Hash, Clone, PartialEq, Eq)]
pub enum DiffType {
/// diff two commits
Commits((CommitId, CommitId)),
@@ -27,7 +27,7 @@ pub enum DiffType {
}
///
-#[derive(Debug, Hash, Clone, PartialEq)]
+#[derive(Debug, Hash, Clone, PartialEq, Eq)]
pub struct DiffParams {
/// path to the file to diff
pub path: String,
diff --git a/asyncgit/src/lib.rs b/asyncgit/src/lib.rs
index 39660d49..d3999959 100644
--- a/asyncgit/src/lib.rs
+++ b/asyncgit/src/lib.rs
@@ -67,7 +67,7 @@ use std::{
};
/// this type is used to communicate events back through the channel
-#[derive(Copy, Clone, Debug, PartialEq)]
+#[derive(Copy, Clone, Debug, PartialEq, Eq)]
pub enum AsyncGitNotification {
/// this indicates that no new state was fetched but that a async process finished
FinishUnchanged,
diff --git a/asyncgit/src/progress.rs b/asyncgit/src/progress.rs
index 102a9ec2..26780b8a 100644
--- a/asyncgit/src/progress.rs
+++ b/asyncgit/src/progress.rs
@@ -4,7 +4,7 @@ use easy_cast::{Conv, ConvFloat};
use std::cmp;
///
-#[derive(Clone, Copy, Default, Debug, PartialEq)]
+#[derive(Clone, Copy, Default, Debug, PartialEq, Eq)]
pub struct ProgressPercent {
/// percent 0..100
pub progress: u8,
diff --git a/asyncgit/src/revlog.rs b/asyncgit/src/revlog.rs
index 6ed93fef..18621436 100644
--- a/asyncgit/src/revlog.rs
+++ b/asyncgit/src/revlog.rs
@@ -15,7 +15,7 @@ use std::{
};
///
-#[derive(PartialEq)]
+#[derive(PartialEq, Eq)]
pub enum FetchStatus {
/// previous fetch still running
Pending,
diff --git a/asyncgit/src/status.rs b/asyncgit/src/status.rs
index 3576c91e..491fb104 100644
--- a/asyncgit/src/status.rs
+++ b/asyncgit/src/status.rs
@@ -29,7 +29,7 @@ pub struct Status {
}
///
-#[derive(Default, Hash, Copy, Clone, PartialEq)]
+#[derive(Default, Hash, Copy, Clone, PartialEq, Eq)]
pub struct StatusParams {
tick: u128,
status_type: StatusType,
diff --git a/asyncgit/src/sync/commit_details.rs b/asyncgit/src/sync/commit_details.rs
index a6c2cc03..02395d1e 100644
--- a/asyncgit/src/sync/commit_details.rs
+++ b/asyncgit/src/sync/commit_details.rs
@@ -4,7 +4,7 @@ use git2::Signature;
use scopetime::scope_time;
///
-#[derive(Debug, PartialEq, Default, Clone)]
+#[derive(Debug, PartialEq, Eq, Default, Clone)]
pub struct CommitSignature {
///
pub name: String,
diff --git a/asyncgit/src/sync/config.rs b/asyncgit/src/sync/config.rs
index 54acea8b..3d095c77 100644
--- a/asyncgit/src/sync/config.rs
+++ b/asyncgit/src/sync/config.rs
@@ -6,7 +6,7 @@ use super::{repository::repo, RepoPath};
// see https://git-scm.com/docs/git-config#Documentation/git-config.txt-statusshowUntrackedFiles
/// represents the `status.showUntrackedFiles` git config state
-#[derive(Hash, Copy, Clone, PartialEq)]
+#[derive(Hash, Copy, Clone, PartialEq, Eq)]
pub enum ShowUntrackedFilesConfig {
///
No,
diff --git a/asyncgit/src/sync/cred.rs b/asyncgit/src/sync/cred.rs
index 4a46c444..f17c9941 100644
--- a/asyncgit/src/sync/cred.rs
+++ b/asyncgit/src/sync/cred.rs
@@ -7,7 +7,7 @@ use crate::error::{Error, Result};
use git2::CredentialHelper;
/// basic Authentication Credentials
-#[derive(Debug, Clone, Default, PartialEq)]
+#[derive(Debug, Clone, Default, PartialEq, Eq)]
pub struct BasicAuthCredential {
///
pub username: Option<String>,
diff --git a/asyncgit/src/sync/diff.rs b/asyncgit/src/sync/diff.rs
index f42252c0..c93f937f 100644
--- a/asyncgit/src/sync/diff.rs
+++ b/asyncgit/src/sync/diff.rs
@@ -16,7 +16,7 @@ use scopetime::scope_time;
use std::{cell::RefCell, fs, path::Path, rc::Rc};
/// type of diff of a single line
-#[derive(Copy, Clone, PartialEq, Hash, Debug)]
+#[derive(Copy, Clone, PartialEq, Eq, Hash, Debug)]
pub enum DiffLineType {
/// just surrounding line, no change
None,
@@ -127,7 +127,7 @@ pub struct FileDiff {
}
/// see <https://libgit2.org/libgit2/#HEAD/type/git_diff_options>
-#[derive(Debug, Hash, Clone, Copy, PartialEq)]
+#[derive(Debug, Hash, Clone, Copy, PartialEq, Eq)]
pub struct DiffOptions {
/// see <https://libgit2.org/libgit2/#HEAD/type/git_diff_options>
pub ignore_whitespace: bool,
diff --git a/asyncgit/src/sync/hooks.rs b/asyncgit/src/sync/hooks.rs
index 130c81e0..5265632b 100644
--- a/asyncgit/src/sync/hooks.rs
+++ b/asyncgit/src/sync/hooks.rs
@@ -153,7 +153,7 @@ pub fn hooks_post_commit(repo_path: &RepoPath) -> Result<HookResult> {
}
///
-#[derive(Debug, PartialEq)]
+#[derive(Debug, PartialEq, Eq)]
pub enum HookResult {
/// Everything went fine
Ok,
diff --git a/asyncgit/src/sync/rebase.rs b/asyncgit/src/sync/rebase.rs
index 8fc289d0..8040ee96 100644
--- a/asyncgit/src/sync/rebase.rs
+++ b/asyncgit/src/sync/rebase.rs
@@ -69,7 +69,7 @@ pub fn conflict_free_rebase(
}
///
-#[derive(PartialEq, Debug)]
+#[derive(PartialEq, Eq, Debug)]
pub enum RebaseState {
///
Finished,
@@ -144,7 +144,7 @@ pub fn continue_rebase(
}
///
-#[derive(PartialEq, Debug)]
+#[derive(PartialEq, Eq, Debug)]
pub struct RebaseProgress {
///
pub steps: usize,
diff --git a/asyncgit/src/sync/remotes/push.rs b/asyncgit/src/sync/remotes/push.rs
index 12413526..7467b5fe 100644
--- a/asyncgit/src/sync/remotes/push.rs
+++ b/asyncgit/src/sync/remotes/push.rs
@@ -22,7 +22,7 @@ pub trait AsyncProgress: Clone + Send + Sync {
}
///
-#[derive(Debug, Clone, PartialEq)]
+#[derive(Debug, Clone, PartialEq, Eq)]
pub enum ProgressNotification {
///
UpdateTips {
diff --git a/asyncgit/src/sync/remotes/tags.rs b/asyncgit/src/sync/remotes/tags.rs
index 7c7ffddf..235ababc 100644
--- a/asyncgit/src/sync/remotes/tags.rs
+++ b/asyncgit/src/sync/remotes/tags.rs
@@ -17,7 +17,7 @@ use scopetime::scope_time;
use std::collections::HashSet;
///
-#[derive(Debug, Copy, Clone, PartialEq)]
+#[derive(Debug, Copy, Clone, PartialEq, Eq)]
pub enum PushTagsProgress {
/// fetching tags from remote to check which local tags need pushing
CheckRemote,
diff --git a/asyncgit/src/sync/state.rs b/asyncgit/src/sync/state.rs
index 0c405657..ffa09187 100644
--- a/asyncgit/src/sync/state.rs
+++ b/asyncgit/src/sync/state.rs
@@ -4,7 +4,7 @@ use git2::RepositoryState;
use scopetime::scope_time;
///
-#[derive(Debug, PartialEq)]
+#[derive(Debug, PartialEq, Eq)]
pub enum RepoState {
///
Clean,
diff --git a/asyncgit/src/sync/status.rs b/asyncgit/src/sync/status.rs
index 345a64b2..962226d9 100644
--- a/asyncgit/src/sync/status.rs
+++ b/asyncgit/src/sync/status.rs
@@ -12,7 +12,7 @@ use std::path::Path;
use super::{RepoPath, ShowUntrackedFilesConfig};
///
-#[derive(Copy, Clone, Hash, PartialEq, Debug)]
+#[derive(Copy, Clone, Hash, PartialEq, Eq, Debug)]
pub enum StatusItemType {
///
New,
@@ -59,7 +59,7 @@ impl From<Delta> for StatusItemType {
}
///
-#[derive(Clone, Hash, PartialEq, Debug)]
+#[derive(Clone, Hash, PartialEq, Eq, Debug)]
pub struct StatusItem {
///
pub path: String,
@@ -68,7 +68,7 @@ pub struct StatusItem {
}
///
-#[derive(Copy, Clone, Hash, PartialEq, Debug)]
+#[derive(Copy, Clone, Hash, PartialEq, Eq, Debug)]
pub enum StatusType {
///
WorkingDir,
diff --git a/asyncgit/src/sync/tags.rs b/asyncgit/src/sync/tags.rs
index c5b168e6..9e9d3ba7 100644
--- a/asyncgit/src/sync/tags.rs
+++ b/asyncgit/src/sync/tags.rs
@@ -10,7 +10,7 @@ use std::{
};
///
-#[derive(Clone, Hash, PartialEq, Debug)]
+#[derive(Clone, Hash, PartialEq, Eq, Debug)]
pub struct Tag {
/// tag name
pub name: String,
diff --git a/asyncgit/src/sync/tree.rs b/asyncgit/src/sync/tree.rs
index 1b4499d7..9a2e7e30 100644
--- a/asyncgit/src/sync/tree.rs
+++ b/asyncgit/src/sync/tree.rs
@@ -11,7 +11,7 @@ use std::{
};
/// `tree_files` returns a list of `FileTree`
-#[derive(Debug, PartialEq, Clone)]
+#[derive(Debug, PartialEq, Eq, Clone)]
pub struct TreeFile {
/// path of this file
pub path: PathBuf,
diff --git a/asyncgit/src/sync/utils.rs b/asyncgit/src/sync/utils.rs
index 58042a9d..e977d6da 100644
--- a/asyncgit/src/sync/utils.rs
+++ b/asyncgit/src/sync/utils.rs
@@ -16,7 +16,7 @@ use std::{
};
///
-#[derive(PartialEq, Debug, Clone)]
+#[derive(PartialEq, Eq, Debug, Clone)]
pub struct Head {
///
pub name: String,
diff --git a/filetreelist/src/item.rs b/filetreelist/src/item.rs
index cc6a7571..482bd033 100644
--- a/filetreelist/src/item.rs
+++ b/filetreelist/src/item.rs
@@ -83,11 +83,11 @@ impl TreeItemInfo {
}
/// attribute used to indicate the collapse/expand state of a path item
-#[derive(PartialEq, Debug, Copy, Clone)]
+#[derive(PartialEq, Eq, Debug, Copy, Clone)]
pub struct PathCollapsed(pub bool);
/// `FileTreeItem` can be of two kinds
-#[derive(PartialEq, Debug, Clone)]
+#[derive(PartialEq, Eq, Debug, Clone)]
pub enum FileTreeItemKind {
Path(PathCollapsed),
File,
diff --git a/src/components/mod.rs b/src/components/mod.rs
index ca23fa23..a67c4a6c 100644
--- a/src/components/mod.rs
+++ b/src/components/mod.rs
@@ -192,7 +192,7 @@ pub enum Direction {
}
///
-#[derive(PartialEq)]
+#[derive(PartialEq, Eq)]
pub enum CommandBlocking {
Blocking,
PassingOn,
@@ -220,7 +220,7 @@ pub trait DrawableComponent {
}
///
-#[derive(PartialEq)]
+#[derive(PartialEq, Eq)]
pub enum EventState {
Consumed,
NotConsumed,
diff --git a/src/components/options_popup.rs b/src/components/options_popup.rs
index b99a46f6..66a95090 100644
--- a/src/components/options_popup.rs
+++ b/src/components/options_popup.rs
@@ -23,7 +23,7 @@ use tui::{
Frame,
};
-#[derive(Clone, Copy, PartialEq)]
+#[derive(Clone, Copy, PartialEq, Eq)]
pub enum AppOption {
StatusShowUntracked,
DiffIgnoreWhitespaces,
diff --git a/src/components/textinput.rs b/src/components/textinput.rs
index 69e098c7..829901b4 100644
--- a/src/components/textinput.rs
+++ b/src/components/textinput.rs
@@ -22,7 +22,7 @@ use tui::{
Frame,
};
-#[derive(PartialEq)]
+#[derive(PartialEq, Eq)]
pub enum InputType {
Singleline,
Multiline,
diff --git a/src/components/utils/filetree.rs b/src/components/utils/filetree.rs
index 4b26825e..8bf144f7 100644
--- a/src/components/utils/filetree.rs
+++ b/src/components/utils/filetree.rs
@@ -39,11 +39,11 @@ impl TreeItemInfo {
}
/// attribute used to indicate the collapse/expand state of a path item
-#[derive(PartialEq, Debug, Copy, Clone)]
+#[derive(PartialEq, Eq, Debug, Copy, Clone)]
pub struct PathCollapsed(pub bool);
/// `FileTreeItem` can be of two kinds
-#[derive(PartialEq, Debug, Clone)]
+#[derive(PartialEq, Eq, Debug, Clone)]
pub enum FileTreeItemKind {
Path(PathCollapsed),
File(StatusItem),
diff --git a/src/main.rs b/src/main.rs
index 9f85240f..fe11eb28 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -79,19 +79,19 @@ pub enum QueueEvent {
InputEvent(InputEvent),
}
-#[derive(Clone, Copy, Debug, PartialEq)]
+#[derive(Clone, Copy, Debug, PartialEq, Eq)]
pub enum SyntaxHighlightProgress {
Progress,
Done,
}
-#[derive(Clone, Copy, Debug, PartialEq)]
+#[derive(Clone, Copy, Debug, PartialEq, Eq)]
pub enum AsyncAppNotification {
///
SyntaxHighlighting(SyntaxHighlightProgress),
}
-#[derive(Clone, Copy, Debug, PartialEq)]
+#[derive(Clone, Copy, Debug, PartialEq, Eq)]
pub enum AsyncNotification {
///
App(AsyncAppNotification),