impl PartialOrd codegen for C-style enums

diff --git a/crates/ide_assists/src/handlers/replace_derive_with_manual_impl.rs b/crates/ide_assists/src/handlers/replace_derive_with_manual_impl.rs
index 27bba8732ffdfe9453a8b1a34485ee963a00e6d4..03211f728a868d129817cad45f9f59e00910a45a 100644 (file)
--- a/crates/ide_assists/src/handlers/replace_derive_with_manual_impl.rs
+++ b/crates/ide_assists/src/handlers/replace_derive_with_manual_impl.rs
@@ -712,6 +712,35 @@ impl PartialOrd for Foo {
         )
     }
 
+    #[test]
+    fn add_custom_impl_partial_ord_enum() {
+        check_assist(
+            replace_derive_with_manual_impl,
+            r#"
+//- minicore: ord
+#[derive(Partial$0Ord)]
+enum Foo {
+    Bin,
+    Bar,
+    Baz,
+}
+"#,
+            r#"
+enum Foo {
+    Bin,
+    Bar,
+    Baz,
+}
+
+impl PartialOrd for Foo {
+    $0fn partial_cmp(&self, other: &Self) -> Option<core::cmp::Ordering> {
+        core::mem::discriminant(self).partial_cmp(core::mem::discriminant(other))
+    }
+}
+"#,
+        )
+    }
+
     #[test]
     fn add_custom_impl_partial_ord_tuple_struct() {
         check_assist(

diff --git a/crates/ide_assists/src/utils/gen_trait_fn_body.rs b/crates/ide_assists/src/utils/gen_trait_fn_body.rs
index d9a3d23eb5c536688c37800d497cf02c7f42c4aa..9bafae46c5c5345ec0089d1be66705312f3f1e7d 100644 (file)
--- a/crates/ide_assists/src/utils/gen_trait_fn_body.rs
+++ b/crates/ide_assists/src/utils/gen_trait_fn_body.rs
@@ -635,7 +635,7 @@ fn gen_tuple_field(field_name: &String) -> ast::Pat {
             let lhs = make::expr_call(make_discriminant()?, make::arg_list(Some(lhs_name.clone())));
             let rhs_name = make::expr_path(make::ext::ident_path("other"));
             let rhs = make::expr_call(make_discriminant()?, make::arg_list(Some(rhs_name.clone())));
-            let eq_check = make::expr_op(ast::BinOp::EqualityTest, lhs, rhs);
+            let ord_check = gen_partial_cmp_call(lhs, rhs);
 
             let mut case_count = 0;
             let mut arms = vec![];
@@ -705,11 +705,11 @@ fn gen_tuple_field(field_name: &String) -> ast::Pat {
             }
 
             let expr = match arms.len() {
-                0 => eq_check,
+                0 => ord_check,
                 _ => {
                     if case_count > arms.len() {
                         let lhs = make::wildcard_pat().into();
-                        arms.push(make::match_arm(Some(lhs), None, eq_check));
+                        arms.push(make::match_arm(Some(lhs), None, ord_check));
                     }
 
                     let match_target = make::expr_tuple(vec![lhs_name, rhs_name]);