diff --git a/.github/workflows/checking.yml b/.github/workflows/checking.yml index 43c142156..faa6975d0 100644 --- a/.github/workflows/checking.yml +++ b/.github/workflows/checking.yml @@ -10,7 +10,7 @@ jobs: fail-fast: false matrix: toolchain: - - 1.87.0 + - 1.88.0 - stable - nightly os: diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml index 6892dbab3..46eac8ab4 100644 --- a/.github/workflows/testing.yml +++ b/.github/workflows/testing.yml @@ -10,7 +10,7 @@ jobs: fail-fast: false matrix: toolchain: - - 1.87.0 + - 1.88.0 - stable os: - ubuntu-latest @@ -37,7 +37,7 @@ jobs: fail-fast: false matrix: toolchain: - - 1.87.0 + - 1.88.0 - stable os: - ubuntu-latest diff --git a/algorithms/linfa-lars/src/algorithm.rs b/algorithms/linfa-lars/src/algorithm.rs index 9088e5a73..25254e90d 100644 --- a/algorithms/linfa-lars/src/algorithm.rs +++ b/algorithms/linfa-lars/src/algorithm.rs @@ -123,16 +123,15 @@ fn lars_path( } loop { - let c; let mut c_idx = 0; let mut c_ = F::zero(); - if !cov.is_empty() { + let c = if !cov.is_empty() { c_idx = cov.abs().argmax().unwrap(); c_ = cov[c_idx]; - c = c_.abs(); + c_.abs() } else { - c = F::zero(); - } + F::zero() + }; let mut alpha = alphas.slice(s![n_iter, NewAxis]).to_owned(); let mut coef = coefs.row(n_iter).to_owned(); diff --git a/src/dataset/impl_dataset.rs b/src/dataset/impl_dataset.rs index 27cc9acff..b92a1dab1 100644 --- a/src/dataset/impl_dataset.rs +++ b/src/dataset/impl_dataset.rs @@ -1000,7 +1000,7 @@ where where ER: std::error::Error + std::convert::From, M: for<'c> Fit, ArrayView<'c, E, I>, ER, Object = O>, - O: for<'d> PredictInplace, Array>, + O: PredictInplace, Array>, FACC: Float, C: Fn( &Array, @@ -1061,7 +1061,7 @@ where where ER: std::error::Error + std::convert::From, M: for<'c> Fit, ArrayView1<'c, E>, ER, Object = O>, - O: for<'d> PredictInplace, Array1>, + O: PredictInplace, Array1>, FACC: Float, C: Fn(&Array1, &ArrayView1) -> std::result::Result, {