Code changes for migrating to attribute_macro

Author: ModProg

README.md

@@ -16,7 +16,6 @@ statements, with the only caveat that it requires to derive `DeriveWhere`
 ([#27]):
 
 ```rust
-#[derive(DeriveWhere)]
 #[derive_where(Clone, Debug)]
 struct Example<T>(PhantomData<T>);
 ```
@@ -34,7 +33,6 @@ specified. This example will restrict the implementation for `Example` to
 `T: Clone`:
 
 ```rust
-#[derive(DeriveWhere)]
 #[derive_where(Clone; T)]
 struct Example<T, U>(T, PhantomData<U>);
 ```
@@ -45,7 +43,6 @@ bind implementation for `Example` to `T: Super`:
 ```rust
 trait Super: Clone {}
 
-#[derive(DeriveWhere)]
 #[derive_where(Clone; T: Super)]
 struct Example<T>(PhantomData<T>);
 ```
@@ -65,7 +62,6 @@ impl Trait for Impl {
 	type Type = i32;
 }
 
-#[derive(DeriveWhere)]
 #[derive_where(Clone; T::Type)]
 struct Example<T: Trait>(T::Type);
 ```
@@ -75,7 +71,6 @@ specific constrain. It is also possible to use multiple separate
 constrain specifications when required:
 
 ```rust
-#[derive(DeriveWhere)]
 #[derive_where(Clone; T)]
 #[derive_where(Debug; U)]
 struct Example<T, U>(PhantomData<T>, PhantomData<U>);
@@ -87,7 +82,6 @@ Deriving [`Default`] on an enum is not possible in Rust at the moment.
 Derive-where allows this with a `default` attribute:
 
 ```rust
-#[derive(DeriveWhere)]
 #[derive_where(Default)]
 enum Example<T> {
 	#[derive_where(default)]
@@ -102,7 +96,6 @@ that allow it, which are: [`Debug`], [`Hash`], [`Ord`](https://doc.rust-lang.org
 [`PartialEq`](https://doc.rust-lang.org/core/cmp/trait.PartialEq.html), [`Zeroize`] and [`ZeroizeOnDrop`].
 
 ```rust
-#[derive(DeriveWhere)]
 #[derive_where(Debug, PartialEq; T)]
 struct Example<T>(#[derive_where(skip)] T);
 
@@ -113,14 +106,12 @@ assert_eq!(Example(42), Example(0));
 It is also possible to skip all fields in an item or variant if desired:
 
 ```rust
-#[derive(DeriveWhere)]
 #[derive_where(Debug)]
 #[derive_where(skip_inner)]
 struct StructExample<T>(T);
 
 assert_eq!(format!("{:?}", StructExample(42)), "StructExample");
 
-#[derive(DeriveWhere)]
 #[derive_where(Debug)]
 enum EnumExample<T> {
 	#[derive_where(skip_inner)]
@@ -134,7 +125,6 @@ Selective skipping of fields for certain traits is also an option, both in
 `skip` and `skip_inner`:
 
 ```rust
-#[derive(DeriveWhere)]
 #[derive_where(Debug, PartialEq)]
 #[derive_where(skip_inner(Debug))]
 struct Example<T>(i32, PhantomData<T>);
@@ -156,7 +146,6 @@ assert_ne!(
   This is to avoid ambiguity between another method also called `zeroize`.
 
 ```rust
-#[derive(DeriveWhere)]
 #[derive_where(Zeroize(crate = "zeroize_"))]
 struct Example(#[derive_where(Zeroize(fqs))] i32);
 
@@ -189,8 +178,7 @@ and can be implemented without [`Zeroize`], otherwise it only implements
 - `crate`: an item-level option which specifies a path to the `zeroize`
   crate in case of a re-export or rename.
 
-```
-#[derive(DeriveWhere)]
+```rust
 #[derive_where(ZeroizeOnDrop(crate = "zeroize_"))]
 struct Example(i32);
 

ensure-no-std/src/lib.rs

@@ -5,9 +5,8 @@ extern crate zeroize_ as zeroize;
 
 use core::marker::PhantomData;
 
-use derive_where::DeriveWhere;
+use derive_where::derive_where;
 
-#[derive(DeriveWhere)]
 #[derive_where(Clone, Copy, Debug, Default, Eq, Hash, Ord, PartialEq, PartialOrd)]
 #[cfg_attr(feature = "zeroize", derive_where(Zeroize))]
 pub struct Test<T>(PhantomData<T>);

non-msrv-tests/tests/ui/default.rs

@@ -1,25 +1,21 @@
 use std::marker::PhantomData;
 
-use derive_where::DeriveWhere;
+use derive_where::derive_where;
 
-#[derive(DeriveWhere)]
 #[derive_where(Debug)]
 struct DefaultOnStruct<T>(#[derive_where(default)] PhantomData<T>);
 
-#[derive(DeriveWhere)]
 #[derive_where(Clone)]
 enum DefaultWithoutTrait<T> {
 	#[derive_where(default)]
 	A(PhantomData<T>),
 }
 
-#[derive(DeriveWhere)]
 #[derive_where(Default)]
 enum MissingDefault<T> {
 	A(PhantomData<T>),
 }
 
-#[derive(DeriveWhere)]
 #[derive_where(Default)]
 enum DuplicateDefaultSeparate<T> {
 	#[derive_where(default)]
@@ -28,14 +24,12 @@ enum DuplicateDefaultSeparate<T> {
 	B(PhantomData<T>),
 }
 
-#[derive(DeriveWhere)]
 #[derive_where(Default)]
 enum DuplicateDefaultSame<T> {
 	#[derive_where(default, default)]
 	A(PhantomData<T>),
 }
 
-#[derive(DeriveWhere)]
 #[derive_where(Default)]
 enum DuplicateDefaultSameSeparate<T> {
 	#[derive_where(default)]

non-msrv-tests/tests/ui/item.rs

@@ -1,23 +1,18 @@
 use std::marker::PhantomData;
 
-use derive_where::DeriveWhere;
+use derive_where::derive_where;
 
-#[derive(DeriveWhere)]
 struct NoAttribute<T>(PhantomData<T>);
 
-#[derive(DeriveWhere)]
 #[derive_where]
 struct NoOption<T>(PhantomData<T>);
 
-#[derive(DeriveWhere)]
 #[derive_where()]
 struct EmptyAttribute<T>(PhantomData<T>);
 
-#[derive(DeriveWhere)]
 #[derive_where(Clone; T;)]
 struct SemiColonAtTheEnd<T, U>(T, PhantomData<U>);
 
-#[derive(DeriveWhere)]
 #[derive_where(Clone; T,,)]
 struct DoubleColonAtTheEnd<T, U>(T, PhantomData<U>);
 
@@ -33,7 +28,6 @@ struct MissingCommaBetweenTraits<T>(PhantomData<T>);
 #[derive_where(Clone; T U)]
 struct MissingCommaBetweenGenerics<T, U, V>(T, PhantomData<(U, V)>);
 
-#[derive(DeriveWhere)]
 #[derive_where("Clone")]
 struct InvalidTrait<T>(PhantomData<T>);
 

non-msrv-tests/tests/ui/item_option_syntax.rs

@@ -1,25 +1,20 @@
 use std::marker::PhantomData;
 
-use derive_where::DeriveWhere;
+use derive_where::derive_where;
 
-#[derive(DeriveWhere)]
 // Rust itself already fails to parse this and will provide a separate error message.
 #[derive_where = invalid]
 struct InvalidAttribute<T>(PhantomData<T>);
 
-#[derive(DeriveWhere)]
 #[derive_where = "invalid"]
 struct WrongAttributeSyntax<T>(PhantomData<T>);
 
-#[derive(DeriveWhere)]
 #[derive_where()]
 struct EmptyAttribute<T>(PhantomData<T>);
 
-#[derive(DeriveWhere)]
 #[derive_where(Debug = "option")]
 struct WrongOptionSyntax<T>(PhantomData<T>);
 
-#[derive(DeriveWhere)]
 #[derive_where(Debug())]
 struct EmptyOption<T>(PhantomData<T>);
 

non-msrv-tests/tests/ui/item_skip.rs

@@ -1,59 +1,49 @@
 use std::marker::PhantomData;
 
-use derive_where::DeriveWhere;
+use derive_where::derive_where;
 
-#[derive(DeriveWhere)]
 #[derive_where(Debug)]
 #[derive_where(skip_inner)]
 enum SkipInnerOnEnum<T> {
 	A(PhantomData<T>),
 }
 
-#[derive(DeriveWhere)]
 #[derive_where(Debug)]
 #[derive_where(skip_inner)]
 #[derive_where(skip_inner)]
 struct DuplicateSkipInner<T>(PhantomData<T>);
 
-#[derive(DeriveWhere)]
 #[derive_where(Debug)]
 #[derive_where(skip_inner())]
 struct EmptySkipInner<T>(PhantomData<T>);
 
-#[derive(DeriveWhere)]
 #[derive_where(Debug)]
 #[derive_where(skip_inner)]
 #[derive_where(skip_inner(Debug))]
 struct OverridingSkipInner<T>(PhantomData<T>);
 
-#[derive(DeriveWhere)]
 #[derive_where(Debug)]
 #[derive_where(skip_inner(Debug))]
 #[derive_where(skip_inner)]
 struct UnderridingSkipInner<T>(PhantomData<T>);
 
-#[derive(DeriveWhere)]
 #[derive_where(Clone; T)]
 #[derive_where(skip_inner)]
 struct NoSupportedTrait<T>(PhantomData<T>);
 
-#[derive(DeriveWhere)]
 #[derive_where(Clone; T)]
 #[derive_where(skip_inner(Clone))]
 struct UnsupportedTrait<T>(PhantomData<T>);
 
-#[derive(DeriveWhere)]
 #[derive_where(Debug)]
 #[derive_where(skip_inner(Debug, Debug))]
 struct DuplicateTraitSame<T>(PhantomData<T>);
 
-#[derive(DeriveWhere)]
 #[derive_where(Debug)]
 #[derive_where(skip_inner(Debug))]
 #[derive_where(skip_inner(Debug))]
 struct DuplicateTraitSeparate<T>(PhantomData<T>);
 
-#[derive(DeriveWhere)]
 #[derive_where(Clone; T)]
 #[derive_where(skip_inner(Debug))]
 struct MissingDeriveTrait<T>(PhantomData<T>);

non-msrv-tests/tests/ui/not-zeroize/item.rs

@@ -1,28 +1,22 @@
 use std::marker::PhantomData;
 
-use derive_where::DeriveWhere;
+use derive_where::derive_where;
 
-#[derive(DeriveWhere)]
 #[derive_where(skip_inner, Clone)]
 struct SkipInnerWithTrait<T>(PhantomData<T>);
 
-#[derive(DeriveWhere)]
 #[derive_where(Debug = invalid; T)]
 struct WrongOptionSyntax<T, U>(T, PhantomData<U>);
 
-#[derive(DeriveWhere)]
 #[derive_where(,)]
 struct OnlyComma<T>(PhantomData<T>);
 
-#[derive(DeriveWhere)]
 #[derive_where(,Clone)]
 struct StartWithComma<T>(PhantomData<T>);
 
-#[derive(DeriveWhere)]
 #[derive_where(Clone,,)]
 struct DuplicateCommaAtEnd<T>(PhantomData<T>);
 
-#[derive(DeriveWhere)]
 #[derive_where(T)]
 struct GenericInsteadTrait<T, U>(T, PhantomData<U>);
 

non-msrv-tests/tests/ui/option.rs

@@ -1,34 +1,29 @@
 use std::marker::PhantomData;
 
-use derive_where::DeriveWhere;
+use derive_where::derive_where;
 
-#[derive(DeriveWhere)]
 #[derive_where(Default)]
 struct StructNoOption<T>(#[derive_where] PhantomData<T>);
 
 #[derive(derive_where::DeriveWhere)]
 #[derive_where(Default)]
 struct StructWrongSyntax<T>(#[derive_where = "default"] PhantomData<T>);
 
-#[derive(DeriveWhere)]
 #[derive_where(Default)]
 enum EnumNoOption<T> {
 	#[derive_where]
 	A(PhantomData<T>),
 }
 
-#[derive(DeriveWhere)]
 #[derive_where(Default)]
 enum EnumWrongSyntax<T> {
 	#[derive_where = "default"]
 	A(PhantomData<T>),
 }
 
-#[derive(DeriveWhere)]
 #[derive_where(Clone)]
 struct StructInvalidOption<T>(#[derive_where(option)] PhantomData<T>);
 
-#[derive(DeriveWhere)]
 #[derive_where(Clone)]
 enum EnumInvalidOption<T> {
 	#[derive_where(option)]

non-msrv-tests/tests/ui/skip.rs

@@ -1,60 +1,50 @@
 use std::marker::PhantomData;
 
-use derive_where::DeriveWhere;
+use derive_where::derive_where;
 
-#[derive(DeriveWhere)]
 #[derive_where(Debug)]
 struct DuplicateSkipSame<T>(#[derive_where(skip, skip)] PhantomData<T>);
 
-#[derive(DeriveWhere)]
 #[derive_where(Debug)]
 struct DuplicateSkipSeparate<T>(
 	#[derive_where(skip)]
 	#[derive_where(skip)]
 	PhantomData<T>,
 );
 
-#[derive(DeriveWhere)]
 #[derive_where(Debug)]
 struct EmptySkip<T>(#[derive_where(skip())] PhantomData<T>);
 
-#[derive(DeriveWhere)]
 #[derive_where(Debug)]
 struct OverridingSkip<T>(
 	#[derive_where(skip)]
 	#[derive_where(skip(Debug))]
 	PhantomData<T>,
 );
 
-#[derive(DeriveWhere)]
 #[derive_where(Debug)]
 struct UnderridingSkip<T>(
 	#[derive_where(skip(Debug))]
 	#[derive_where(skip)]
 	PhantomData<T>,
 );
 
-#[derive(DeriveWhere)]
 #[derive_where(Clone; T)]
 struct NoSupportedTrait<T>(#[derive_where(skip)] PhantomData<T>);
 
-#[derive(DeriveWhere)]
 #[derive_where(Clone; T)]
 struct UnsupportedTrait<T>(#[derive_where(skip(Clone))] PhantomData<T>);
 
-#[derive(DeriveWhere)]
 #[derive_where(Debug)]
 struct DuplicateTraitSame<T>(#[derive_where(skip(Debug, Debug))] PhantomData<T>);
 
-#[derive(DeriveWhere)]
 #[derive_where(Debug)]
 struct DuplicateTraitSeparate<T>(
 	#[derive_where(skip(Debug))]
 	#[derive_where(skip(Debug))]
 	PhantomData<T>,
 );
 
-#[derive(DeriveWhere)]
 #[derive_where(Clone; T)]
 struct MissingDeriveTrait<T>(#[derive_where(skip(Debug))] PhantomData<T>);