diff --git a/src/sharry/ids.rs b/src/sharry/ids.rs index 3705dcd..36ed596 100644 --- a/src/sharry/ids.rs +++ b/src/sharry/ids.rs @@ -117,24 +117,22 @@ mod tests { for input in inputs { { // check AliasID - let _ = AliasID(input.to_string()); // direct creation let aid = AliasID::from(input.to_string()); - check_trait(&input, &aid.0, "From", "AliasID"); - check_trait(&input, &aid.as_ref(), "AsRef", "AliasID"); + check_trait(&aid.0, input, "From", "AliasID"); + check_trait(aid.as_ref(), input, "AsRef", "AliasID"); } { // check ShareID - let _ = ShareID(input.to_string()); // direct creation let sid = ShareID::from(input.to_string()); - check_trait(&input, &sid.0, "From", "ShareID"); - check_trait(&input, &sid.to_string(), "Display", "ShareID"); + check_trait(&sid.0, input, "From", "ShareID"); + check_trait(sid.to_string(), input, "Display", "ShareID"); } { // check FileID - let fid = FileID(input.to_string()); // direct creation - check_trait(&input, &fid.to_string(), "Display", "FileID"); + let fid = FileID(input.to_string()); + check_trait(fid.to_string(), input, "Display", "FileID"); } } } diff --git a/src/sharry/uri.rs b/src/sharry/uri.rs index 84564f1..7745264 100644 --- a/src/sharry/uri.rs +++ b/src/sharry/uri.rs @@ -115,8 +115,8 @@ mod tests { for uri_data in cases { let uri = Uri(uri_data.to_string()); - check_trait(&uri_data, &uri.to_string(), "Display", "Uri"); - check_trait(&uri_data.as_bytes(), &uri.as_ref(), "AsRef<[u8]>", "Uri"); + check_trait(uri.to_string(), uri_data, "Display", "Uri"); + check_trait(uri.as_ref(), uri_data.as_bytes(), "AsRef<[u8]>", "Uri"); } } @@ -137,7 +137,7 @@ mod tests { for (good, expected) in cases { let uri = Uri::from(good.to_string()); - check_trait(&expected, &uri.0, "From", "Uri"); + check_trait(uri.0, expected, "From", "Uri"); } } @@ -159,7 +159,7 @@ mod tests { for bad in cases { let uri = Uri::from(bad.to_string()); - check_trait(&bad, &uri.0, "From", "Uri"); + check_trait(uri.0, bad, "From", "Uri"); } } diff --git a/src/test_util/mod.rs b/src/test_util/mod.rs index fbca94c..8cba747 100644 --- a/src/test_util/mod.rs +++ b/src/test_util/mod.rs @@ -6,14 +6,15 @@ use std::{fmt, io::Write}; use tempfile::NamedTempFile; -pub fn check_trait(expected: &E, actual: &A, tr: &'static str, ty: &'static str) +pub fn check_trait(actual: A, expected: E, tr: &str, ty: &str) where - E: fmt::Debug + PartialEq, - A: fmt::Debug, + A: fmt::Debug + PartialEq, + E: fmt::Debug, { assert_eq!( + actual, expected, + "`impl {tr} for {ty}` expected: {:?}, actual: {:?}", expected, actual, - "`impl {tr} for {ty}` expected: {expected:?}, actual: {actual:?}", ); }