From bcef6bf392e62522db7c1d39acff255d1e6c9862 Mon Sep 17 00:00:00 2001 From: "Dustin J. Mitchell" Date: Fri, 1 Oct 2021 22:18:24 -0400 Subject: [PATCH] remove redundant {..} --- sync-server/src/api/add_version.rs | 2 +- sync-server/src/api/get_child_version.rs | 2 +- sync-server/src/bin/taskchampion-sync-server.rs | 2 +- sync-server/src/server.rs | 2 +- sync-server/src/storage/sqlite.rs | 2 +- taskchampion/src/replica.rs | 2 +- taskchampion/src/server/local.rs | 2 +- taskchampion/src/server/remote/crypto.rs | 2 +- taskchampion/src/storage/inmemory.rs | 2 +- taskchampion/src/storage/operation.rs | 2 +- taskchampion/src/storage/sqlite.rs | 2 +- taskchampion/src/task/priority.rs | 2 +- taskchampion/src/task/status.rs | 2 +- taskchampion/src/task/tag.rs | 2 +- taskchampion/src/task/task.rs | 2 +- taskchampion/src/taskdb.rs | 2 +- taskchampion/src/utils.rs | 2 +- taskchampion/src/workingset.rs | 2 +- 18 files changed, 18 insertions(+), 18 deletions(-) diff --git a/sync-server/src/api/add_version.rs b/sync-server/src/api/add_version.rs index ce9ba1104..c6d7314d0 100644 --- a/sync-server/src/api/add_version.rs +++ b/sync-server/src/api/add_version.rs @@ -80,7 +80,7 @@ mod test { use crate::storage::{InMemoryStorage, Storage}; use crate::Server; use actix_web::{http::StatusCode, test, App}; - use pretty_assertions::{assert_eq}; + use pretty_assertions::assert_eq; use uuid::Uuid; #[actix_rt::test] diff --git a/sync-server/src/api/get_child_version.rs b/sync-server/src/api/get_child_version.rs index 2b0517145..917c65126 100644 --- a/sync-server/src/api/get_child_version.rs +++ b/sync-server/src/api/get_child_version.rs @@ -47,7 +47,7 @@ mod test { use crate::storage::{InMemoryStorage, Storage}; use crate::Server; use actix_web::{http::StatusCode, test, App}; - use pretty_assertions::{assert_eq}; + use pretty_assertions::assert_eq; use uuid::Uuid; #[actix_rt::test] diff --git a/sync-server/src/bin/taskchampion-sync-server.rs b/sync-server/src/bin/taskchampion-sync-server.rs index aa03cbaf8..ef6f5a977 100644 --- a/sync-server/src/bin/taskchampion-sync-server.rs +++ b/sync-server/src/bin/taskchampion-sync-server.rs @@ -65,7 +65,7 @@ async fn main() -> anyhow::Result<()> { mod test { use super::*; use actix_web::{test, App}; - use pretty_assertions::{assert_eq}; + use pretty_assertions::assert_eq; use taskchampion_sync_server::storage::InMemoryStorage; #[actix_rt::test] diff --git a/sync-server/src/server.rs b/sync-server/src/server.rs index 7711c77c0..9bc007cc4 100644 --- a/sync-server/src/server.rs +++ b/sync-server/src/server.rs @@ -81,7 +81,7 @@ pub(crate) fn add_version<'a>( mod test { use super::*; use crate::storage::{InMemoryStorage, Storage}; - use pretty_assertions::{assert_eq}; + use pretty_assertions::assert_eq; #[test] fn gcv_not_found() -> anyhow::Result<()> { diff --git a/sync-server/src/storage/sqlite.rs b/sync-server/src/storage/sqlite.rs index fc4c2dc0f..0d4f694b1 100644 --- a/sync-server/src/storage/sqlite.rs +++ b/sync-server/src/storage/sqlite.rs @@ -203,7 +203,7 @@ impl StorageTxn for Txn { #[cfg(test)] mod test { use super::*; - use pretty_assertions::{assert_eq}; + use pretty_assertions::assert_eq; use tempfile::TempDir; #[test] diff --git a/taskchampion/src/replica.rs b/taskchampion/src/replica.rs index 75b5137e4..063e0c470 100644 --- a/taskchampion/src/replica.rs +++ b/taskchampion/src/replica.rs @@ -146,7 +146,7 @@ impl Replica { mod tests { use super::*; use crate::task::Status; - use pretty_assertions::{assert_eq}; + use pretty_assertions::assert_eq; use uuid::Uuid; #[test] diff --git a/taskchampion/src/server/local.rs b/taskchampion/src/server/local.rs index a9441ac2e..966b93bd6 100644 --- a/taskchampion/src/server/local.rs +++ b/taskchampion/src/server/local.rs @@ -159,7 +159,7 @@ impl Server for LocalServer { #[cfg(test)] mod test { use super::*; - use pretty_assertions::{assert_eq}; + use pretty_assertions::assert_eq; use tempfile::TempDir; #[test] diff --git a/taskchampion/src/server/remote/crypto.rs b/taskchampion/src/server/remote/crypto.rs index 612a0eb28..512846479 100644 --- a/taskchampion/src/server/remote/crypto.rs +++ b/taskchampion/src/server/remote/crypto.rs @@ -78,7 +78,7 @@ impl AsRef<[u8]> for HistoryCiphertext { #[cfg(test)] mod test { use super::*; - use pretty_assertions::{assert_eq}; + use pretty_assertions::assert_eq; #[test] fn round_trip() { diff --git a/taskchampion/src/storage/inmemory.rs b/taskchampion/src/storage/inmemory.rs index 7aa081e57..448d9ae7f 100644 --- a/taskchampion/src/storage/inmemory.rs +++ b/taskchampion/src/storage/inmemory.rs @@ -166,7 +166,7 @@ impl Storage for InMemoryStorage { #[cfg(test)] mod test { use super::*; - use pretty_assertions::{assert_eq}; + use pretty_assertions::assert_eq; // (note: this module is heavily used in tests so most of its functionality is well-tested // elsewhere and not tested here) diff --git a/taskchampion/src/storage/operation.rs b/taskchampion/src/storage/operation.rs index 7bcf875eb..68f5fe7d0 100644 --- a/taskchampion/src/storage/operation.rs +++ b/taskchampion/src/storage/operation.rs @@ -128,7 +128,7 @@ mod test { use crate::storage::InMemoryStorage; use crate::taskdb::TaskDb; use chrono::{Duration, Utc}; - use pretty_assertions::{assert_eq}; + use pretty_assertions::assert_eq; use proptest::prelude::*; // note that `tests/operation_transform_invariant.rs` tests the transform function quite diff --git a/taskchampion/src/storage/sqlite.rs b/taskchampion/src/storage/sqlite.rs index 759826e4a..86525d0ca 100644 --- a/taskchampion/src/storage/sqlite.rs +++ b/taskchampion/src/storage/sqlite.rs @@ -356,7 +356,7 @@ impl<'t> StorageTxn for Txn<'t> { mod test { use super::*; use crate::storage::taskmap_with; - use pretty_assertions::{assert_eq}; + use pretty_assertions::assert_eq; use tempfile::TempDir; #[test] diff --git a/taskchampion/src/task/priority.rs b/taskchampion/src/task/priority.rs index a8ecc98bd..cbe786524 100644 --- a/taskchampion/src/task/priority.rs +++ b/taskchampion/src/task/priority.rs @@ -35,7 +35,7 @@ impl Priority { #[cfg(test)] mod test { use super::*; - use pretty_assertions::{assert_eq}; + use pretty_assertions::assert_eq; #[test] fn test_priority() { diff --git a/taskchampion/src/task/status.rs b/taskchampion/src/task/status.rs index 7a14193a7..fbc4ed866 100644 --- a/taskchampion/src/task/status.rs +++ b/taskchampion/src/task/status.rs @@ -41,7 +41,7 @@ impl Status { #[cfg(test)] mod test { use super::*; - use pretty_assertions::{assert_eq}; + use pretty_assertions::assert_eq; #[test] fn test_status() { diff --git a/taskchampion/src/task/tag.rs b/taskchampion/src/task/tag.rs index 123cf3bd7..def539a67 100644 --- a/taskchampion/src/task/tag.rs +++ b/taskchampion/src/task/tag.rs @@ -138,7 +138,7 @@ pub(super) enum SyntheticTag { #[cfg(test)] mod test { use super::*; - use pretty_assertions::{assert_eq}; + use pretty_assertions::assert_eq; use rstest::rstest; use std::convert::TryInto; diff --git a/taskchampion/src/task/task.rs b/taskchampion/src/task/task.rs index bb1002ccd..1da4a3244 100644 --- a/taskchampion/src/task/task.rs +++ b/taskchampion/src/task/task.rs @@ -300,7 +300,7 @@ impl<'r> std::ops::Deref for TaskMut<'r> { #[cfg(test)] mod test { use super::*; - use pretty_assertions::{assert_eq}; + use pretty_assertions::assert_eq; fn with_mut_task(f: F) { let mut replica = Replica::new_inmemory(); diff --git a/taskchampion/src/taskdb.rs b/taskchampion/src/taskdb.rs index 7b512b976..d611433f9 100644 --- a/taskchampion/src/taskdb.rs +++ b/taskchampion/src/taskdb.rs @@ -359,7 +359,7 @@ mod tests { use crate::server::test::TestServer; use crate::storage::InMemoryStorage; use chrono::Utc; - use pretty_assertions::{assert_eq}; + use pretty_assertions::assert_eq; use proptest::prelude::*; use std::collections::HashMap; use uuid::Uuid; diff --git a/taskchampion/src/utils.rs b/taskchampion/src/utils.rs index 7e8dd3867..7eb0885dc 100644 --- a/taskchampion/src/utils.rs +++ b/taskchampion/src/utils.rs @@ -41,7 +41,7 @@ impl AsRef<[u8]> for Key { #[cfg(test)] mod test { use super::*; - use pretty_assertions::{assert_eq}; + use pretty_assertions::assert_eq; #[test] fn test_from_bytes() { diff --git a/taskchampion/src/workingset.rs b/taskchampion/src/workingset.rs index c64c577c9..ea746a72b 100644 --- a/taskchampion/src/workingset.rs +++ b/taskchampion/src/workingset.rs @@ -69,7 +69,7 @@ impl WorkingSet { #[cfg(test)] mod test { use super::*; - use pretty_assertions::{assert_eq}; + use pretty_assertions::assert_eq; fn make() -> (Uuid, Uuid, WorkingSet) { let uuid1 = Uuid::new_v4();