Rollup merge of #155659 - cyrgani:deriving-2, r=Kivooeo

cleanup, restructure and merge `tests/ui/deriving` into `tests/ui/derives`

As a followup to https://github.com/rust-lang/rust/pull/155615, this PR deletes some outdated tests from these directories, splits up `ui/derives` into smaller directories to roughly group tests by the derive macros they use and moves over all tests from `ui/deriving` into `ui/derives`.
r? @Kivooeo

tests/ui/README.md

@@ -412,10 +412,6 @@ Tests for quality of diagnostics involving suppression of cascading errors in so
 
 Tests for built-in derive macros (`Debug`, `Clone`, etc.) when used in conjunction with built-in `#[derive(..)]` attributes.
 
-## `tests/ui/deriving/`: Derive Macro
-
-**FIXME**: Coalesce with `tests/ui/derives`.
-
 ## `tests/ui/dest-prop/` Destination Propagation
 
 **FIXME**: Contains a single test for the `DestProp` mir-opt, should probably be rehomed.

tests/ui/derives/auxiliary/rustc-serialize.rs

@@ -1,16 +0,0 @@
-#![crate_type = "lib"]
-
-pub trait Decoder {
-    type Error;
-
-    fn read_enum<T, F>(&mut self, name: &str, f: F) -> Result<T, Self::Error>
-        where F: FnOnce(&mut Self) -> Result<T, Self::Error>;
-    fn read_enum_variant<T, F>(&mut self, names: &[&str], f: F)
-                               -> Result<T, Self::Error>
-        where F: FnMut(&mut Self, usize) -> Result<T, Self::Error>;
-
-}
-
-pub trait Decodable: Sized {
-    fn decode<D: Decoder>(d: &mut D) -> Result<Self, D::Error>;
-}

tests/ui/deriving/deriving-enum-single-variant.rs

@@ -1,11 +0,0 @@
-//@ run-pass
-#![allow(non_camel_case_types)]
-
-pub type task_id = isize;
-
-#[derive(PartialEq)]
-pub enum Task {
-    TaskHandle(task_id)
-}
-
-pub fn main() { }

tests/ui/deriving/deriving-in-macro.rs

@@ -1,16 +0,0 @@
-//@ check-pass
-#![allow(non_camel_case_types)]
-#![allow(dead_code)]
-
-macro_rules! define_vec {
-    () => (
-        mod foo {
-            #[derive(PartialEq)]
-            pub struct bar;
-        }
-    )
-}
-
-define_vec![];
-
-pub fn main() {}

tests/ui/deriving/deriving-meta-multiple.rs

@@ -1,25 +0,0 @@
-//@ run-pass
-#![allow(unused_must_use)]
-#![allow(unused_imports)]
-#![allow(deprecated)]
-
-use std::hash::{Hash, SipHasher};
-
-// testing multiple separate deriving attributes
-#[derive(PartialEq)]
-#[derive(Clone)]
-#[derive(Hash)]
-struct Foo {
-    bar: usize,
-    baz: isize
-}
-
-fn hash<T: Hash>(_t: &T) {}
-
-pub fn main() {
-    let a = Foo {bar: 4, baz: -3};
-
-    a == a;    // check for PartialEq impl w/o testing its correctness
-    a.clone(); // check for Clone impl w/o testing its correctness
-    hash(&a);  // check for Hash impl w/o testing its correctness
-}

tests/ui/deriving/deriving-meta.rs

@@ -1,22 +0,0 @@
-//@ run-pass
-#![allow(unused_must_use)]
-#![allow(unused_imports)]
-#![allow(deprecated)]
-
-use std::hash::{Hash, SipHasher};
-
-#[derive(PartialEq, Clone, Hash)]
-struct Foo {
-    bar: usize,
-    baz: isize
-}
-
-fn hash<T: Hash>(_t: &T) {}
-
-pub fn main() {
-    let a = Foo {bar: 4, baz: -3};
-
-    a == a;    // check for PartialEq impl w/o testing its correctness
-    a.clone(); // check for Clone impl w/o testing its correctness
-    hash(&a);  // check for Hash impl w/o testing its correctness
-}

tests/ui/deriving/deriving-via-extension-c-enum.rs

@@ -1,17 +0,0 @@
-//@ run-pass
-#![allow(dead_code)]
-#[derive(PartialEq, Debug)]
-enum Foo {
-    Bar,
-    Baz,
-    Boo
-}
-
-pub fn main() {
-    let a = Foo::Bar;
-    let b = Foo::Bar;
-    assert_eq!(a, b);
-    assert!(!(a != b));
-    assert!(a.eq(&b));
-    assert!(!a.ne(&b));
-}

