cleanup merge

Author: miguelraz

crates/core_simd/src/ops.rs

@@ -311,15 +311,10 @@ macro_rules! impl_unsigned_int_ops {
                             if rhs == 0 {
                                 panic!("attempt to divide by zero");
                             }
-<<<<<<< HEAD
-                            if <$scalar>::MIN != 0  && rhs == -1 as _ {
-                                panic!("attempt to divide with overflow");
-=======
                             if <$scalar>::MIN != 0 &&
                                 self.as_slice().iter().any(|x| *x == <$scalar>::MIN) &&
                                 rhs == -1 as _ {
-                                panic!("dividing MIN by -1 is undefined");
->>>>>>> 549f751... actually check if lhs == MIN in div/rem overflow guards
+                                    panic!("dividing MIN by -1 is undefined");
                             }
                             let rhs = Self::splat(rhs);
                             unsafe { crate::intrinsics::simd_div(self, rhs) }
@@ -392,14 +387,10 @@ macro_rules! impl_unsigned_int_ops {
                             if rhs == 0 {
                                 panic!("attempt to calculate the remainder with a divisor of zero");
                             }
-<<<<<<< HEAD
-                            if <$scalar>::MIN != 0  && rhs == -1 as _ {
-                                panic!("attempt to calculate the remainder with overflow");
-=======
-                            if <$scalar>::MIN != 0 && self.as_slice().iter().any(|x| *x == <$scalar>::MIN) && rhs == -1 as _ {
-                                panic!("MIN modulo -1 is undefined");
-
->>>>>>> 549f751... actually check if lhs == MIN in div/rem overflow guards
+                            if <$scalar>::MIN != 0 &&
+                                self.as_slice().iter().any(|x| *x == <$scalar>::MIN) &&
+                                rhs == -1 as _ {
+                                    panic!("MIN modulo -1 is undefined");
                             }
                             let rhs = Self::splat(rhs);
                             unsafe { crate::intrinsics::simd_rem(self, rhs) }