Fixing tests

Author: ModProg

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

@@ -1,5 +1,3 @@
-use std::marker::PhantomData;
-
 use derive_where::derive_where;
 
 #[derive_where(Debug)]

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

@@ -1,38 +1,37 @@
 error: unknown option
- --> tests/ui/default.rs:7:42
+ --> tests/ui/default.rs:4:42
   |
-7 | struct DefaultOnStruct<T>(#[derive_where(default)] PhantomData<T>);
+4 | struct DefaultOnStruct<T>(#[derive_where(default)] PhantomData<T>);
   |                                          ^^^^^^^
 
 error: `default` is only supported if `Default` is being implemented
-  --> tests/ui/default.rs:12:17
-   |
-12 |     #[derive_where(default)]
-   |                    ^^^^^^^
+ --> tests/ui/default.rs:8:17
+  |
+8 |     #[derive_where(default)]
+  |                    ^^^^^^^
 
 error: required `default` option on a variant if `Default` is being implemented
-  --> tests/ui/default.rs:17:1
+  --> tests/ui/default.rs:12:1
+   |
+12 | #[derive_where(Default)]
+   | ^^^^^^^^^^^^^^^^^^^^^^^^
    |
-17 | / #[derive_where(Default)]
-18 | | enum MissingDefault<T> {
-19 | |     A(PhantomData<T>),
-20 | | }
-   | |_^
+   = note: this error originates in the attribute macro `derive_where` (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: multiple `default` options in enum
-  --> tests/ui/default.rs:27:17
+  --> tests/ui/default.rs:21:17
    |
-27 |     #[derive_where(default)]
+21 |     #[derive_where(default)]
    |                    ^^^^^^^
 
 error: duplicate `default` option
-  --> tests/ui/default.rs:34:26
+  --> tests/ui/default.rs:27:26
    |
-34 |     #[derive_where(default, default)]
+27 |     #[derive_where(default, default)]
    |                             ^^^^^^^
 
 error: duplicate `default` option
-  --> tests/ui/default.rs:42:17
+  --> tests/ui/default.rs:34:17
    |
-42 |     #[derive_where(default)]
+34 |     #[derive_where(default)]
    |                    ^^^^^^^

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

@@ -16,15 +16,12 @@ struct SemiColonAtTheEnd<T, U>(T, PhantomData<U>);
 #[derive_where(Clone; T,,)]
 struct DoubleColonAtTheEnd<T, U>(T, PhantomData<U>);
 
-#[derive(derive_where::DeriveWhere)]
 #[derive_where(Clone; where)]
 struct InvalidGeneric<T>(PhantomData<T>);
 
-#[derive(derive_where::DeriveWhere)]
 #[derive_where(Clone Debug)]
 struct MissingCommaBetweenTraits<T>(PhantomData<T>);
 
-#[derive(derive_where::DeriveWhere)]
 #[derive_where(Clone; T U)]
 struct MissingCommaBetweenGenerics<T, U, V>(T, PhantomData<(U, V)>);
 

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

@@ -1,53 +1,51 @@
-error: no traits found to implement, use `#[derive_where(..)` to specify some
- --> tests/ui/item.rs:6:1
+error: empty `derive_where` found
+ --> tests/ui/item.rs:7:1
   |
-6 | struct NoAttribute<T>(PhantomData<T>);
-  | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-error: unexpected option syntax
- --> tests/ui/item.rs:9:3
+7 | #[derive_where]
+  | ^^^^^^^^^^^^^^^
   |
-9 | #[derive_where]
-  |   ^^^^^^^^^^^^
+  = note: this error originates in the attribute macro `derive_where` (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: empty `derive_where` found
-  --> tests/ui/item.rs:13:3
+  --> tests/ui/item.rs:10:1
+   |
+10 | #[derive_where()]
+   | ^^^^^^^^^^^^^^^^^
    |
-13 | #[derive_where()]
-   |   ^^^^^^^^^^^^^^
+   = note: this error originates in the attribute macro `derive_where` (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: expected `,`
-  --> tests/ui/item.rs:17:24
+  --> tests/ui/item.rs:13:24
    |
-17 | #[derive_where(Clone; T;)]
+13 | #[derive_where(Clone; T;)]
    |                        ^
 
 error: expected type to bind to, expected one of: `for`, parentheses, `fn`, `unsafe`, `extern`, identifier, `::`, `<`, square brackets, `*`, `&`, `!`, `impl`, `_`, lifetime
-  --> tests/ui/item.rs:21:25
+  --> tests/ui/item.rs:16:25
    |
-21 | #[derive_where(Clone; T,,)]
+16 | #[derive_where(Clone; T,,)]
    |                         ^
 
 error: expected type to bind to, expected one of: `for`, parentheses, `fn`, `unsafe`, `extern`, identifier, `::`, `<`, square brackets, `*`, `&`, `!`, `impl`, `_`, lifetime
-  --> tests/ui/item.rs:25:23
+  --> tests/ui/item.rs:19:23
    |
-25 | #[derive_where(Clone; where)]
+19 | #[derive_where(Clone; where)]
    |                       ^^^^^
 
 error: expected `;` or `,
-  --> tests/ui/item.rs:29:22
+  --> tests/ui/item.rs:22:22
    |
-29 | #[derive_where(Clone Debug)]
+22 | #[derive_where(Clone Debug)]
    |                      ^^^^^
 
 error: expected `,`
-  --> tests/ui/item.rs:33:25
+  --> tests/ui/item.rs:25:25
    |
-33 | #[derive_where(Clone; T U)]
+25 | #[derive_where(Clone; T U)]
    |                         ^
 
 error: unexpected option syntax
-  --> tests/ui/item.rs:37:16
+  --> tests/ui/item.rs:28:16
    |
-37 | #[derive_where("Clone")]
+28 | #[derive_where("Clone")]
    |                ^^^^^^^

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

@@ -1,5 +1,3 @@
-use std::marker::PhantomData;
-
 use derive_where::derive_where;
 
 // Rust itself already fails to parse this and will provide a separate error message.
@@ -18,7 +16,6 @@ struct WrongOptionSyntax<T>(PhantomData<T>);
 #[derive_where(Debug())]
 struct EmptyOption<T>(PhantomData<T>);
 
-#[derive(derive_where::DeriveWhere)]
 #[derive_where(Debug(option))]
 struct UnsupportedOption<T>(PhantomData<T>);
 

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

@@ -1,41 +1,49 @@
-error: expected parentheses: #[derive_where(...)]
- --> tests/ui/item_option_syntax.rs:7:16
+error: key-value macro attributes are not supported
+ --> tests/ui/item_option_syntax.rs:4:1
   |
-7 | #[derive_where = invalid]
-  |                ^
+4 | #[derive_where = invalid]
+  | ^^^^^^^^^^^^^^^^^^^^^^^^^
+
+error: unsupported trait, expected one of expected one of Clone, Copy, Debug, Default, Eq, Hash, Ord, PartialEq, PartialOrd, Zeroize, ZeroizeOnDrop
+ --> tests/ui/item_option_syntax.rs:4:18
+  |
+4 | #[derive_where = invalid]
+  |                  ^^^^^^^
+
+error: key-value macro attributes are not supported
+ --> tests/ui/item_option_syntax.rs:7:1
+  |
+7 | #[derive_where = "invalid"]
+  | ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 error: unexpected option syntax
-  --> tests/ui/item_option_syntax.rs:11:3
-   |
-11 | #[derive_where = "invalid"]
-   |   ^^^^^^^^^^^^^^^^^^^^^^^^
+ --> tests/ui/item_option_syntax.rs:7:18
+  |
+7 | #[derive_where = "invalid"]
+  |                  ^^^^^^^^^
 
 error: empty `derive_where` found
-  --> tests/ui/item_option_syntax.rs:15:3
+  --> tests/ui/item_option_syntax.rs:10:1
    |
-15 | #[derive_where()]
-   |   ^^^^^^^^^^^^^^
+10 | #[derive_where()]
+   | ^^^^^^^^^^^^^^^^^
+   |
+   = note: this error originates in the attribute macro `derive_where` (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: unexpected option syntax
-  --> tests/ui/item_option_syntax.rs:19:16
+  --> tests/ui/item_option_syntax.rs:13:16
    |
-19 | #[derive_where(Debug = "option")]
+13 | #[derive_where(Debug = "option")]
    |                ^^^^^^^^^^^^^^^^
 
 error: empty attribute option found
-  --> tests/ui/item_option_syntax.rs:23:16
+  --> tests/ui/item_option_syntax.rs:16:16
    |
-23 | #[derive_where(Debug())]
+16 | #[derive_where(Debug())]
    |                ^^^^^^^
 
 error: `Debug` doesn't support any options
-  --> tests/ui/item_option_syntax.rs:27:16
+  --> tests/ui/item_option_syntax.rs:19:16
    |
-27 | #[derive_where(Debug(option))]
+19 | #[derive_where(Debug(option))]
    |                ^^^^^^^^^^^^^
-
-error: unexpected token: `invalid`
- --> tests/ui/item_option_syntax.rs:7:18
-  |
-7 | #[derive_where = invalid]
-  |                  ^^^^^^^

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

@@ -1,5 +1,3 @@
-use std::marker::PhantomData;
-
 use derive_where::derive_where;
 
 #[derive_where(Debug)]

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

@@ -1,59 +1,59 @@
 error: enums don't support `skip_inner`, use it on a variant instead
- --> tests/ui/item_skip.rs:7:16
+ --> tests/ui/item_skip.rs:4:16
   |
-7 | #[derive_where(skip_inner)]
+4 | #[derive_where(skip_inner)]
   |                ^^^^^^^^^^
 
 error: duplicate `skip_inner` option
-  --> tests/ui/item_skip.rs:15:16
+  --> tests/ui/item_skip.rs:11:16
    |
-15 | #[derive_where(skip_inner)]
+11 | #[derive_where(skip_inner)]
    |                ^^^^^^^^^^
 
 error: empty attribute option found
-  --> tests/ui/item_skip.rs:20:16
+  --> tests/ui/item_skip.rs:15:16
    |
-20 | #[derive_where(skip_inner())]
+15 | #[derive_where(skip_inner())]
    |                ^^^^^^^^^^^^
 
 error: unexpected constraint on `skip` when unconstrained `skip` already used
-  --> tests/ui/item_skip.rs:26:16
+  --> tests/ui/item_skip.rs:20:16
    |
-26 | #[derive_where(skip_inner(Debug))]
+20 | #[derive_where(skip_inner(Debug))]
    |                ^^^^^^^^^^^^^^^^^
 
 error: duplicate `skip_inner` option
-  --> tests/ui/item_skip.rs:32:16
+  --> tests/ui/item_skip.rs:25:16
    |
-32 | #[derive_where(skip_inner)]
+25 | #[derive_where(skip_inner)]
    |                ^^^^^^^^^^
 
 error: no trait that can be skipped is being implemented
-  --> tests/ui/item_skip.rs:37:16
+  --> tests/ui/item_skip.rs:29:16
    |
-37 | #[derive_where(skip_inner)]
+29 | #[derive_where(skip_inner)]
    |                ^^^^^^^^^^
 
 error: unsupported `Clone` constraint on `skip`
-  --> tests/ui/item_skip.rs:42:27
+  --> tests/ui/item_skip.rs:33:27
    |
-42 | #[derive_where(skip_inner(Clone))]
+33 | #[derive_where(skip_inner(Clone))]
    |                           ^^^^^
 
 error: duplicate `Debug` constraint on `skip`
-  --> tests/ui/item_skip.rs:47:34
+  --> tests/ui/item_skip.rs:37:34
    |
-47 | #[derive_where(skip_inner(Debug, Debug))]
+37 | #[derive_where(skip_inner(Debug, Debug))]
    |                                  ^^^^^
 
 error: duplicate `Debug` constraint on `skip`
-  --> tests/ui/item_skip.rs:53:27
+  --> tests/ui/item_skip.rs:42:27
    |
-53 | #[derive_where(skip_inner(Debug))]
+42 | #[derive_where(skip_inner(Debug))]
    |                           ^^^^^
 
 error: trait to be skipped isn't being implemented
-  --> tests/ui/item_skip.rs:58:27
+  --> tests/ui/item_skip.rs:46:27
    |
-58 | #[derive_where(skip_inner(Debug))]
+46 | #[derive_where(skip_inner(Debug))]
    |                           ^^^^^

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

@@ -1,5 +1,3 @@
-use std::marker::PhantomData;
-
 use derive_where::derive_where;
 
 #[derive_where(skip_inner, Clone)]

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

@@ -1,35 +1,35 @@
 error: unsupported trait, expected one of expected one of Clone, Copy, Debug, Default, Eq, Hash, Ord, PartialEq, PartialOrd
- --> tests/ui/not-zeroize/item.rs:6:16
+ --> tests/ui/not-zeroize/item.rs:3:16
   |
-6 | #[derive_where(skip_inner, Clone)]
+3 | #[derive_where(skip_inner, Clone)]
   |                ^^^^^^^^^^
 
 error: unsupported trait syntax, expected one of expected one of Clone, Copy, Debug, Default, Eq, Hash, Ord, PartialEq, PartialOrd
-  --> tests/ui/not-zeroize/item.rs:10:24
-   |
-10 | #[derive_where(Debug = invalid; T)]
-   |                        ^^^^^^^
+ --> tests/ui/not-zeroize/item.rs:6:24
+  |
+6 | #[derive_where(Debug = invalid; T)]
+  |                        ^^^^^^^
 
 error: unsupported trait syntax, expected one of expected one of Clone, Copy, Debug, Default, Eq, Hash, Ord, PartialEq, PartialOrd
-  --> tests/ui/not-zeroize/item.rs:14:16
-   |
-14 | #[derive_where(,)]
-   |                ^
+ --> tests/ui/not-zeroize/item.rs:9:16
+  |
+9 | #[derive_where(,)]
+  |                ^
 
 error: unsupported trait syntax, expected one of expected one of Clone, Copy, Debug, Default, Eq, Hash, Ord, PartialEq, PartialOrd
-  --> tests/ui/not-zeroize/item.rs:18:16
+  --> tests/ui/not-zeroize/item.rs:12:16
    |
-18 | #[derive_where(,Clone)]
+12 | #[derive_where(,Clone)]
    |                ^
 
 error: unsupported trait syntax, expected one of expected one of Clone, Copy, Debug, Default, Eq, Hash, Ord, PartialEq, PartialOrd
-  --> tests/ui/not-zeroize/item.rs:22:22
+  --> tests/ui/not-zeroize/item.rs:15:22
    |
-22 | #[derive_where(Clone,,)]
+15 | #[derive_where(Clone,,)]
    |                      ^
 
 error: unsupported trait, expected one of expected one of Clone, Copy, Debug, Default, Eq, Hash, Ord, PartialEq, PartialOrd
-  --> tests/ui/not-zeroize/item.rs:26:16
+  --> tests/ui/not-zeroize/item.rs:18:16
    |
-26 | #[derive_where(T)]
+18 | #[derive_where(T)]
    |                ^

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

@@ -1,11 +1,8 @@
-use std::marker::PhantomData;
-
 use derive_where::derive_where;
 
 #[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>);