Add fmt and clippy to CI (#147)

calebzulawski · web-flow · commit 732b7edfab46 · 2021-07-23T17:43:53.000-07:00
* Add fmt and clippy to CI
* Add rust components
* Fix formatting
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -11,6 +11,53 @@ env:
   RUSTUP_MAX_RETRIES: 10
 
 jobs:
+  rustfmt:
+    name: "rustfmt"
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v2
+      - name: Setup Rust
+        run: |
+          rustup update nightly --no-self-update
+          rustup default nightly
+          rustup component add rustfmt
+      - name: Run rustfmt
+        run: cargo fmt --all -- --check
+
+  clippy:
+    name: "clippy on ${{ matrix.target }}"
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        target:
+          # We shouldn't really have any OS-specific code, so think of this as a list of architectures
+          - x86_64-unknown-linux-gnu
+          - i686-unknown-linux-gnu
+          - i586-unknown-linux-gnu
+          - aarch64-unknown-linux-gnu
+          - armv7-unknown-linux-gnueabihf
+          - mips-unknown-linux-gnu
+          - mips64-unknown-linux-gnuabi64
+          - powerpc-unknown-linux-gnu
+          - powerpc64-unknown-linux-gnu
+          - riscv64gc-unknown-linux-gnu
+          - s390x-unknown-linux-gnu
+          - sparc64-unknown-linux-gnu
+          - wasm32-unknown-unknown
+
+    steps:
+      - uses: actions/checkout@v2
+      - name: Setup Rust
+        run: |
+          rustup update nightly --no-self-update
+          rustup default nightly
+          rustup target add ${{ matrix.target }}
+          rustup component add clippy
+      - name: Run Clippy
+        run: cargo clippy --all-targets --target ${{ matrix.target }}
+
   x86-tests:
     name: "${{ matrix.target_feature }} on ${{ matrix.target }}"
     runs-on: ${{ matrix.os }}
diff --git a/crates/core_simd/examples/matrix_inversion.rs b/crates/core_simd/examples/matrix_inversion.rs
@@ -1,10 +1,7 @@
 //! 4x4 matrix inverse
 // Code ported from the `packed_simd` crate
 // Run this code with `cargo test --example matrix_inversion`
-#![feature(
-    array_chunks,
-    portable_simd,
-)]
+#![feature(array_chunks, portable_simd)]
 use core_simd::*;
 
 // Gotta define our own 4x4 matrix since Rust doesn't ship multidim arrays yet :^)
