Merge pull request #109 from termoshtt/format

Format using rustfmt 0.6

Author: termoshtt

examples/eigh.rs

@@ -1,4 +1,3 @@
-
 extern crate ndarray;
 extern crate ndarray_linalg;
 

examples/solve.rs

@@ -1,4 +1,3 @@
-
 extern crate ndarray;
 extern crate ndarray_linalg;
 

examples/solveh.rs

@@ -1,4 +1,3 @@
-
 extern crate ndarray;
 extern crate ndarray_linalg;
 

rustfmt.toml

@@ -1,68 +1,56 @@
-verbose = false
-disable_all_formatting = false
-skip_children = false
 max_width = 120
-error_on_line_overflow = true
+hard_tabs = false
 tab_spaces = 4
-fn_call_width = 60
-struct_lit_width = 18
-struct_variant_width = 35
-force_explicit_abi = true
 newline_style = "Unix"
-fn_brace_style = "SameLineWhere"
-item_brace_style = "SameLineWhere"
-control_style = "Rfc"
-control_brace_style = "AlwaysSameLine"
-impl_empty_single_line = true
-trailing_comma = "Vertical"
-fn_empty_single_line = true
+use_small_heuristics = true
+indent_style = "Block"
+wrap_comments = false
+comment_width = 100
+normalize_comments = false
+format_strings = false
+empty_item_single_line = true
+struct_lit_single_line = true
 fn_single_line = false
-fn_return_indent = "WithArgs"
-fn_args_paren_newline = false
-fn_args_density = "Tall"
-fn_args_layout = "Block"
-array_layout = "Block"
-array_width = 60
-type_punctuation_density = "Wide"
-where_style = "Rfc"
-where_density = "CompressedIfEmpty"
-where_layout = "Vertical"
-where_pred_indent = "Visual"
-generics_indent = "Block"
-struct_lit_style = "Block"
-struct_lit_multiline_style = "PreferSingle"
-fn_call_style = "Block"
-report_todo = "Never"
-report_fixme = "Never"
-chain_indent = "Block"
-chain_one_line_max = 60
-chain_split_single_child = false
+where_single_line = false
+imports_indent = "Visual"
+imports_layout = "Mixed"
+merge_imports = false
 reorder_imports = true
-reorder_imports_in_group = true
-reorder_imported_names = true
-single_line_if_else_max_width = 50
-format_strings = false
-force_format_strings = false
-take_source_hints = false
-hard_tabs = false
-wrap_comments = false
-comment_width = 80
-normalize_comments = true
-wrap_match_arms = true
-match_block_trailing_comma = false
-indent_match_arms = true
-closure_block_indent_threshold = 7
-space_before_type_annotation = false
-space_after_type_annotation_colon = true
-space_before_struct_lit_field_colon = false
-space_after_struct_lit_field_colon = true
-space_before_bound = false
-space_after_bound_colon = true
+reorder_modules = true
+reorder_impl_items = false
+type_punctuation_density = "Wide"
+space_before_colon = false
+space_after_colon = true
 spaces_around_ranges = false
-spaces_within_angle_brackets = false
-spaces_within_square_brackets = false
-spaces_within_parens = false
-use_try_shorthand = true
-write_mode = "Replace"
-condense_wildcard_suffixes = false
+spaces_within_parens_and_brackets = false
+binop_separator = "Front"
+remove_blank_lines_at_start_or_end_of_block = true
 combine_control_expr = true
+struct_field_align_threshold = 0
+match_arm_blocks = true
+force_multiline_blocks = false
+fn_args_density = "Tall"
+brace_style = "SameLineWhere"
+control_brace_style = "AlwaysSameLine"
+trailing_semicolon = true
+trailing_comma = "Vertical"
+match_block_trailing_comma = false
+blank_lines_upper_bound = 1
+blank_lines_lower_bound = 0
+merge_derives = true
+use_try_shorthand = false
+condense_wildcard_suffixes = false
+force_explicit_abi = true
+use_field_init_shorthand = false
+write_mode = "Overwrite"
+color = "Auto"
+unstable_features = false
+disable_all_formatting = false
+skip_children = false
+hide_parse_errors = false
+error_on_line_overflow = false
+error_on_unformatted = false
+report_todo = "Never"
+report_fixme = "Never"
+ignore = []
+verbose_diff = false

src/assert.rs

