about summary refs log tree commit diff
diff options
context:
space:
mode:
authorYoshua Wuyts <yoshuawuyts@gmail.com>2021-10-18 14:45:24 +0200
committerYoshua Wuyts <yoshuawuyts@gmail.com>2021-10-18 14:45:24 +0200
commite346d32e690a24ad9de69e94b9f302d7a74e4ec5 (patch)
tree5d0504c542930adb026879a781b0b698c012ee4d
parent41fd82441536cd9f8bc31461cab63cb6ec586d4e (diff)
downloadrust-e346d32e690a24ad9de69e94b9f302d7a74e4ec5.tar.gz
rust-e346d32e690a24ad9de69e94b9f302d7a74e4ec5.zip
fix Ordering::Equal path
-rw-r--r--crates/ide_assists/src/handlers/replace_derive_with_manual_impl.rs8
-rw-r--r--crates/ide_assists/src/utils/gen_trait_fn_body.rs2
2 files changed, 5 insertions, 5 deletions
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 72f49657fbb..042f31e5c4d 100644
--- a/crates/ide_assists/src/handlers/replace_derive_with_manual_impl.rs
+++ b/crates/ide_assists/src/handlers/replace_derive_with_manual_impl.rs
@@ -723,11 +723,11 @@ struct Foo {
 impl PartialOrd for Foo {
     $0fn partial_cmp(&self, other: &Self) -> Option<core::cmp::Ordering> {
         match self.bin.partial_cmp(&other.bin) {
-            Some(core::cmp::Ordering::Eq) => {}
+            Some(core::cmp::Ordering::Equal) => {}
             ord => return ord,
         }
         match self.bar.partial_cmp(&other.bar) {
-            Some(core::cmp::Ordering::Eq) => {}
+            Some(core::cmp::Ordering::Equal) => {}
             ord => return ord,
         }
         self.baz.partial_cmp(&other.baz)
@@ -752,11 +752,11 @@ struct Foo(usize, usize, usize);
 impl PartialOrd for Foo {
     $0fn partial_cmp(&self, other: &Self) -> Option<core::cmp::Ordering> {
         match self.0.partial_cmp(&other.0) {
-            Some(core::cmp::Ordering::Eq) => {}
+            Some(core::cmp::Ordering::Equal) => {}
             ord => return ord,
         }
         match self.1.partial_cmp(&other.1) {
-            Some(core::cmp::Ordering::Eq) => {}
+            Some(core::cmp::Ordering::Equal) => {}
             ord => return ord,
         }
         self.2.partial_cmp(&other.2)
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 200c9e25db1..908bb136beb 100644
--- a/crates/ide_assists/src/utils/gen_trait_fn_body.rs
+++ b/crates/ide_assists/src/utils/gen_trait_fn_body.rs
@@ -578,7 +578,7 @@ fn gen_partial_ord(adt: &ast::Adt, func: &ast::Fn) -> Option<()> {
         let mut arms = vec![];
 
         let variant_name =
-            make::path_pat(make::ext::path_from_idents(["core", "cmp", "Ordering", "Eq"])?);
+            make::path_pat(make::ext::path_from_idents(["core", "cmp", "Ordering", "Equal"])?);
         let lhs = make::tuple_struct_pat(make::ext::path_from_idents(["Some"])?, [variant_name]);
         arms.push(make::match_arm(Some(lhs.into()), None, make::expr_empty_block()));