Fix PartialOrd implementation of Position (#2172)

pen-lang · Oct 6, 2023 · 27a9fd1 · 27a9fd1
1 parent 0ee7c8e
commit 27a9fd1
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 12 deletions.
diff --git a/lib/mir/src/analysis/reference_count/transformation.rs b/lib/mir/src/analysis/reference_count/transformation.rs
@@ -146,22 +146,22 @@ fn transform_expression(
 
             let alternative_moved_variables = default_alternative_moved_variables
                 .iter()
-                .cloned()
-                .filter(|variable| {
+                .filter(|&variable| {
                     if let Some(alternative) = case.default_alternative() {
                         variable != alternative.name()
                     } else {
                         true
                     }
                 })
+                .cloned()
                 .chain(
                     alternative_tuples
                         .iter()
                         .flat_map(|(alternative, moved_variables)| {
                             moved_variables
                                 .iter()
+                                .filter(|&variable| variable != alternative.name())
                                 .cloned()
-                                .filter(|variable| variable != alternative.name())
                                 .collect::<FnvHashSet<_>>()
                         }),
                 )
@@ -316,8 +316,8 @@ fn transform_expression(
                 &let_owned_variables,
                 &moved_variables
                     .iter()
+                    .filter(|&variable| variable != let_.name())
                     .cloned()
-                    .filter(|variable| variable != let_.name())
                     .collect(),
             )?;
             let (bound_expression, moved_variables) = transform_expression(
@@ -329,8 +329,8 @@ fn transform_expression(
                     .chain(
                         expression_moved_variables
                             .iter()
-                            .cloned()
-                            .filter(|variable| variable != let_.name()),
+                            .filter(|&variable| variable != let_.name())
+                            .cloned(),
                     )
                     .collect(),
             )?;
@@ -368,8 +368,8 @@ fn transform_expression(
                 &let_owned_variables,
                 &moved_variables
                     .iter()
+                    .filter(|&variable| variable != let_.definition().name())
                     .cloned()
-                    .filter(|variable| variable != let_.definition().name())
                     .collect(),
             )?;
             let moved_variables = moved_variables
@@ -378,8 +378,8 @@ fn transform_expression(
                 .chain(
                     expression_moved_variables
                         .iter()
-                        .cloned()
-                        .filter(|variable| variable != let_.definition().name()),
+                        .filter(|&variable| variable != let_.definition().name())
+                        .cloned(),
                 )
                 .collect();
             let cloned_variables = let_

diff --git a/lib/position/src/position.rs b/lib/position/src/position.rs
@@ -78,8 +78,8 @@ impl Ord for Position {
 }
 
 impl PartialOrd for Position {
-    fn partial_cmp(&self, _: &Self) -> Option<Ordering> {
-        Some(Ordering::Equal)
+    fn partial_cmp(&self, other: &Self) -> Option<Ordering> {
+        Some(self.cmp(other))
     }
 }
 

diff --git a/packages/core/ffi/src/character.rs b/packages/core/ffi/src/character.rs
@@ -6,7 +6,7 @@ const INVALID_CODE_POINT: ffi::Number = ffi::Number::new(f64::NAN);
 fn _pen_core_character_from_code_point(code_point: ffi::Number) -> ffi::ByteString {
     char::from_u32(f64::from(code_point) as u32)
         .map(ffi::ByteString::from)
-        .unwrap_or_else(ffi::ByteString::default)
+        .unwrap_or_default()
 }
 
 #[ffi::bindgen]