@@ -8,13 +8,21 @@ use super::types::*;
 /// check two values are close in terms of the relative torrence
 pub fn rclose<A: Scalar>(test: A, truth: A, rtol: A::Real) -> Result<A::Real, A::Real> {
     let dev = (test - truth).abs() / truth.abs();
-    if dev < rtol { Ok(dev) } else { Err(dev) }
+    if dev < rtol {
+        Ok(dev)
+    } else {
+        Err(dev)
+    }
 }
 
 /// check two values are close in terms of the absolute torrence
 pub fn aclose<A: Scalar>(test: A, truth: A, atol: A::Real) -> Result<A::Real, A::Real> {
     let dev = (test - truth).abs();
-    if dev < atol { Ok(dev) } else { Err(dev) }
+    if dev < atol {
+        Ok(dev)
+    } else {
+        Err(dev)
+    }
 }
 
 /// check two arrays are close in maximum norm
@@ -30,7 +38,11 @@ where
     D: Dimension,
 {
     let tol = (test - truth).norm_max();
-    if tol < atol { Ok(tol) } else { Err(tol) }
+    if tol < atol {
+        Ok(tol)
+    } else {
+        Err(tol)
+    }
 }
 
 /// check two arrays are close in L1 norm
@@ -46,7 +58,11 @@ where
     D: Dimension,
 {
     let tol = (test - truth).norm_l1() / truth.norm_l1();
-    if tol < rtol { Ok(tol) } else { Err(tol) }
+    if tol < rtol {
+        Ok(tol)
+    } else {
+        Err(tol)
+    }
 }
 
 /// check two arrays are close in L2 norm
@@ -62,21 +78,26 @@ where
     D: Dimension,
 {
     let tol = (test - truth).norm_l2() / truth.norm_l2();
-    if tol < rtol { Ok(tol) } else { Err(tol) }
+    if tol < rtol {
+        Ok(tol)
+    } else {
+        Err(tol)
+    }
 }
 
 macro_rules! generate_assert {
     ($assert:ident, $close:path) => {
-#[macro_export]
-macro_rules! $assert {
-    ($test:expr, $truth:expr, $tol:expr) => {
-        $crate::$close($test, $truth, $tol).unwrap();
+        #[macro_export]
+        macro_rules! $assert {
+            ($test: expr,$truth: expr,$tol: expr) => {
+                $crate::$close($test, $truth, $tol).unwrap();
+            };
+            ($test: expr,$truth: expr,$tol: expr; $comment: expr) => {
+                $crate::$close($test, $truth, $tol).expect($comment);
+            };
+        }
     };
-    ($test:expr, $truth:expr, $tol:expr; $comment:expr) => {
-        $crate::$close($test, $truth, $tol).expect($comment);
-    };
-}
-}} // generate_assert!
+} // generate_assert!
 
 generate_assert!(assert_rclose, rclose);
 generate_assert!(assert_aclose, aclose);

src/cholesky.rs

@@ -408,7 +408,6 @@ pub trait DeterminantC {
     fn ln_detc(&self) -> Self::Output;
 }
 
-
 /// Determinant of Hermitian (or real symmetric) positive definite matrix
 pub trait DeterminantCInto {
     type Output;

src/convert.rs

@@ -93,11 +93,7 @@ where
     } else {
         ArrayBase::from_shape_vec(a.dim().f(), a.into_raw_vec()).unwrap()
     };
-    assert_eq!(
-        new.strides(),
-        strides.as_slice(),
-        "Custom stride is not supported"
-    );
+    assert_eq!(new.strides(), strides.as_slice(), "Custom stride is not supported");
     new
 }
 

src/eigh.rs

@@ -2,12 +2,12 @@
 
 use ndarray::*;
 
-use super::UPLO;
 use super::diagonal::*;
 use super::error::*;
 use super::layout::*;
 use super::operator::*;
 use super::types::*;