@@ -15,27 +12,29 @@ pub struct Matrix4x4([[f32; 4]; 4]);
 pub fn scalar_inv4x4(m: Matrix4x4) -> Option<Matrix4x4> {
     let m = m.0;
 
+    #[rustfmt::skip]
     let mut inv = [
-        [ // row 0:
+        // row 0:
+        [
             // 0,0:
-            m[1][1]  * m[2][2] * m[3][3] -
-            m[1][1]  * m[2][3] * m[3][2] -
-            m[2][1]  * m[1][2]  * m[3][3] +
-            m[2][1]  * m[1][3]  * m[3][2] +
-            m[3][1] * m[1][2]  * m[2][3] -
-            m[3][1] * m[1][3]  * m[2][2],
+            m[1][1] * m[2][2] * m[3][3] -
+            m[1][1] * m[2][3] * m[3][2] -
+            m[2][1] * m[1][2] * m[3][3] +
+            m[2][1] * m[1][3] * m[3][2] +
+            m[3][1] * m[1][2] * m[2][3] -
+            m[3][1] * m[1][3] * m[2][2],
             // 0,1:
-           -m[0][1]  * m[2][2] * m[3][3] +
-            m[0][1]  * m[2][3] * m[3][2] +
-            m[2][1]  * m[0][2] * m[3][3] -
-            m[2][1]  * m[0][3] * m[3][2] -
+           -m[0][1] * m[2][2] * m[3][3] +
+            m[0][1] * m[2][3] * m[3][2] +
+            m[2][1] * m[0][2] * m[3][3] -
+            m[2][1] * m[0][3] * m[3][2] -
             m[3][1] * m[0][2] * m[2][3] +
             m[3][1] * m[0][3] * m[2][2],
             // 0,2:
-            m[0][1]  * m[1][2] * m[3][3] -
-            m[0][1]  * m[1][3] * m[3][2] -
-            m[1][1]  * m[0][2] * m[3][3] +
-            m[1][1]  * m[0][3] * m[3][2] +
+            m[0][1] * m[1][2] * m[3][3] -
+            m[0][1] * m[1][3] * m[3][2] -
+            m[1][1] * m[0][2] * m[3][3] +
+            m[1][1] * m[0][3] * m[3][2] +
             m[3][1] * m[0][2] * m[1][3] -
             m[3][1] * m[0][3] * m[1][2],
             // 0,3:
@@ -46,26 +45,27 @@ pub fn scalar_inv4x4(m: Matrix4x4) -> Option<Matrix4x4> {
             m[2][1] * m[0][2] * m[1][3] +
             m[2][1] * m[0][3] * m[1][2],
         ],
-        [ // row 1
+        // row 1
+        [
             // 1,0:
-           -m[1][0]  * m[2][2] * m[3][3] +
-            m[1][0]  * m[2][3] * m[3][2] +
-            m[2][0]  * m[1][2]  * m[3][3] -
-            m[2][0]  * m[1][3]  * m[3][2] -
-            m[3][0] * m[1][2]  * m[2][3] +
-            m[3][0] * m[1][3]  * m[2][2],
+           -m[1][0] * m[2][2] * m[3][3] +
+            m[1][0] * m[2][3] * m[3][2] +
+            m[2][0] * m[1][2] * m[3][3] -
+            m[2][0] * m[1][3] * m[3][2] -
+            m[3][0] * m[1][2] * m[2][3] +
+            m[3][0] * m[1][3] * m[2][2],
             // 1,1:
-            m[0][0]  * m[2][2] * m[3][3] -
-            m[0][0]  * m[2][3] * m[3][2] -
-            m[2][0]  * m[0][2] * m[3][3] +
-            m[2][0]  * m[0][3] * m[3][2] +
+            m[0][0] * m[2][2] * m[3][3] -
+            m[0][0] * m[2][3] * m[3][2] -
+            m[2][0] * m[0][2] * m[3][3] +
+            m[2][0] * m[0][3] * m[3][2] +
             m[3][0] * m[0][2] * m[2][3] -
             m[3][0] * m[0][3] * m[2][2],
             // 1,2:
-           -m[0][0]  * m[1][2] * m[3][3] +
-            m[0][0]  * m[1][3] * m[3][2] +
-            m[1][0]  * m[0][2] * m[3][3] -
-            m[1][0]  * m[0][3] * m[3][2] -
+           -m[0][0] * m[1][2] * m[3][3] +
+            m[0][0] * m[1][3] * m[3][2] +
+            m[1][0] * m[0][2] * m[3][3] -
+            m[1][0] * m[0][3] * m[3][2] -
             m[3][0] * m[0][2] * m[1][3] +
             m[3][0] * m[0][3] * m[1][2],
             // 1,3:
@@ -76,26 +76,27 @@ pub fn scalar_inv4x4(m: Matrix4x4) -> Option<Matrix4x4> {
             m[2][0] * m[0][2] * m[1][3] -
             m[2][0] * m[0][3] * m[1][2],
         ],
-        [ // row 2
+        // row 2
+        [
             // 2,0:
-            m[1][0]  * m[2][1] * m[3][3] -
-            m[1][0]  * m[2][3] * m[3][1] -
-            m[2][0]  * m[1][1] * m[3][3] +
-            m[2][0]  * m[1][3] * m[3][1] +
+            m[1][0] * m[2][1] * m[3][3] -
+            m[1][0] * m[2][3] * m[3][1] -
+            m[2][0] * m[1][1] * m[3][3] +
+            m[2][0] * m[1][3] * m[3][1] +
             m[3][0] * m[1][1] * m[2][3] -
             m[3][0] * m[1][3] * m[2][1],
             // 2,1:
-           -m[0][0]  * m[2][1] * m[3][3] +
-            m[0][0]  * m[2][3] * m[3][1] +
-            m[2][0]  * m[0][1] * m[3][3] -
-            m[2][0]  * m[0][3] * m[3][1] -
+           -m[0][0] * m[2][1] * m[3][3] +
+            m[0][0] * m[2][3] * m[3][1] +
+            m[2][0] * m[0][1] * m[3][3] -
+            m[2][0] * m[0][3] * m[3][1] -
             m[3][0] * m[0][1] * m[2][3] +
             m[3][0] * m[0][3] * m[2][1],
             // 2,2:
-            m[0][0]  * m[1][1] * m[3][3] -
-            m[0][0]  * m[1][3] * m[3][1] -
-            m[1][0]  * m[0][1] * m[3][3] +
-            m[1][0]  * m[0][3] * m[3][1] +
+            m[0][0] * m[1][1] * m[3][3] -
+            m[0][0] * m[1][3] * m[3][1] -
+            m[1][0] * m[0][1] * m[3][3] +
+            m[1][0] * m[0][3] * m[3][1] +
             m[3][0] * m[0][1] * m[1][3] -
             m[3][0] * m[0][3] * m[1][1],
             // 2,3:
@@ -106,26 +107,27 @@ pub fn scalar_inv4x4(m: Matrix4x4) -> Option<Matrix4x4> {
             m[2][0] * m[0][1] * m[1][3] +
             m[2][0] * m[0][3] * m[1][1],
         ],
-        [ // row 3
+        // row 3
+        [
             // 3,0:
-           -m[1][0]  * m[2][1] * m[3][2] +
-            m[1][0]  * m[2][2] * m[3][1] +
-            m[2][0]  * m[1][1] * m[3][2] -
-            m[2][0]  * m[1][2] * m[3][1] -
+           -m[1][0] * m[2][1] * m[3][2] +
+            m[1][0] * m[2][2] * m[3][1] +
+            m[2][0] * m[1][1] * m[3][2] -
+            m[2][0] * m[1][2] * m[3][1] -
             m[3][0] * m[1][1] * m[2][2] +
             m[3][0] * m[1][2] * m[2][1],
             // 3,1:
-            m[0][0]  * m[2][1] * m[3][2] -
-            m[0][0]  * m[2][2] * m[3][1] -
-            m[2][0]  * m[0][1] * m[3][2] +
-            m[2][0]  * m[0][2] * m[3][1] +
+            m[0][0] * m[2][1] * m[3][2] -
+            m[0][0] * m[2][2] * m[3][1] -
+            m[2][0] * m[0][1] * m[3][2] +
+            m[2][0] * m[0][2] * m[3][1] +
             m[3][0] * m[0][1] * m[2][2] -
             m[3][0] * m[0][2] * m[2][1],
             // 3,2:
-           -m[0][0]  * m[1][1] * m[3][2] +
-            m[0][0]  * m[1][2] * m[3][1] +
-            m[1][0]  * m[0][1] * m[3][2] -
-            m[1][0]  * m[0][2] * m[3][1] -
+           -m[0][0] * m[1][1] * m[3][2] +
+            m[0][0] * m[1][2] * m[3][1] +
+            m[1][0] * m[0][1] * m[3][2] -
+            m[1][0] * m[0][2] * m[3][1] -
             m[3][0] * m[0][1] * m[1][2] +
             m[3][0] * m[0][2] * m[1][1],
             // 3,3:
@@ -138,9 +140,10 @@ pub fn scalar_inv4x4(m: Matrix4x4) -> Option<Matrix4x4> {
         ],
     ];
 
-    let det = m[0][0] * inv[0][0] + m[0][1] * inv[1][0] +
-              m[0][2] * inv[2][0] + m[0][3] * inv[3][0];
-    if det == 0. { return None; }
+    let det = m[0][0] * inv[0][0] + m[0][1] * inv[1][0] + m[0][2] * inv[2][0] + m[0][3] * inv[3][0];
+    if det == 0. {
+        return None;
+    }
 
     let det_inv = 1. / det;
 
@@ -163,76 +166,76 @@ pub fn simd_inv4x4(m: Matrix4x4) -> Option<Matrix4x4> {
     // 2 argument shuffle, returns an f32x4
     // the first f32x4 is indexes 0..=3
     // the second f32x4 is indexed 4..=7
-    let tmp1 = f32x4::shuffle::<{[0, 1, 4, 5]}>(m_0, m_1);
-    let row1 = f32x4::shuffle::<{[0, 1, 4, 5]}>(m_2, m_3,);
+    let tmp1 = f32x4::shuffle::<{ [0, 1, 4, 5] }>(m_0, m_1);
+    let row1 = f32x4::shuffle::<{ [0, 1, 4, 5] }>(m_2, m_3);
 
-    let row0 = f32x4::shuffle::<{[0, 2, 4, 6]}>(tmp1, row1);
-    let row1 = f32x4::shuffle::<{[1, 3, 5, 7]}>(row1, tmp1);
+    let row0 = f32x4::shuffle::<{ [0, 2, 4, 6] }>(tmp1, row1);
+    let row1 = f32x4::shuffle::<{ [1, 3, 5, 7] }>(row1, tmp1);
 
-    let tmp1 = f32x4::shuffle::<{[2, 3, 6, 7]}>(m_0, m_1);
-    let row3 = f32x4::shuffle::<{[2, 3, 6, 7]}>(m_2, m_3);
-    let row2 = f32x4::shuffle::<{[0, 2, 4, 6]}>(tmp1, row3);
-    let row3 = f32x4::shuffle::<{[1, 3, 5, 7]}>(row3, tmp1);
+    let tmp1 = f32x4::shuffle::<{ [2, 3, 6, 7] }>(m_0, m_1);
+    let row3 = f32x4::shuffle::<{ [2, 3, 6, 7] }>(m_2, m_3);
+    let row2 = f32x4::shuffle::<{ [0, 2, 4, 6] }>(tmp1, row3);
+    let row3 = f32x4::shuffle::<{ [1, 3, 5, 7] }>(row3, tmp1);
 
     let tmp1 = row2 * row3;
     // there's no syntax for a 1 arg shuffle yet,
     // so we just pass the same f32x4 twice
-    let tmp1 = f32x4::shuffle::<{[1, 0, 3, 2]}>(tmp1, tmp1);
+    let tmp1 = f32x4::shuffle::<{ [1, 0, 3, 2] }>(tmp1, tmp1);
 
     let minor0 = row1 * tmp1;
     let minor1 = row0 * tmp1;
-    let tmp1   = f32x4::shuffle::<{[2, 3, 0, 1]}>(tmp1, tmp1);
+    let tmp1 = f32x4::shuffle::<{ [2, 3, 0, 1] }>(tmp1, tmp1);
     let minor0 = (row1 * tmp1) - minor0;
     let minor1 = (row0 * tmp1) - minor1;
-    let minor1 = f32x4::shuffle::<{[2, 3, 0, 1]}>(minor1, minor1);
+    let minor1 = f32x4::shuffle::<{ [2, 3, 0, 1] }>(minor1, minor1);
 
     let tmp1 = row1 * row2;
-    let tmp1 = f32x4::shuffle::<{[1, 0, 3, 2]}>(tmp1, tmp1);
+    let tmp1 = f32x4::shuffle::<{ [1, 0, 3, 2] }>(tmp1, tmp1);
     let minor0 = (row3 * tmp1) + minor0;
     let minor3 = row0 * tmp1;
-    let tmp1 = f32x4::shuffle::<{[2, 3, 0, 1]}>(tmp1, tmp1);
+    let tmp1 = f32x4::shuffle::<{ [2, 3, 0, 1] }>(tmp1, tmp1);
 
     let minor0 = minor0 - row3 * tmp1;
     let minor3 = row0 * tmp1 - minor3;
-    let minor3 = f32x4::shuffle::<{[2, 3, 0, 1]}>(minor3, minor3);
+    let minor3 = f32x4::shuffle::<{ [2, 3, 0, 1] }>(minor3, minor3);
 
-    let tmp1 = row3 * f32x4::shuffle::<{[2, 3, 0, 1]}>(row1, row1);
-    let tmp1 = f32x4::shuffle::<{[1, 0, 3, 2]}>(tmp1, tmp1);
-    let row2 = f32x4::shuffle::<{[2, 3, 0, 1]}>(row2, row2);
+    let tmp1 = row3 * f32x4::shuffle::<{ [2, 3, 0, 1] }>(row1, row1);
+    let tmp1 = f32x4::shuffle::<{ [1, 0, 3, 2] }>(tmp1, tmp1);
+    let row2 = f32x4::shuffle::<{ [2, 3, 0, 1] }>(row2, row2);
     let minor0 = row2 * tmp1 + minor0;
     let minor2 = row0 * tmp1;
-    let tmp1 = f32x4::shuffle::<{[2, 3, 0, 1]}>(tmp1, tmp1);
+    let tmp1 = f32x4::shuffle::<{ [2, 3, 0, 1] }>(tmp1, tmp1);
     let minor0 = minor0 - row2 * tmp1;
     let minor2 = row0 * tmp1 - minor2;
-    let minor2 = f32x4::shuffle::<{[2, 3, 0, 1]}>(minor2, minor2);
+    let minor2 = f32x4::shuffle::<{ [2, 3, 0, 1] }>(minor2, minor2);
 
     let tmp1 = row0 * row1;
-    let tmp1 = f32x4::shuffle::<{[1, 0, 3, 2]}>(tmp1, tmp1);
+    let tmp1 = f32x4::shuffle::<{ [1, 0, 3, 2] }>(tmp1, tmp1);
     let minor2 = minor2 + row3 * tmp1;
     let minor3 = row2 * tmp1 - minor3;
-    let tmp1 = f32x4::shuffle::<{[2, 3, 0, 1]}>(tmp1, tmp1);
+    let tmp1 = f32x4::shuffle::<{ [2, 3, 0, 1] }>(tmp1, tmp1);
     let minor2 = row3 * tmp1 - minor2;
     let minor3 = minor3 - row2 * tmp1;
 
     let tmp1 = row0 * row3;
-    let tmp1 = f32x4::shuffle::<{[1, 0, 3, 2]}>(tmp1, tmp1);
+    let tmp1 = f32x4::shuffle::<{ [1, 0, 3, 2] }>(tmp1, tmp1);
     let minor1 = minor1 - row2 * tmp1;
     let minor2 = row1 * tmp1 + minor2;
-    let tmp1 = f32x4::shuffle::<{[2, 3, 0, 1]}>(tmp1, tmp1);
+    let tmp1 = f32x4::shuffle::<{ [2, 3, 0, 1] }>(tmp1, tmp1);
     let minor1 = row2 * tmp1 + minor1;
     let minor2 = minor2 - row1 * tmp1;
 
     let tmp1 = row0 * row2;
-    let tmp1 = f32x4::shuffle::<{[1, 0, 3, 2]}>(tmp1, tmp1);
+    let tmp1 = f32x4::shuffle::<{ [1, 0, 3, 2] }>(tmp1, tmp1);
     let minor1 = row3 * tmp1 + minor1;
     let minor3 = minor3 - row1 * tmp1;
-    let tmp1 = f32x4::shuffle::<{[2, 3, 0, 1]}>(tmp1, tmp1);
+    let tmp1 = f32x4::shuffle::<{ [2, 3, 0, 1] }>(tmp1, tmp1);
     let minor1 = minor1 - row3 * tmp1;
     let minor3 = row1 * tmp1 + minor3;
 
     let det = row0 * minor0;
-    let det = f32x4::shuffle::<{[2, 3, 0, 1]}>(det, det) + det;
-    let det = f32x4::shuffle::<{[1, 0, 3, 2]}>(det, det) + det;
+    let det = f32x4::shuffle::<{ [2, 3, 0, 1] }>(det, det) + det;
+    let det = f32x4::shuffle::<{ [1, 0, 3, 2] }>(det, det) + det;
 
     if det.horizontal_sum() == 0. {
         return None;
@@ -256,7 +259,6 @@ pub fn simd_inv4x4(m: Matrix4x4) -> Option<Matrix4x4> {
     Some(Matrix4x4(m))
 }
 
-
 #[cfg(test)]
 #[rustfmt::skip]
 mod tests {
@@ -313,7 +315,6 @@ mod tests {
     }
 }
 
-
 fn main() {
     // Empty main to make cargo happy
 }
diff --git a/crates/core_simd/src/lib.rs b/crates/core_simd/src/lib.rs
@@ -1,12 +1,12 @@
 #![no_std]
 #![allow(incomplete_features)]
 #![feature(
-    const_generics, 
+    const_generics,
     platform_intrinsics,
     repr_simd,
     simd_ffi,
     staged_api,
-    stdsimd,
+    stdsimd
 )]
 #![warn(missing_docs)]
 #![unstable(feature = "portable_simd", issue = "86656")]
diff --git a/crates/core_simd/src/vector/float.rs b/crates/core_simd/src/vector/float.rs
@@ -174,7 +174,7 @@ macro_rules! impl_float_vector {
             }
 
             /// Restrict each lane to a certain interval unless it is NaN.
-            /// 
+            ///
             /// For each lane in `self`, returns the corresponding lane in `max` if the lane is
             /// greater than `max`, and the corresponding lane in `min` if the lane is less
             /// than `min`.  Otherwise returns the lane in `self`.
diff --git a/crates/core_simd/tests/to_bytes.rs b/crates/core_simd/tests/to_bytes.rs
diff --git a/crates/test_helpers/src/lib.rs b/crates/test_helpers/src/lib.rs

Original file line number	Diff line number	Diff line change
`@@ -174,7 +174,7 @@ macro_rules! impl_float_vector {`
`174`	`174`	`}`
`175`	`175`
`176`	`176`	`/// Restrict each lane to a certain interval unless it is NaN.`
`177`		`- ///`
	`177`	`+ ///`
`178`	`178`	/// For each lane in `self`, returns the corresponding lane in `max` if the lane is
`179`	`179`	/// greater than `max`, and the corresponding lane in `min` if the lane is less
`180`	`180`	/// than `min`. Otherwise returns the lane in `self`.