tests/ui/deriving/deriving-via-extension-enum.rs

@@ -1,16 +0,0 @@
-//@ run-pass
-#![allow(dead_code)]
-#[derive(PartialEq, Debug)]
-enum Foo {
-    Bar(isize, isize),
-    Baz(f64, f64)
-}
-
-pub fn main() {
-    let a = Foo::Bar(1, 2);
-    let b = Foo::Bar(1, 2);
-    assert_eq!(a, b);
-    assert!(!(a != b));
-    assert!(a.eq(&b));
-    assert!(!a.ne(&b));
-}

tests/ui/deriving/deriving-via-extension-hash-enum.rs

@@ -1,17 +0,0 @@
-//@ run-pass
-#![allow(dead_code)]
-#[derive(Hash)]
-enum Foo {
-    Bar(isize, char),
-    Baz(char, isize)
-}
-
-#[derive(Hash)]
-enum A {
-    B,
-    C,
-    D,
-    E
-}
-
-pub fn main(){}

tests/ui/deriving/deriving-via-extension-hash-struct.rs

@@ -1,11 +0,0 @@
-//@ run-pass
-#![allow(dead_code)]
-
-#[derive(Hash)]
-struct Foo {
-    x: isize,
-    y: isize,
-    z: isize
-}
-
-pub fn main() {}

tests/ui/deriving/deriving-via-extension-struct-empty.rs

@@ -1,8 +0,0 @@
-//@ run-pass
-#[derive(PartialEq, Debug)]
-struct Foo;
-
-pub fn main() {
-  assert_eq!(Foo, Foo);
-  assert!(!(Foo != Foo));
-}

tests/ui/deriving/deriving-via-extension-struct-like-enum-variant.rs

@@ -1,13 +0,0 @@
-//@ run-pass
-#![allow(dead_code)]
-#[derive(PartialEq, Debug)]
-enum S {
-    X { x: isize, y: isize },
-    Y
-}
-
-pub fn main() {
-    let x = S::X { x: 1, y: 2 };
-    assert_eq!(x, x);
-    assert!(!(x != x));
-}

tests/ui/deriving/deriving-via-extension-struct-tuple.rs

@@ -1,17 +0,0 @@
-//@ run-pass
-#[derive(PartialEq, Debug)]
-struct Foo(isize, isize, String);
-
-pub fn main() {
-  let a1 = Foo(5, 6, "abc".to_string());
-  let a2 = Foo(5, 6, "abc".to_string());
-  let b = Foo(5, 7, "def".to_string());
-
-  assert_eq!(a1, a1);
-  assert_eq!(a2, a1);
-  assert!(!(a1 == b));
-
-  assert!(a1 != b);
-  assert!(!(a1 != a1));
-  assert!(!(a2 != a1));
-}

tests/ui/deriving/deriving-via-extension-struct.rs

@@ -1,16 +0,0 @@
-//@ run-pass
-#[derive(PartialEq, Debug)]
-struct Foo {
-    x: isize,
-    y: isize,
-    z: isize,
-}
-
-pub fn main() {
-    let a = Foo { x: 1, y: 2, z: 3 };
-    let b = Foo { x: 1, y: 2, z: 3 };
-    assert_eq!(a, b);
-    assert!(!(a != b));
-    assert!(a.eq(&b));
-    assert!(!a.ne(&b));
-}

tests/ui/deriving/deriving-via-extension-type-params.rs

@@ -1,16 +0,0 @@
-//@ run-pass
-#[derive(PartialEq, Hash, Debug)]
-struct Foo<T> {
-    x: isize,
-    y: T,
-    z: isize
-}
-
-pub fn main() {
-    let a = Foo { x: 1, y: 2.0f64, z: 3 };
-    let b = Foo { x: 1, y: 2.0f64, z: 3 };
-    assert_eq!(a, b);
-    assert!(!(a != b));
-    assert!(a.eq(&b));
-    assert!(!a.ne(&b));
-}

triagebot.toml

@@ -1283,7 +1283,7 @@ Please ensure that if you've changed the output:
 """
 cc = ["@aDotInTheVoid", "@obi1kenobi"]
 
-[mentions."tests/ui/deriving/deriving-all-codegen.stdout"]
+[mentions."tests/ui/derives/deriving-all-codegen.stdout"]
 message = "Changes to the code generated for builtin derived traits."
 cc = ["@nnethercote"]