+use super::UPLO;
 
 /// Eigenvalue decomposition of Hermite matrix reference
 pub trait Eigh {

src/lapack_traits/cholesky.rs

@@ -6,7 +6,7 @@ use error::*;
 use layout::MatrixLayout;
 use types::*;
 
-use super::{UPLO, into_result};
+use super::{into_result, UPLO};
 
 pub trait Cholesky_: Sized {
     /// Cholesky: wrapper of `*potrf`
@@ -23,28 +23,29 @@ pub trait Cholesky_: Sized {
 
 macro_rules! impl_cholesky {
     ($scalar:ty, $trf:path, $tri:path, $trs:path) => {
-impl Cholesky_ for $scalar {
-    unsafe fn cholesky(l: MatrixLayout, uplo: UPLO, a: &mut [Self]) -> Result<()> {
-        let (n, _) = l.size();
-        let info = $trf(l.lapacke_layout(), uplo as u8, n, a, n);
-        into_result(info, ())
-    }
-
-    unsafe fn inv_cholesky(l: MatrixLayout, uplo: UPLO, a: &mut [Self]) -> Result<()> {
-        let (n, _) = l.size();
-        let info = $tri(l.lapacke_layout(), uplo as u8, n, a, l.lda());
-        into_result(info, ())
-    }
-
-    unsafe fn solve_cholesky(l: MatrixLayout, uplo: UPLO, a: &[Self], b: &mut [Self]) -> Result<()> {
-        let (n, _) = l.size();
-        let nrhs = 1;
-        let ldb = 1;
-        let info = $trs(l.lapacke_layout(), uplo as u8, n, nrhs, a, l.lda(), b, ldb);
-        into_result(info, ())
-    }
-}
-}} // end macro_rules
+        impl Cholesky_ for $scalar {
+            unsafe fn cholesky(l: MatrixLayout, uplo: UPLO, a: &mut [Self]) -> Result<()> {
+                let (n, _) = l.size();
+                let info = $trf(l.lapacke_layout(), uplo as u8, n, a, n);
+                into_result(info, ())
+            }
+
+            unsafe fn inv_cholesky(l: MatrixLayout, uplo: UPLO, a: &mut [Self]) -> Result<()> {
+                let (n, _) = l.size();
+                let info = $tri(l.lapacke_layout(), uplo as u8, n, a, l.lda());
+                into_result(info, ())
+            }
+
+            unsafe fn solve_cholesky(l: MatrixLayout, uplo: UPLO, a: &[Self], b: &mut [Self]) -> Result<()> {
+                let (n, _) = l.size();
+                let nrhs = 1;
+                let ldb = 1;
+                let info = $trs(l.lapacke_layout(), uplo as u8, n, nrhs, a, l.lda(), b, ldb);
+                into_result(info, ())
+            }
+        }
+    };
+} // end macro_rules
 
 impl_cholesky!(f64, lapacke::dpotrf, lapacke::dpotri, lapacke::dpotrs);
 impl_cholesky!(f32, lapacke::spotrf, lapacke::spotri, lapacke::spotrs);

src/lapack_traits/eigh.rs

@@ -7,7 +7,7 @@ use error::*;
 use layout::MatrixLayout;
 use types::*;
 
-use super::{UPLO, into_result};
+use super::{into_result, UPLO};
 
 /// Wraps `*syev` for real and `*heev` for complex
 pub trait Eigh_: AssociatedReal {
@@ -16,16 +16,17 @@ pub trait Eigh_: AssociatedReal {
 
 macro_rules! impl_eigh {
     ($scalar:ty, $ev:path) => {
-impl Eigh_ for $scalar {
-    unsafe fn eigh(calc_v: bool, l: MatrixLayout, uplo: UPLO, mut a: &mut [Self]) -> Result<Vec<Self::Real>> {
-        let (n, _) = l.size();
-        let jobz = if calc_v { b'V' } else { b'N' };
-        let mut w = vec![Self::Real::zero(); n as usize];
-        let info = $ev(l.lapacke_layout(), jobz, uplo as u8, n, &mut a, n, &mut w);
-        into_result(info, w)
-    }
-}
-}} // impl_eigh!
+        impl Eigh_ for $scalar {
+            unsafe fn eigh(calc_v: bool, l: MatrixLayout, uplo: UPLO, mut a: &mut [Self]) -> Result<Vec<Self::Real>> {
+                let (n, _) = l.size();
+                let jobz = if calc_v { b'V' } else { b'N' };
+                let mut w = vec![Self::Real::zero(); n as usize];
+                let info = $ev(l.lapacke_layout(), jobz, uplo as u8, n, &mut a, n, &mut w);
+                into_result(info, w)
+            }
+        }
+    };
+} // impl_eigh!
 
 impl_eigh!(f64, lapacke::dsyev);
 impl_eigh!(f32, lapacke::ssyev);

src/lapack_traits/mod.rs

@@ -1,12 +1,12 @@
 //! Define traits wrapping LAPACK routines
 
+pub mod cholesky;
+pub mod eigh;
 pub mod opnorm;
 pub mod qr;
-pub mod svd;
 pub mod solve;
 pub mod solveh;
-pub mod cholesky;
-pub mod eigh;
+pub mod svd;
 pub mod triangular;
 
 pub use self::cholesky::*;
@@ -23,10 +23,7 @@ use super::types::*;
 
 pub type Pivot = Vec<i32>;
 
-pub trait LapackScalar
-    : OperatorNorm_ + QR_ + SVD_ + Solve_ + Solveh_ + Cholesky_ + Eigh_ + Triangular_
-    {
-}
+pub trait LapackScalar: OperatorNorm_ + QR_ + SVD_ + Solve_ + Solveh_ + Cholesky_ + Eigh_ + Triangular_ {}
 
 impl LapackScalar for f32 {}
 impl LapackScalar for f64 {}