Use the #[rustfmt::skip] attribute instead of rustfmt_skip.

nalgebra-glm/src/constructors.rs

@@ -1,9 +1,8 @@
-#![cfg_attr(rustfmt, rustfmt_skip)]
+use crate::aliases::{
-
+    Qua, TMat, TMat2, TMat2x3, TMat2x4, TMat3, TMat3x2, TMat3x4, TMat4, TMat4x2, TMat4x3, TVec1,
-use na::{Scalar, RealField, U2, U3, U4};
+    TVec2, TVec3, TVec4,
-use crate::aliases::{TMat, Qua, TVec1, TVec2, TVec3, TVec4, TMat2, TMat2x3, TMat2x4, TMat3, TMat3x2, TMat3x4,
+};
-              TMat4, TMat4x2, TMat4x3};
+use na::{RealField, Scalar, U2, U3, U4};
-
 
 /// Creates a new 1D vector.
 ///
@@ -34,8 +33,8 @@ pub fn vec4<N: Scalar>(x: N, y: N, z: N, w: N) -> TVec4<N> {
     TVec4::new(x, y, z, w)
 }
 
-
 /// Create a new 2x2 matrix.
+#[rustfmt::skip]
 pub fn mat2<N: Scalar>(m11: N, m12: N,
                        m21: N, m22: N) -> TMat2<N> {
     TMat::<N, U2, U2>::new(
@@ -45,6 +44,7 @@ pub fn mat2<N: Scalar>(m11: N, m12: N,
 }
 
 /// Create a new 2x2 matrix.
+#[rustfmt::skip]
 pub fn mat2x2<N: Scalar>(m11: N, m12: N,
                          m21: N, m22: N) -> TMat2<N> {
     TMat::<N, U2, U2>::new(
@@ -54,6 +54,7 @@ pub fn mat2x2<N: Scalar>(m11: N, m12: N,
 }
 
 /// Create a new 2x3 matrix.
+#[rustfmt::skip]
 pub fn mat2x3<N: Scalar>(m11: N, m12: N, m13: N,
                          m21: N, m22: N, m23: N) -> TMat2x3<N> {
     TMat::<N, U2, U3>::new(
@@ -63,6 +64,7 @@ pub fn mat2x3<N: Scalar>(m11: N, m12: N, m13: N,
 }
 
 /// Create a new 2x4 matrix.
+#[rustfmt::skip]
 pub fn mat2x4<N: Scalar>(m11: N, m12: N, m13: N, m14: N,
                          m21: N, m22: N, m23: N, m24: N) -> TMat2x4<N> {
     TMat::<N, U2, U4>::new(
@@ -72,6 +74,7 @@ pub fn mat2x4<N: Scalar>(m11: N, m12: N, m13: N, m14: N,
 }
 
 /// Create a new 3x3 matrix.
+#[rustfmt::skip]
 pub fn mat3<N: Scalar>(m11: N, m12: N, m13: N,
                        m21: N, m22: N, m23: N,
                        m31: N, m32: N, m33: N) -> TMat3<N> {
@@ -83,6 +86,7 @@ pub fn mat3<N: Scalar>(m11: N, m12: N, m13: N,
 }
 
 /// Create a new 3x2 matrix.
+#[rustfmt::skip]
 pub fn mat3x2<N: Scalar>(m11: N, m12: N,
                          m21: N, m22: N,
                          m31: N, m32: N) -> TMat3x2<N> {
@@ -94,6 +98,7 @@ pub fn mat3x2<N: Scalar>(m11: N, m12: N,
 }
 
 /// Create a new 3x3 matrix.
+#[rustfmt::skip]
 pub fn mat3x3<N: Scalar>(m11: N, m12: N, m13: N,
                          m21: N, m22: N, m23: N,
                          m31: N, m32: N, m33: N) -> TMat3<N> {
@@ -105,6 +110,7 @@ pub fn mat3x3<N: Scalar>(m11: N, m12: N, m13: N,
 }
 
 /// Create a new 3x4 matrix.
+#[rustfmt::skip]
 pub fn mat3x4<N: Scalar>(m11: N, m12: N, m13: N, m14: N,
                          m21: N, m22: N, m23: N, m24: N,
                          m31: N, m32: N, m33: N, m34: N) -> TMat3x4<N> {
@@ -116,6 +122,7 @@ pub fn mat3x4<N: Scalar>(m11: N, m12: N, m13: N, m14: N,
 }
 
 /// Create a new 4x2 matrix.
+#[rustfmt::skip]
 pub fn mat4x2<N: Scalar>(m11: N, m12: N,
                          m21: N, m22: N,
                          m31: N, m32: N,
@@ -129,6 +136,7 @@ pub fn mat4x2<N: Scalar>(m11: N, m12: N,
 }
 
 /// Create a new 4x3 matrix.
+#[rustfmt::skip]
 pub fn mat4x3<N: Scalar>(m11: N, m12: N, m13: N,
                          m21: N, m22: N, m23: N,
                          m31: N, m32: N, m33: N,
@@ -142,6 +150,7 @@ pub fn mat4x3<N: Scalar>(m11: N, m12: N, m13: N,
 }
 
 /// Create a new 4x4 matrix.
+#[rustfmt::skip]
 pub fn mat4x4<N: Scalar>(m11: N, m12: N, m13: N, m14: N,
                          m21: N, m22: N, m23: N, m24: N,
                          m31: N, m32: N, m33: N, m34: N,
@@ -155,6 +164,7 @@ pub fn mat4x4<N: Scalar>(m11: N, m12: N, m13: N, m14: N,
 }
 
 /// Create a new 4x4 matrix.
+#[rustfmt::skip]
 pub fn mat4<N: Scalar>(m11: N, m12: N, m13: N, m14: N,
                        m21: N, m22: N, m23: N, m24: N,
                        m31: N, m32: N, m33: N, m34: N,

tests/core/edition.rs

@@ -1,13 +1,11 @@
-#![cfg_attr(rustfmt, rustfmt_skip)]
+use na::{
-
+    DMatrix, Matrix, Matrix3, Matrix3x4, Matrix3x5, Matrix4, Matrix4x3, Matrix4x5, Matrix5,
-use na::{Matrix,
+    Matrix5x3, Matrix5x4,
-         DMatrix,
+};
-         Matrix3, Matrix4, Matrix5,
-         Matrix4x3, Matrix3x4, Matrix5x3, Matrix3x5, Matrix4x5, Matrix5x4};
 use na::{Dynamic, U2, U3, U5};
 
-
 #[test]
+#[rustfmt::skip]
 fn upper_lower_triangular() {
     let m = Matrix4::new(
         11.0, 12.0, 13.0, 14.0,
@@ -173,6 +171,7 @@ fn upper_lower_triangular() {
 }
 
 #[test]
+#[rustfmt::skip]
 fn swap_rows() {
     let mut m = Matrix5x3::new(
         11.0, 12.0, 13.0,
@@ -194,6 +193,7 @@ fn swap_rows() {
 }
 
 #[test]
+#[rustfmt::skip]
 fn swap_columns() {
     let mut m = Matrix3x5::new(
         11.0, 12.0, 13.0, 14.0, 15.0,
@@ -211,6 +211,7 @@ fn swap_columns() {
 }
 
 #[test]
+#[rustfmt::skip]
 fn remove_columns() {
     let m = Matrix3x5::new(
         11, 12, 13, 14, 15,
@@ -261,6 +262,7 @@ fn remove_columns() {
 }
 
 #[test]
+#[rustfmt::skip]
 fn remove_columns_at() {
     let m = DMatrix::from_row_slice(5, 5, &[
         11, 12, 13, 14, 15,
@@ -317,8 +319,8 @@ fn remove_columns_at() {
     assert_eq!(m.remove_columns_at(&[0,3,4]), expected3);
 }
 
-
 #[test]
+#[rustfmt::skip]
 fn remove_rows() {
     let m = Matrix5x3::new(
         11, 12, 13,
@@ -374,6 +376,7 @@ fn remove_rows() {
 }
 
 #[test]
+#[rustfmt::skip]
 fn remove_rows_at() {
     let m = DMatrix::from_row_slice(5, 5, &[
         11, 12, 13, 14, 15,
@@ -424,8 +427,8 @@ fn remove_rows_at() {
     assert_eq!(m.remove_rows_at(&[0,3,4]), expected3);
 }
 
-
 #[test]
+#[rustfmt::skip]
 fn insert_columns() {
     let m = Matrix5x3::new(
         11, 12, 13,
@@ -490,6 +493,7 @@ fn insert_columns() {
 }
 
 #[test]
+#[rustfmt::skip]
 fn insert_columns_to_empty_matrix() {
     let m1 = DMatrix::repeat(0, 0, 0);
     let m2 = DMatrix::repeat(3, 0, 0);
@@ -502,6 +506,7 @@ fn insert_columns_to_empty_matrix() {
 }
 
 #[test]
+#[rustfmt::skip]
 fn insert_rows() {
     let m = Matrix3x5::new(
         11, 12, 13, 14, 15,
@@ -573,6 +578,7 @@ fn insert_rows_to_empty_matrix() {
 }
 
 #[test]
+#[rustfmt::skip]
 fn resize() {
     let m = Matrix3x5::new(
         11, 12, 13, 14, 15,

tests/core/matrix_slice.rs

@@ -1,18 +1,15 @@
 #![allow(non_snake_case)]
-#![cfg_attr(rustfmt, rustfmt_skip)]
 
+use na::{
+    DMatrix, DMatrixSlice, DMatrixSliceMut, Matrix2, Matrix2x3, Matrix2x4, Matrix2x6, Matrix3,
+    Matrix3x2, Matrix3x4, Matrix4x2, Matrix6x2, MatrixSlice2, MatrixSlice2x3, MatrixSlice2xX,
+    MatrixSlice3, MatrixSlice3x2, MatrixSliceMut2, MatrixSliceMut2x3, MatrixSliceMut2xX,
+    MatrixSliceMut3, MatrixSliceMut3x2, MatrixSliceMutXx3, MatrixSliceXx3, RowVector4, Vector3,
+};
 use na::{U2, U3, U4};
-use na::{DMatrix,
-         RowVector4,
-         Vector3,
-         Matrix2, Matrix3,
-         Matrix2x3, Matrix3x2, Matrix3x4, Matrix4x2, Matrix2x4, Matrix6x2, Matrix2x6,
-         MatrixSlice2, MatrixSlice3, MatrixSlice2x3, MatrixSlice3x2,
-         MatrixSliceXx3, MatrixSlice2xX, DMatrixSlice,
-         MatrixSliceMut2, MatrixSliceMut3, MatrixSliceMut2x3, MatrixSliceMut3x2,
-         MatrixSliceMutXx3, MatrixSliceMut2xX, DMatrixSliceMut};
 
 #[test]
+#[rustfmt::skip]
 fn nested_fixed_slices() {
     let a = Matrix3x4::new(11.0, 12.0, 13.0, 14.0,
                            21.0, 22.0, 23.0, 24.0,
@@ -38,6 +35,7 @@ fn nested_fixed_slices() {
 }
 
 #[test]
+#[rustfmt::skip]
 fn nested_slices() {
     let a = Matrix3x4::new(11.0, 12.0, 13.0, 14.0,
                            21.0, 22.0, 23.0, 24.0,
@@ -63,6 +61,7 @@ fn nested_slices() {
 }
 
 #[test]
+#[rustfmt::skip]
 fn slice_mut() {
     let mut a = Matrix3x4::new(11.0, 12.0, 13.0, 14.0,
                                21.0, 22.0, 23.0, 24.0,
@@ -82,6 +81,7 @@ fn slice_mut() {
 }
 
 #[test]
+#[rustfmt::skip]
 fn nested_row_slices() {
     let a = Matrix6x2::new(11.0, 12.0,
                            21.0, 22.0,
@@ -105,6 +105,7 @@ fn nested_row_slices() {
 }
 
 #[test]
+#[rustfmt::skip]
 fn row_slice_mut() {
     let mut a = Matrix6x2::new(11.0, 12.0,
                                21.0, 22.0,
@@ -129,6 +130,7 @@ fn row_slice_mut() {
 }
 
 #[test]
+#[rustfmt::skip]
 fn nested_col_slices() {
     let a = Matrix2x6::new(11.0, 12.0, 13.0, 14.0, 15.0, 16.0,
                            21.0, 22.0, 23.0, 24.0, 25.0, 26.0);
@@ -146,6 +148,7 @@ fn nested_col_slices() {
 }
 
 #[test]
+#[rustfmt::skip]
 fn col_slice_mut() {
     let mut a = Matrix2x6::new(11.0, 12.0, 13.0, 14.0, 15.0, 16.0,
                                21.0, 22.0, 23.0, 24.0, 25.0, 26.0);
@@ -163,6 +166,7 @@ fn col_slice_mut() {
 }
 
 #[test]
+#[rustfmt::skip]
 fn rows_range_pair() {
     let a = Matrix3x4::new(11.0, 12.0, 13.0, 14.0,
                            21.0, 22.0, 23.0, 24.0,
@@ -180,6 +184,7 @@ fn rows_range_pair() {
 }
 
 #[test]
+#[rustfmt::skip]
 fn columns_range_pair() {
     let a = Matrix3x4::new(11.0, 12.0, 13.0, 14.0,
                            21.0, 22.0, 23.0, 24.0,
@@ -198,6 +203,7 @@ fn columns_range_pair() {
 }
 
 #[test]
+#[rustfmt::skip]
 fn new_slice() {
     let data = [ 1.0, 2.0,  3.0,  4.0,
                  5.0, 6.0,  7.0,  8.0,
@@ -228,6 +234,7 @@ fn new_slice() {
 }
 
 #[test]
+#[rustfmt::skip]
 fn new_slice_mut() {
     let data = [ 1.0, 2.0,  3.0,  4.0,
                  5.0, 6.0,  7.0,  8.0,

tests/core/mod.rs

@@ -3,9 +3,9 @@ mod abomonation;
 mod blas;
 mod conversion;
 mod edition;
+mod empty;
 mod matrix;
 mod matrix_slice;
-mod empty;
 #[cfg(feature = "mint")]
 mod mint;
 mod serde;

tests/linalg/eigen.rs

@@ -1,5 +1,3 @@
-#![cfg_attr(rustfmt, rustfmt_skip)]
-
 use na::DMatrix;
 
 #[cfg(feature = "arbitrary")]
@@ -67,6 +65,7 @@ mod quickcheck_tests {
 
 // Test proposed on the issue #176 of rulinalg.
 #[test]
+#[rustfmt::skip]
 fn symmetric_eigen_singular_24x24() {
     let m = DMatrix::from_row_slice(
         24,

tests/linalg/full_piv_lu.rs

@@ -1,8 +1,7 @@
-#![cfg_attr(rustfmt, rustfmt_skip)]
-
 use na::Matrix3;
 
 #[test]
+#[rustfmt::skip]
 fn full_piv_lu_simple() {
     let m = Matrix3::new(
         2.0, -1.0,  0.0,
@@ -22,11 +21,11 @@ fn full_piv_lu_simple() {
 }
 
 #[test]
+#[rustfmt::skip]
 fn full_piv_lu_simple_with_pivot() {
-    let m = Matrix3::new(
+    let m = Matrix3::new(0.0, -1.0, 2.0,
-        0.0, -1.0,  2.0,
+                                        -1.0, 2.0, -1.0,
-       -1.0,  2.0, -1.0,
+                                        2.0, -1.0, 0.0);
-        2.0, -1.0,  0.0);
 
     let lu = m.full_piv_lu();
     assert_eq!(lu.determinant(), -4.0);
@@ -175,7 +174,6 @@ mod quickcheck_tests {
     gen_tests!(f64, RandScalar<f64>);
 }
 
-
 /*
 #[test]
 fn swap_rows() {

tests/linalg/inverse.rs

@@ -1,5 +1,3 @@
-#![cfg_attr(rustfmt, rustfmt_skip)]
-
 use na::{Matrix1, Matrix2, Matrix3, Matrix4, Matrix5};
 
 #[test]
@@ -11,6 +9,7 @@ fn matrix1_try_inverse() {
 }
 
 #[test]
+#[rustfmt::skip]
 fn matrix2_try_inverse() {
     let a = Matrix2::new(  5.0,  -2.0,
                          -10.0,   1.0);
@@ -23,6 +22,7 @@ fn matrix2_try_inverse() {
 }
 
 #[test]
+#[rustfmt::skip]
 fn matrix3_try_inverse() {
     let a = Matrix3::new(-3.0,  2.0,  0.0,
                          -6.0,  9.0, -2.0,
@@ -37,6 +37,7 @@ fn matrix3_try_inverse() {
 }
 
 #[test]
+#[rustfmt::skip]
 fn matrix4_try_inverse_issue_214() {
     let m1 = Matrix4::new(
         -0.34727043,         0.00000005397217,   -0.000000000000003822135, -0.000000000000003821371,
@@ -58,6 +59,7 @@ fn matrix4_try_inverse_issue_214() {
 }
 
 #[test]
+#[rustfmt::skip]
 fn matrix5_try_inverse() {
     // Dimension 5 is chosen so that the inversion happens by Gaussian elimination.
     // (at the time of writing dimensions <= 3 are implemented as analytic formulas, but we choose
@@ -90,6 +92,7 @@ fn matrix1_try_inverse_scaled_identity() {
 }
 
 #[test]
+#[rustfmt::skip]
 fn matrix2_try_inverse_scaled_identity() {
     // A perfectly invertible matrix with
     // very small coefficients
@@ -103,6 +106,7 @@ fn matrix2_try_inverse_scaled_identity() {
 }
 
 #[test]
+#[rustfmt::skip]
 fn matrix3_try_inverse_scaled_identity() {
     // A perfectly invertible matrix with
     // very small coefficients
@@ -118,6 +122,7 @@ fn matrix3_try_inverse_scaled_identity() {
 }
 
 #[test]
+#[rustfmt::skip]
 fn matrix5_try_inverse_scaled_identity() {
     // A perfectly invertible matrix with
     // very small coefficients

tests/linalg/lu.rs

@@ -1,8 +1,7 @@
-#![cfg_attr(rustfmt, rustfmt_skip)]
-
 use na::Matrix3;
 
 #[test]
+#[rustfmt::skip]
 fn lu_simple() {
     let m = Matrix3::new(
         2.0, -1.0,  0.0,
@@ -21,6 +20,7 @@ fn lu_simple() {
 }
 
 #[test]
+#[rustfmt::skip]
 fn lu_simple_with_pivot() {
     let m = Matrix3::new(
         0.0, -1.0,  2.0,
@@ -41,7 +41,7 @@ fn lu_simple_with_pivot() {
 #[cfg(feature = "arbitrary")]
 mod quickcheck_tests {
     #[allow(unused_imports)]
-    use crate::core::helper::{RandScalar, RandComplex};
+    use crate::core::helper::{RandComplex, RandScalar};
 
     macro_rules! gen_tests(
         ($module: ident, $scalar: ty) => {

tests/linalg/schur.rs

@@ -1,12 +1,11 @@
-#![cfg_attr(rustfmt, rustfmt_skip)]
-
 use na::{DMatrix, Matrix3, Matrix4};
 
 #[test]
+#[rustfmt::skip]
 fn schur_simpl_mat3() {
     let m = Matrix3::new(-2.0, -4.0, 2.0,
-                         -2.0,  1.0, 2.0,
+                                        -2.0,  1.0, 2.0,
-                          4.0,  2.0, 5.0);
+                                        4.0,  2.0, 5.0);
 
     let schur = m.schur();
     let (vecs, vals) = schur.unpack();
@@ -83,6 +82,7 @@ mod quickcheck_tests {
 }
 
 #[test]
+#[rustfmt::skip]
 fn schur_static_mat4_fail() {
     let m = Matrix4::new(
          33.32699857679677,  46.794945978960044, -20.792148817005838,   84.73945485997737,
@@ -95,6 +95,7 @@ fn schur_static_mat4_fail() {
 }
 
 #[test]
+#[rustfmt::skip]
 fn schur_static_mat4_fail2() {
     let m = Matrix4::new(
         14.623586538485966, 7.646156622760756, -52.11923331576265, -97.50030223503413,
@@ -107,6 +108,7 @@ fn schur_static_mat4_fail2() {
 }
 
 #[test]
+#[rustfmt::skip]
 fn schur_static_mat3_fail() {
     let m = Matrix3::new(
         -21.58457553143394,   -67.3881542667948, -14.619829849784338,
@@ -119,6 +121,7 @@ fn schur_static_mat3_fail() {
 
 // Test proposed on the issue #176 of rulinalg.
 #[test]
+#[rustfmt::skip]
 fn schur_singular() {
     let m = DMatrix::from_row_slice(24, 24, &[
         1.0,  1.0,  1.0,  1.0,  1.0,  1.0,  0.0,  1.0,  1.0,  0.0,  0.0,  0.0,  0.0,  0.0,  0.0,  0.0,  0.0,  0.0,  0.0,  0.0,  0.0,  0.0,  0.0,  0.0,

tests/linalg/svd.rs

@@ -1,4 +1,3 @@
-#![cfg_attr(rustfmt, rustfmt_skip)]
 use na::{DMatrix, Matrix6};
 
 #[cfg(feature = "arbitrary")]
@@ -160,9 +159,9 @@ mod quickcheck_tests {
     gen_tests!(f64, RandScalar<f64>);
 }
 
-
 // Test proposed on the issue #176 of rulinalg.
 #[test]
+#[rustfmt::skip]
 fn svd_singular() {
     let m = DMatrix::from_row_slice(24, 24, &[
         1.0,  1.0,  1.0,  1.0,  1.0,  1.0,  0.0,  1.0,  1.0,  0.0,  0.0,  0.0,  0.0,  0.0,  0.0,  0.0,  0.0,  0.0,  0.0,  0.0,  0.0,  0.0,  0.0,  0.0,
@@ -202,6 +201,7 @@ fn svd_singular() {
 
 // Same as the previous test but with one additional row.
 #[test]
+#[rustfmt::skip]
 fn svd_singular_vertical() {
     let m = DMatrix::from_row_slice(25, 24, &[
         1.0,  1.0,  1.0,  1.0,  1.0,  1.0,  0.0,  1.0,  1.0,  0.0,  0.0,  0.0,  0.0,  0.0,  0.0,  0.0,  0.0,  0.0,  0.0,  0.0,  0.0,  0.0,  0.0,  0.0,
@@ -241,6 +241,7 @@ fn svd_singular_vertical() {
 
 // Same as the previous test but with one additional column.
 #[test]
+#[rustfmt::skip]
 fn svd_singular_horizontal() {
     let m = DMatrix::from_row_slice(24, 25, &[
         1.0,  1.0,  1.0,  1.0,  1.0,  1.0,  0.0,  1.0,  1.0,  0.0,  0.0,  0.0,  0.0,  0.0,  0.0,  0.0,  0.0,  0.0,  0.0,  0.0,  0.0,  0.0,  0.0,  0.0,   0.0,
@@ -299,6 +300,7 @@ fn svd_identity() {
 }
 
 #[test]
+#[rustfmt::skip]
 fn svd_with_delimited_subproblem() {
     let mut m = DMatrix::<f64>::from_element(10, 10, 0.0);
     m[(0,0)] = 1.0;  m[(0,1)] = 2.0;
@@ -334,6 +336,7 @@ fn svd_with_delimited_subproblem() {
 }
 
 #[test]
+#[rustfmt::skip]
 fn svd_fail() {
     let m = Matrix6::new(
         0.9299319121545955,   0.9955870335651049,   0.8824725266413644,  0.28966880207132295,  0.06102723649846409,   0.9311880746048009,
@@ -351,6 +354,12 @@ fn svd_fail() {
 fn svd_err() {
     let m = DMatrix::from_element(10, 10, 0.0);
     let svd = m.clone().svd(false, false);
-    assert_eq!(Err("SVD recomposition: U and V^t have not been computed."), svd.clone().recompose());
+    assert_eq!(
-    assert_eq!(Err("SVD pseudo inverse: the epsilon must be non-negative."), svd.clone().pseudo_inverse(-1.0));
+        Err("SVD recomposition: U and V^t have not been computed."),
-}
+        svd.clone().recompose()
+    );
+    assert_eq!(
+        Err("SVD pseudo inverse: the epsilon must be non-negative."),
+        svd.clone().pseudo_inverse(-1.0)
+    );
+}