Refine tests

Author: daxpedda

tests/skip/field_trait.rs

@@ -5,7 +5,7 @@ use derive_where::derive_where;
 
 use crate::util::{
 	self, AssertClone, AssertDebug, AssertHash, AssertOrd, AssertPartialEq, AssertPartialOrd,
-	Wrapper,
+	NonTrait, Wrapper,
 };
 
 #[test]
@@ -23,13 +23,13 @@ fn debug() {
 #[test]
 fn clone() {
 	#[derive_where(Clone)]
-	struct Test<T>(#[derive_where(skip(Clone))] Wrapper<T>);
+	struct Test<T>(#[derive_where(skip(Clone))] NonTrait<T>);
 
 	let test_1 = Test(42.into());
 
 	let _ = AssertClone(&test_1);
 
-	assert_eq!(test_1.clone().0, 0)
+	assert_eq!(test_1.clone().0.data(), 0)
 }
 
 #[test]

tests/skip/struct_trait.rs

@@ -5,7 +5,7 @@ use derive_where::derive_where;
 
 use crate::util::{
 	self, AssertClone, AssertDebug, AssertHash, AssertOrd, AssertPartialEq, AssertPartialOrd,
-	Wrapper,
+	NonTrait, Wrapper,
 };
 
 #[test]
@@ -25,13 +25,13 @@ fn debug() {
 fn clone() {
 	#[derive_where(Clone)]
 	#[derive_where(skip_inner(Clone))]
-	struct Test<T>(Wrapper<T>);
+	struct Test<T>(NonTrait<T>);
 
 	let test_1 = Test(42.into());
 
 	let _ = AssertClone(&test_1);
 
-	assert_eq!(test_1.clone().0, 0);
+	assert_eq!(test_1.clone().0.data(), 0);
 }
 
 #[test]
@@ -81,9 +81,9 @@ fn ord() {
 
 #[test]
 fn all() {
-	#[derive_where(Debug, Eq, Hash, Ord, PartialEq, PartialOrd, Clone)]
-	#[derive_where(skip_inner(Debug, EqHashOrd, Clone))]
-	struct Test<T>(Wrapper<T>);
+	#[derive_where(Clone, Debug, Eq, Hash, Ord, PartialEq, PartialOrd)]
+	#[derive_where(skip_inner(Clone, Debug, EqHashOrd))]
+	struct Test<T>(NonTrait<T>);
 
 	let test_1 = Test(42.into());
 	let test_2 = Test(42.into());
@@ -97,9 +97,9 @@ fn all() {
 	let _ = AssertPartialEq(&test_1);
 	let _ = AssertPartialOrd(&test_1);
 
-	assert_eq!(format!("{:?}", test_1), "Test");
+	assert_eq!(test_1.clone().0.data(), 0);
 
-	assert_eq!(test_1.clone().0, 0);
+	assert_eq!(format!("{:?}", test_1), "Test");
 
 	util::hash_eq(&test_1, &test_2);
 	util::hash_eq(&test_1, &test_ge);

tests/skip/variant_trait.rs

@@ -6,7 +6,7 @@ use pretty_assertions::assert_eq;
 
 use crate::util::{
 	self, AssertClone, AssertDebug, AssertHash, AssertOrd, AssertPartialEq, AssertPartialOrd,
-	Wrapper,
+	NonTrait, Wrapper,
 };
 
 #[test]
@@ -29,15 +29,15 @@ fn clone() {
 	#[derive_where(Clone)]
 	enum Test<T> {
 		#[derive_where(skip_inner(Clone))]
-		A(Wrapper<T>),
+		A(NonTrait<T>),
 	}
 
 	let test_1 = Test::A(42.into());
 
 	let _ = AssertClone(&test_1);
 
 	let Test::A(cloned) = test_1.clone();
-	assert_eq!(cloned, 0);
+	assert_eq!(cloned.data(), 0);
 }
 
 #[test]

tests/ui/skip.rs

@@ -48,4 +48,10 @@ struct MissingDeriveTrait<T>(#[derive_where(skip(Debug))] PhantomData<T>);
 #[derive_where(Clone, Copy)]
 struct SkipCloneWhileCopy<T>(#[derive_where(skip(Clone))] PhantomData<T>);
 
+struct NonDefault<T>(PhantomData<T>);
+
+#[derive_where(Clone)]
+#[derive_where(skip_inner(Clone))]
+struct SkipCloneNonDefault<T>(NonDefault<T>);
+
 fn main() {}

tests/ui/skip.stderr

@@ -57,3 +57,16 @@ error: Cannot skip `Clone` while deriving `Copy`
    |
 49 | struct SkipCloneWhileCopy<T>(#[derive_where(skip(Clone))] PhantomData<T>);
    |                                                  ^^^^^
+
+error[E0277]: the trait bound `NonDefault<T>: Default` is not satisfied
+  --> tests/ui/skip.rs:53:1
+   |
+53 | #[derive_where(Clone)]
+   | ^^^^^^^^^^^^^^^^^^^^^^ the trait `Default` is not implemented for `NonDefault<T>`
+   |
+   = note: this error originates in the derive macro `::derive_where::DeriveWhere` (in Nightly builds, run with -Z macro-backtrace for more info)
+help: consider annotating `NonDefault<T>` with `#[derive(Default)]`
+   |
+51 + #[derive(Default)]
+52 | struct NonDefault<T>(PhantomData<T>);
+   |

tests/util/mod.rs

@@ -121,6 +121,37 @@ pub struct AssertZeroize<'a, T: Zeroize>(pub &'a T);
 #[allow(dead_code)]
 pub struct AssertZeroizeOnDrop<'a, T: ZeroizeOnDrop>(pub &'a T);
 
+#[allow(dead_code)]
+pub struct NonTrait<T = ()> {
+	data: i32,
+	hack: PhantomData<T>,
+}
+
+#[allow(dead_code)]
+impl<T> NonTrait<T> {
+	pub fn data(&self) -> i32 {
+		self.data
+	}
+}
+
+impl<T> Default for NonTrait<T> {
+	fn default() -> Self {
+		Self {
+			data: i32::default(),
+			hack: PhantomData,
+		}
+	}
+}
+
+impl From<i32> for NonTrait<()> {
+	fn from(data: i32) -> Self {
+		Self {
+			data,
+			hack: PhantomData,
+		}
+	}
+}
+
 #[allow(dead_code)]
 pub fn hash_eq<T: Hash>(test_1: T, test_2: T) {
 	let mut hasher = DefaultHasher::new();