Make implementation generic

rukai · rukai · commit ae212402d664 · 2022-02-16T14:58:36.000+11:00
diff --git a/compiler/rustc_typeck/src/check/method/suggest.rs b/compiler/rustc_typeck/src/check/method/suggest.rs
@@ -1196,35 +1196,43 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
                 Some(adt) if adt.did.is_local() => adt,
                 _ => continue,
             };
-            let diagnostic_name = self.tcx.get_diagnostic_name(trait_pred.def_id());
-            let can_derive = match diagnostic_name {
-                Some(sym::Default) => !adt.is_enum(),
-                Some(
+            if let Some(diagnostic_name) = self.tcx.get_diagnostic_name(trait_pred.def_id()) {
+                let can_derive = match diagnostic_name {
+                    sym::Default => !adt.is_enum(),
                     sym::Eq
                     | sym::PartialEq
                     | sym::Ord
                     | sym::PartialOrd
                     | sym::Clone
                     | sym::Copy
                     | sym::Hash
-                    | sym::Debug,
-                ) => true,
-                _ => false,
-            };
-            if can_derive {
-                let self_name = trait_pred.self_ty().to_string();
-                let self_span = self.tcx.def_span(adt.did);
-                if let Some(sym::Ord) = diagnostic_name {
-                    derives.push((self_name.clone(), self_span.clone(), "PartialOrd".to_string()));
-                }
-                if let Some(sym::Eq) = diagnostic_name {
-                    derives.push((self_name.clone(), self_span.clone(), "PartialEq".to_string()));
+                    | sym::Debug => true,
+                    _ => false,
+                };
+                if can_derive {
+                    let self_name = trait_pred.self_ty().to_string();
+                    let self_span = self.tcx.def_span(adt.did);
+                    use crate::rustc_middle::ty::ToPolyTraitRef;
+                    if let Some(poly_trait_ref) = pred.to_opt_poly_trait_pred() {
+                        for super_trait in rustc_middle::traits::util::supertraits(
+                            self.tcx,
+                            poly_trait_ref.to_poly_trait_ref(),
+                        ) {
+                            if let Some(parent_diagnostic_name) =
+                                self.tcx.get_diagnostic_name(super_trait.def_id())
+                            {
+                                derives.push((
+                                    self_name.clone(),
+                                    self_span.clone(),
+                                    parent_diagnostic_name.to_string(),
+                                ));
+                            }
+                        }
+                    }
+                    derives.push((self_name, self_span, diagnostic_name.to_string()));
+                } else {
+                    traits.push(self.tcx.def_span(trait_pred.def_id()));
                 }
-                derives.push((
-                    self_name,
-                    self_span,
-                    trait_pred.trait_ref.print_only_trait_name().to_string(),
-                ));
             } else {
                 traits.push(self.tcx.def_span(trait_pred.def_id()));
             }
diff --git a/src/test/ui/binop/issue-28837.stderr b/src/test/ui/binop/issue-28837.stderr
@@ -272,9 +272,9 @@ note: an implementation of `PartialOrd<_>` might be missing for `A`
    |
 LL | struct A;
    | ^^^^^^^^^ must implement `PartialOrd<_>`
-help: consider annotating `A` with `#[derive(PartialOrd)]`
+help: consider annotating `A` with `#[derive(PartialEq, PartialOrd)]`
    |
-LL | #[derive(PartialOrd)]
+LL | #[derive(PartialEq, PartialOrd)]
    |
 
 error[E0369]: binary operation `<=` cannot be applied to type `A`
@@ -290,9 +290,9 @@ note: an implementation of `PartialOrd<_>` might be missing for `A`
    |
 LL | struct A;
    | ^^^^^^^^^ must implement `PartialOrd<_>`
-help: consider annotating `A` with `#[derive(PartialOrd)]`
+help: consider annotating `A` with `#[derive(PartialEq, PartialOrd)]`
    |
-LL | #[derive(PartialOrd)]
+LL | #[derive(PartialEq, PartialOrd)]
    |
 
 error[E0369]: binary operation `>` cannot be applied to type `A`
@@ -308,9 +308,9 @@ note: an implementation of `PartialOrd<_>` might be missing for `A`
    |
 LL | struct A;
    | ^^^^^^^^^ must implement `PartialOrd<_>`
-help: consider annotating `A` with `#[derive(PartialOrd)]`
+help: consider annotating `A` with `#[derive(PartialEq, PartialOrd)]`
    |
-LL | #[derive(PartialOrd)]
+LL | #[derive(PartialEq, PartialOrd)]
    |
 
 error[E0369]: binary operation `>=` cannot be applied to type `A`
@@ -326,9 +326,9 @@ note: an implementation of `PartialOrd<_>` might be missing for `A`
    |
 LL | struct A;
    | ^^^^^^^^^ must implement `PartialOrd<_>`
-help: consider annotating `A` with `#[derive(PartialOrd)]`
+help: consider annotating `A` with `#[derive(PartialEq, PartialOrd)]`
    |
-LL | #[derive(PartialOrd)]
+LL | #[derive(PartialEq, PartialOrd)]
    |
 
 error: aborting due to 15 previous errors
diff --git a/src/test/ui/derives/issue-91550.stderr b/src/test/ui/derives/issue-91550.stderr
@@ -51,9 +51,9 @@ LL |     foo.use_ord();
    |
    = note: the following trait bounds were not satisfied:
            `NoDerives: Ord`
-help: consider annotating `NoDerives` with `#[derive(Ord, PartialOrd)]`
+help: consider annotating `NoDerives` with `#[derive(Eq, Ord, PartialEq, PartialOrd)]`
    |
-LL | #[derive(Ord, PartialOrd)]
+LL | #[derive(Eq, Ord, PartialEq, PartialOrd)]
    |
 
 error[E0599]: the method `use_ord_and_partial_ord` exists for struct `Object<NoDerives>`, but its trait bounds were not satisfied
@@ -74,9 +74,9 @@ LL |     foo.use_ord_and_partial_ord();
    = note: the following trait bounds were not satisfied:
            `NoDerives: Ord`
            `NoDerives: PartialOrd`
-help: consider annotating `NoDerives` with `#[derive(Ord, PartialOrd)]`
+help: consider annotating `NoDerives` with `#[derive(Eq, Ord, PartialEq, PartialOrd)]`
    |
-LL | #[derive(Ord, PartialOrd)]
+LL | #[derive(Eq, Ord, PartialEq, PartialOrd)]
    |
 
 error: aborting due to 4 previous errors
diff --git a/src/test/ui/union/union-derive-clone.mirunsafeck.stderr b/src/test/ui/union/union-derive-clone.mirunsafeck.stderr
@@ -16,9 +16,9 @@ LL |     let w = u.clone();
    = note: the following trait bounds were not satisfied:
            `CloneNoCopy: Copy`
            which is required by `U5<CloneNoCopy>: Clone`
-help: consider annotating `CloneNoCopy` with `#[derive(Copy)]`
+help: consider annotating `CloneNoCopy` with `#[derive(Clone, Copy)]`
    |
-LL | #[derive(Copy)]
+LL | #[derive(Clone, Copy)]
    |
 
 error[E0277]: the trait bound `U1: Copy` is not satisfied
diff --git a/src/test/ui/union/union-derive-clone.thirunsafeck.stderr b/src/test/ui/union/union-derive-clone.thirunsafeck.stderr
@@ -16,9 +16,9 @@ LL |     let w = u.clone();
    = note: the following trait bounds were not satisfied:
            `CloneNoCopy: Copy`
            which is required by `U5<CloneNoCopy>: Clone`
-help: consider annotating `CloneNoCopy` with `#[derive(Copy)]`
+help: consider annotating `CloneNoCopy` with `#[derive(Clone, Copy)]`
    |
-LL | #[derive(Copy)]
+LL | #[derive(Clone, Copy)]
    |
 
 error[E0277]: the trait bound `U1: Copy` is not satisfied

Original file line number	Diff line number	Diff line change
@@ -272,9 +272,9 @@ note: an implementation of `PartialOrd<_>` might be missing for `A`
`272`	`272`	`\|`
`273`	`273`	`LL \| struct A;`
`274`	`274`	\| ^^^^^^^^^ must implement `PartialOrd<_>`
`275`		-help: consider annotating `A` with `#[derive(PartialOrd)]`
	`275`	+help: consider annotating `A` with `#[derive(PartialEq, PartialOrd)]`
`276`	`276`	`\|`
`277`		`-LL \| #[derive(PartialOrd)]`
	`277`	`+LL \| #[derive(PartialEq, PartialOrd)]`
`278`	`278`	`\|`
`279`	`279`
`280`	`280`	error[E0369]: binary operation `<=` cannot be applied to type `A`
@@ -290,9 +290,9 @@ note: an implementation of `PartialOrd<_>` might be missing for `A`
`290`	`290`	`\|`
`291`	`291`	`LL \| struct A;`
`292`	`292`	\| ^^^^^^^^^ must implement `PartialOrd<_>`
`293`		-help: consider annotating `A` with `#[derive(PartialOrd)]`
	`293`	+help: consider annotating `A` with `#[derive(PartialEq, PartialOrd)]`
`294`	`294`	`\|`
`295`		`-LL \| #[derive(PartialOrd)]`
	`295`	`+LL \| #[derive(PartialEq, PartialOrd)]`
`296`	`296`	`\|`
`297`	`297`
`298`	`298`	error[E0369]: binary operation `>` cannot be applied to type `A`
@@ -308,9 +308,9 @@ note: an implementation of `PartialOrd<_>` might be missing for `A`
`308`	`308`	`\|`
`309`	`309`	`LL \| struct A;`
`310`	`310`	\| ^^^^^^^^^ must implement `PartialOrd<_>`
`311`		-help: consider annotating `A` with `#[derive(PartialOrd)]`
	`311`	+help: consider annotating `A` with `#[derive(PartialEq, PartialOrd)]`
`312`	`312`	`\|`
`313`		`-LL \| #[derive(PartialOrd)]`
	`313`	`+LL \| #[derive(PartialEq, PartialOrd)]`
`314`	`314`	`\|`
`315`	`315`
`316`	`316`	error[E0369]: binary operation `>=` cannot be applied to type `A`
@@ -326,9 +326,9 @@ note: an implementation of `PartialOrd<_>` might be missing for `A`
`326`	`326`	`\|`
`327`	`327`	`LL \| struct A;`
`328`	`328`	\| ^^^^^^^^^ must implement `PartialOrd<_>`
`329`		-help: consider annotating `A` with `#[derive(PartialOrd)]`
	`329`	+help: consider annotating `A` with `#[derive(PartialEq, PartialOrd)]`
`330`	`330`	`\|`
`331`		`-LL \| #[derive(PartialOrd)]`
	`331`	`+LL \| #[derive(PartialEq, PartialOrd)]`
`332`	`332`	`\|`
`333`	`333`
`334`	`334`	`error: aborting due to 15 previous errors`
Original file line number	Diff line number	Diff line change
`@@ -51,9 +51,9 @@ LL \| foo.use_ord();`
`51`	`51`	`\|`
`52`	`52`	`= note: the following trait bounds were not satisfied:`
`53`	`53`	`NoDerives: Ord`
`54`		-help: consider annotating `NoDerives` with `#[derive(Ord, PartialOrd)]`
	`54`	+help: consider annotating `NoDerives` with `#[derive(Eq, Ord, PartialEq, PartialOrd)]`
`55`	`55`	`\|`
`56`		`-LL \| #[derive(Ord, PartialOrd)]`
	`56`	`+LL \| #[derive(Eq, Ord, PartialEq, PartialOrd)]`
`57`	`57`	`\|`
`58`	`58`
`59`	`59`	error[E0599]: the method `use_ord_and_partial_ord` exists for struct `Object<NoDerives>`, but its trait bounds were not satisfied
`@@ -74,9 +74,9 @@ LL \| foo.use_ord_and_partial_ord();`
`74`	`74`	`= note: the following trait bounds were not satisfied:`
`75`	`75`	`NoDerives: Ord`
`76`	`76`	`NoDerives: PartialOrd`
`77`		-help: consider annotating `NoDerives` with `#[derive(Ord, PartialOrd)]`
	`77`	+help: consider annotating `NoDerives` with `#[derive(Eq, Ord, PartialEq, PartialOrd)]`
`78`	`78`	`\|`
`79`		`-LL \| #[derive(Ord, PartialOrd)]`
	`79`	`+LL \| #[derive(Eq, Ord, PartialEq, PartialOrd)]`
`80`	`80`	`\|`
`81`	`81`
`82`	`82`	`error: aborting due to 4 previous errors`
Original file line number	Diff line number	Diff line change
`@@ -16,9 +16,9 @@ LL \| let w = u.clone();`
`16`	`16`	`= note: the following trait bounds were not satisfied:`
`17`	`17`	`CloneNoCopy: Copy`
`18`	`18`	which is required by `U5<CloneNoCopy>: Clone`
`19`		-help: consider annotating `CloneNoCopy` with `#[derive(Copy)]`
	`19`	+help: consider annotating `CloneNoCopy` with `#[derive(Clone, Copy)]`
`20`	`20`	`\|`
`21`		`-LL \| #[derive(Copy)]`
	`21`	`+LL \| #[derive(Clone, Copy)]`
`22`	`22`	`\|`
`23`	`23`
`24`	`24`	error[E0277]: the trait bound `U1: Copy` is not satisfied