Use claims over claim

MitMaro · MitMaro · commit d13663f4cecf · 2023-07-22T11:40:27.000-02:30
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/src/config/Cargo.toml b/src/config/Cargo.toml
@@ -20,7 +20,7 @@ girt-git = {version = "2.3.0", path = "../../src/git"}
 proc-macro2 = "1.0.66" # TODO: remove override of indirect dependency
 
 [dev-dependencies]
-claim = { git = "https://github.com/Turbo87/rust-claim.git", rev = "23892a3" }
+claims = "0.7.1"
 lazy_static = "1.4.0"
 rstest = "0.18.1"
 serial_test = "2.0.0"
diff --git a/src/config/src/color.rs b/src/config/src/color.rs
@@ -124,7 +124,7 @@ impl TryFrom<&str> for Color {
 
 #[cfg(test)]
 mod tests {
-	use claim::assert_ok_eq;
+	use claims::assert_ok_eq;
 	use rstest::rstest;
 	use testutils::assert_err_eq;
 
diff --git a/src/config/src/git_config.rs b/src/config/src/git_config.rs
@@ -90,7 +90,7 @@ impl TryFrom<&Config> for GitConfig {
 mod tests {
 	use std::env::{remove_var, set_var};
 
-	use claim::assert_ok;
+	use claims::assert_ok;
 	use rstest::rstest;
 	use testutils::assert_err_eq;
 
diff --git a/src/config/src/key_bindings.rs b/src/config/src/key_bindings.rs
@@ -196,7 +196,7 @@ impl TryFrom<&Config> for KeyBindings {
 
 #[cfg(test)]
 mod tests {
-	use claim::assert_ok;
+	use claims::assert_ok;
 
 	use super::*;
 	use crate::testutils::with_git_config;
diff --git a/src/config/src/lib.rs b/src/config/src/lib.rs
@@ -261,7 +261,7 @@ mod tests {
 	use std::fmt::Debug;
 
 	use ::testutils::assert_err_eq;
-	use claim::assert_ok;
+	use claims::assert_ok;
 	use git::testutil::with_temp_bare_repository;
 	use rstest::rstest;
 
diff --git a/src/config/src/theme.rs b/src/config/src/theme.rs
@@ -141,7 +141,7 @@ impl TryFrom<&Config> for Theme {
 
 #[cfg(test)]
 mod tests {
-	use claim::{assert_err, assert_ok};
+	use claims::{assert_err, assert_ok};
 	use rstest::rstest;
 	use testutils::assert_err_eq;
 
diff --git a/src/config/src/utils/get_bool.rs b/src/config/src/utils/get_bool.rs
@@ -30,7 +30,7 @@ pub(crate) fn get_bool(config: Option<&Config>, name: &str, default: bool) -> Re
 
 #[cfg(test)]
 mod tests {
-	use claim::assert_ok_eq;
+	use claims::assert_ok_eq;
 	use testutils::assert_err_eq;
 
 	use super::*;
diff --git a/src/config/src/utils/get_diff_ignore_whitespace.rs b/src/config/src/utils/get_diff_ignore_whitespace.rs
@@ -22,7 +22,7 @@ pub(crate) fn get_diff_ignore_whitespace(
 
 #[cfg(test)]
 mod tests {
-	use claim::assert_ok_eq;
+	use claims::assert_ok_eq;
 	use rstest::rstest;
 	use testutils::assert_err_eq;
 
diff --git a/src/config/src/utils/get_diff_rename.rs b/src/config/src/utils/get_diff_rename.rs
@@ -13,7 +13,7 @@ pub(crate) fn git_diff_renames(git_config: Option<&Config>, name: &str) -> Resul
 
 #[cfg(test)]
 mod tests {
-	use claim::assert_ok_eq;
+	use claims::assert_ok_eq;
 	use rstest::rstest;
 	use testutils::assert_err_eq;
 
diff --git a/src/config/src/utils/get_diff_show_whitespace.rs b/src/config/src/utils/get_diff_show_whitespace.rs
@@ -17,7 +17,7 @@ pub(crate) fn get_diff_show_whitespace(
 
 #[cfg(test)]
 mod tests {
-	use claim::assert_ok_eq;
+	use claims::assert_ok_eq;
 	use rstest::rstest;
 	use testutils::assert_err_eq;
 
diff --git a/src/config/src/utils/get_input.rs b/src/config/src/utils/get_input.rs
@@ -75,7 +75,7 @@ pub(crate) fn get_input(config: Option<&Config>, name: &str, default: &str) -> R
 
 #[cfg(test)]
 mod tests {
-	use claim::assert_ok_eq;
+	use claims::assert_ok_eq;
 	use rstest::rstest;
 	use testutils::assert_err_eq;
 
diff --git a/src/config/src/utils/get_string.rs b/src/config/src/utils/get_string.rs
@@ -29,7 +29,7 @@ pub(crate) fn get_string(config: Option<&Config>, name: &str, default: &str) ->
 
 #[cfg(test)]
 mod tests {
-	use claim::assert_ok_eq;
+	use claims::assert_ok_eq;
 	use testutils::assert_err_eq;
 
 	use super::*;
diff --git a/src/config/src/utils/get_unsigned_integer.rs b/src/config/src/utils/get_unsigned_integer.rs
@@ -38,7 +38,7 @@ pub(crate) fn get_unsigned_integer(config: Option<&Config>, name: &str, default:
 
 #[cfg(test)]
 mod tests {
-	use claim::assert_ok_eq;
+	use claims::assert_ok_eq;
 	use testutils::assert_err_eq;
 
 	use super::*;
diff --git a/src/core/Cargo.toml b/src/core/Cargo.toml
@@ -34,7 +34,7 @@ girt-todo-file = {version = "2.3.0", path = "../../src/todo_file"}
 girt-view = {version = "2.3.0", path = "../../src/view"}
 
 [dev-dependencies]
-claim = { git = "https://github.com/Turbo87/rust-claim.git", rev = "23892a3" }
+claims = "0.7.1"
 pretty_assertions = "1.4.0"
 rstest = "0.18.1"
 serial_test = "2.0.0"
diff --git a/src/core/src/application.rs b/src/core/src/application.rs
@@ -184,7 +184,7 @@ where ModuleProvider: module::ModuleProvider + Send + 'static
 mod tests {
 	use std::ffi::OsString;
 
-	use claim::assert_ok;
+	use claims::assert_ok;
 	use display::{testutil::CrossTerm, Size};
 	use input::{KeyCode, KeyEvent, KeyModifiers};
 	use runtime::{Installer, RuntimeError};
diff --git a/src/core/src/components/search_bar/tests.rs b/src/core/src/components/search_bar/tests.rs
@@ -1,4 +1,4 @@
-use claim::{assert_none, assert_some_eq};
+use claims::{assert_none, assert_some_eq};
 use view::{assert_rendered_output, ViewData};
 
 use super::*;
diff --git a/src/core/src/modules/list/tests/toggle_option.rs b/src/core/src/modules/list/tests/toggle_option.rs
@@ -1,4 +1,4 @@
-use claim::{assert_none, assert_some, assert_some_eq};
+use claims::{assert_none, assert_some, assert_some_eq};
 
 use super::*;
 use crate::testutil::module_test;
diff --git a/src/git/Cargo.toml b/src/git/Cargo.toml
@@ -27,7 +27,7 @@ default-features = false
 features = []
 
 [dev-dependencies]
-claim = { git = "https://github.com/Turbo87/rust-claim.git", rev = "23892a3" }
+claims = "0.7.1"
 pretty_assertions = "1.4.0"
 rstest = "0.18.1"
 serial_test = "2.0.0"
diff --git a/src/git/src/commit.rs b/src/git/src/commit.rs
@@ -125,7 +125,7 @@ impl From<&git2::Commit<'_>> for Commit {
 
 #[cfg(test)]
 mod tests {
-	use claim::{assert_none, assert_some_eq};
+	use claims::{assert_none, assert_some_eq};
 	use testutils::assert_err_eq;
 
 	use super::*;
diff --git a/src/git/src/commit_diff.rs b/src/git/src/commit_diff.rs
@@ -57,7 +57,7 @@ impl CommitDiff {
 
 #[cfg(test)]
 mod tests {
-	use claim::assert_some_eq;
+	use claims::assert_some_eq;
 
 	use crate::{
 		delta::Delta,
diff --git a/src/git/src/delta.rs b/src/git/src/delta.rs
@@ -94,7 +94,7 @@ impl Delta {
 
 #[cfg(test)]
 mod tests {
-	use claim::assert_err;
+	use claims::assert_err;
 
 	use super::{super::origin::Origin, *};
 
diff --git a/src/git/src/diff_line.rs b/src/git/src/diff_line.rs
@@ -86,7 +86,7 @@ impl DiffLine {
 
 #[cfg(test)]
 mod tests {
-	use claim::assert_some_eq;
+	use claims::assert_some_eq;
 	use parking_lot::Mutex;
 
 	use super::*;
diff --git a/src/git/src/repository.rs b/src/git/src/repository.rs
@@ -190,7 +190,7 @@ impl std::fmt::Debug for Repository {
 mod tests {
 	use std::env::set_var;
 
-	use claim::assert_ok;
+	use claims::assert_ok;
 	use git2::{ErrorClass, ErrorCode};
 	use testutils::assert_err_eq;
 
diff --git a/src/git/src/user.rs b/src/git/src/user.rs
@@ -71,7 +71,7 @@ impl ToString for User {
 
 #[cfg(test)]
 mod tests {
-	use claim::assert_some_eq;
+	use claims::assert_some_eq;
 	use rstest::rstest;
 
 	use super::*;
diff --git a/src/runtime/Cargo.toml b/src/runtime/Cargo.toml
@@ -20,7 +20,7 @@ crossbeam-channel = "0.5.8"
 parking_lot = "0.12.1"
 
 [dev-dependencies]
-claim = { git = "https://github.com/Turbo87/rust-claim.git", rev = "23892a3" }
+claims = "0.7.1"
 girt-testutils = {version = "2.3.0", path = "../testutils"}
 
 [build-dependencies]
diff --git a/src/runtime/src/notifier.rs b/src/runtime/src/notifier.rs
@@ -83,7 +83,7 @@ impl Notifier {
 
 #[cfg(test)]
 mod tests {
-	use claim::assert_ok_eq;
+	use claims::assert_ok_eq;
 	use crossbeam_channel::unbounded;
 
 	use super::*;
diff --git a/src/runtime/src/runtime/mod.rs b/src/runtime/src/runtime/mod.rs
@@ -140,7 +140,7 @@ mod tests {
 		time::Duration,
 	};
 
-	use claim::assert_err;
+	use claims::assert_err;
 
 	use super::*;
 
diff --git a/src/runtime/src/thread_statuses.rs b/src/runtime/src/thread_statuses.rs
@@ -81,7 +81,7 @@ impl ThreadStatuses {
 mod tests {
 	use std::{ops::Mul, thread};
 
-	use claim::{assert_err, assert_ok, assert_some_eq};
+	use claims::{assert_err, assert_ok, assert_some_eq};
 	use testutils::assert_err_eq;
 
 	use super::*;
diff --git a/src/todo_file/Cargo.toml b/src/todo_file/Cargo.toml
@@ -20,7 +20,7 @@ thiserror = "1.0.43"
 version-track = "0.1.0"
 
 [dev-dependencies]
-claim = { git = "https://github.com/Turbo87/rust-claim.git", rev = "23892a3" }
+claims = "0.7.1"
 pretty_assertions = "1.4.0"
 rstest = "0.18.1"
 tempfile = "3.6.0"
diff --git a/src/todo_file/src/action.rs b/src/todo_file/src/action.rs
@@ -114,7 +114,7 @@ impl TryFrom<&str> for Action {
 
 #[cfg(test)]
 mod tests {
-	use claim::assert_ok_eq;
+	use claims::assert_ok_eq;
 	use rstest::rstest;
 	use testutils::assert_err_eq;
 
diff --git a/src/todo_file/src/edit_content.rs b/src/todo_file/src/edit_content.rs
@@ -68,7 +68,7 @@ impl EditContext {
 
 #[cfg(test)]
 mod tests {
-	use claim::{assert_none, assert_some_eq};
+	use claims::{assert_none, assert_some_eq};
 
 	use super::*;
 
diff --git a/src/todo_file/src/history/tests.rs b/src/todo_file/src/history/tests.rs
@@ -1,4 +1,4 @@
-use claim::assert_some_eq;
+use claims::assert_some_eq;
 use testutils::assert_empty;
 
 use super::*;
diff --git a/src/todo_file/src/lib.rs b/src/todo_file/src/lib.rs
@@ -474,7 +474,7 @@ impl TodoFile {
 
 #[cfg(test)]
 mod tests {
-	use claim::{assert_none, assert_some_eq};
+	use claims::{assert_none, assert_some_eq};
 	use tempfile::{Builder, NamedTempFile};
 	use testutils::{assert_empty, assert_not_empty};
 
diff --git a/src/todo_file/src/line.rs b/src/todo_file/src/line.rs
@@ -280,7 +280,7 @@ impl Line {
 
 #[cfg(test)]
 mod tests {
-	use claim::assert_ok_eq;
+	use claims::assert_ok_eq;
 	use rstest::rstest;
 	use testutils::assert_err_eq;
 
diff --git a/src/todo_file/src/search.rs b/src/todo_file/src/search.rs
@@ -166,7 +166,7 @@ impl Search {
 
 #[cfg(test)]
 mod tests {
-	use claim::{assert_none, assert_some_eq};
+	use claims::{assert_none, assert_some_eq};
 
 	use super::*;
 	use crate::testutil::with_todo_file;
diff --git a/src/view/Cargo.toml b/src/view/Cargo.toml
@@ -34,7 +34,7 @@ version = "1.4.1"
 features = ["v4", "fast-rng"]
 
 [dev-dependencies]
-claim = { git = "https://github.com/Turbo87/rust-claim.git", rev = "23892a3" }
+claims = "0.7.1"
 girt-config = {version = "2.3.0", path = "../config"}
 
 [build-dependencies]
diff --git a/src/view/src/thread/mod.rs b/src/view/src/thread/mod.rs
@@ -162,7 +162,7 @@ impl<ViewTui: Tui + Send + 'static> Thread<ViewTui> {
 mod tests {
 	use std::borrow::BorrowMut;
 
-	use claim::assert_ok;
+	use claims::assert_ok;
 	use config::Theme;
 	use display::{
 		testutil::{create_unexpected_error, CrossTerm, MockableTui},
