Unnamed repository; edit this file 'description' to name the repository.
| -rw-r--r-- | crates/ide_assists/src/handlers/replace_derive_with_manual_impl.rs | 8 | ||||
| -rw-r--r-- | crates/ide_assists/src/utils/gen_trait_fn_body.rs | 2 |
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 72f49657fb..042f31e5c4 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 200c9e25db..908bb136be 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())); |