diff --git a/crates/core_simd/src/swizzle.rs b/crates/core_simd/src/swizzle.rs index cf1e08aa668a..6353196e4cf4 100644 --- a/crates/core_simd/src/swizzle.rs +++ b/crates/core_simd/src/swizzle.rs @@ -251,14 +251,11 @@ where Rotate::::swizzle(self) } - /// Shifts the vector elements to the left by `OFFSET`, padding by the - /// default value (e.g., zero) to the right. + /// Shifts the vector elements to the left by `OFFSET`, filling in with + /// `padding` from the right. #[inline] #[must_use = "method returns a new vector and does not mutate the original inputs"] - pub fn shift_elements_left(self) -> Self - where - T: Default, - { + pub fn shift_elements_left(self, padding: T) -> Self { struct Shift; impl Swizzle for Shift { @@ -273,17 +270,14 @@ where }; } - Shift::::concat_swizzle(self, Self::default()) + Shift::::concat_swizzle(self, Simd::splat(padding)) } - /// Shifts the vector elements to the right by `OFFSET`, padding by the - /// default value (e.g., zero) from the left. + /// Shifts the vector elements to the right by `OFFSET`, filling in with + /// `padding` from the left. #[inline] #[must_use = "method returns a new vector and does not mutate the original inputs"] - pub fn shift_elements_right(self) -> Self - where - T: Default, - { + pub fn shift_elements_right(self, padding: T) -> Self { struct Shift; impl Swizzle for Shift { @@ -298,7 +292,7 @@ where }; } - Shift::::concat_swizzle(self, Self::default()) + Shift::::concat_swizzle(self, Simd::splat(padding)) } /// Interleave two vectors. @@ -501,28 +495,22 @@ where unsafe { Self::from_int_unchecked(self.to_int().rotate_elements_right::()) } } - /// Shifts the mask elements to the left by `OFFSET`, padding by the - /// default value (e.g., zero) to the right. + /// Shifts the mask elements to the left by `OFFSET`, filling in with + /// `padding` from the right. #[inline] #[must_use = "method returns a new vector and does not mutate the original inputs"] - pub fn shift_elements_left(self) -> Self - where - T: Default, - { + pub fn shift_elements_left(self, padding: T) -> Self { // Safety: swizzles are safe for masks - unsafe { Self::from_int_unchecked(self.to_int().shift_elements_left::()) } + unsafe { Self::from_int_unchecked(self.to_int().shift_elements_left::(padding)) } } - /// Shifts the mask elements to the right by `OFFSET`, padding by the - /// default value (e.g., `false`) from the left. + /// Shifts the mask elements to the right by `OFFSET`, filling in with + /// `padding` from the left. #[inline] #[must_use = "method returns a new vector and does not mutate the original inputs"] - pub fn shift_elements_right(self) -> Self - where - T: Default, - { + pub fn shift_elements_right(self, padding: T) -> Self { // Safety: swizzles are safe for masks - unsafe { Self::from_int_unchecked(self.to_int().shift_elements_right::()) } + unsafe { Self::from_int_unchecked(self.to_int().shift_elements_right::(padding)) } } /// Interleave two masks. diff --git a/crates/core_simd/tests/swizzle.rs b/crates/core_simd/tests/swizzle.rs index 98045fc5c544..7001e5f6bf87 100644 --- a/crates/core_simd/tests/swizzle.rs +++ b/crates/core_simd/tests/swizzle.rs @@ -52,18 +52,18 @@ fn rotate() { #[cfg_attr(target_arch = "wasm32", wasm_bindgen_test)] fn shift() { let a = Simd::from_array([1, 2, 3, 4]); - assert_eq!(a.shift_elements_left::<0>().to_array(), [1, 2, 3, 4]); - assert_eq!(a.shift_elements_left::<1>().to_array(), [2, 3, 4, 0]); - assert_eq!(a.shift_elements_left::<2>().to_array(), [3, 4, 0, 0]); - assert_eq!(a.shift_elements_left::<3>().to_array(), [4, 0, 0, 0]); - assert_eq!(a.shift_elements_left::<4>().to_array(), [0, 0, 0, 0]); - assert_eq!(a.shift_elements_left::<5>().to_array(), [0, 0, 0, 0]); - assert_eq!(a.shift_elements_right::<0>().to_array(), [1, 2, 3, 4]); - assert_eq!(a.shift_elements_right::<1>().to_array(), [0, 1, 2, 3]); - assert_eq!(a.shift_elements_right::<2>().to_array(), [0, 0, 1, 2]); - assert_eq!(a.shift_elements_right::<3>().to_array(), [0, 0, 0, 1]); - assert_eq!(a.shift_elements_right::<4>().to_array(), [0, 0, 0, 0]); - assert_eq!(a.shift_elements_right::<5>().to_array(), [0, 0, 0, 0]); + assert_eq!(a.shift_elements_left::<0>(0).to_array(), [1, 2, 3, 4]); + assert_eq!(a.shift_elements_left::<1>(0).to_array(), [2, 3, 4, 0]); + assert_eq!(a.shift_elements_left::<2>(9).to_array(), [3, 4, 9, 9]); + assert_eq!(a.shift_elements_left::<3>(8).to_array(), [4, 8, 8, 8]); + assert_eq!(a.shift_elements_left::<4>(7).to_array(), [7, 7, 7, 7]); + assert_eq!(a.shift_elements_left::<5>(6).to_array(), [6, 6, 6, 6]); + assert_eq!(a.shift_elements_right::<0>(0).to_array(), [1, 2, 3, 4]); + assert_eq!(a.shift_elements_right::<1>(0).to_array(), [0, 1, 2, 3]); + assert_eq!(a.shift_elements_right::<2>(-1).to_array(), [-1, -1, 1, 2]); + assert_eq!(a.shift_elements_right::<3>(-2).to_array(), [-2, -2, -2, 1]); + assert_eq!(a.shift_elements_right::<4>(-3).to_array(), [-3, -3, -3, -3]); + assert_eq!(a.shift_elements_right::<5>(-4).to_array(), [-4, -4, -4, -4]); } #[test]