diff --git a/src/bin/aphid/main.rs b/src/bin/aphid/main.rs index 40ac2ce9965b52676de7cfd5741fcf2b00647983..190e3b64234f511cd2aa692f98f4c8b285d77bd8 100644 --- a/src/bin/aphid/main.rs +++ b/src/bin/aphid/main.rs @@ -265,7 +265,7 @@ fn topology_filter<'i>( global.n_excluded_triplets_topologies += usize::from(!triplet.included); global.n_excluded_outgroup_topologies += usize::from(!outgroup.included); global.n_excluded_treetops_topologies += - usize::from(!treetop.as_ref().map_or(true, |t| t.included)); + usize::from(!treetop.as_ref().is_none_or(|t| t.included)); detail.triplet = triplet; detail.outgroup = outgroup; detail.top = treetop; diff --git a/src/learn.rs b/src/learn.rs index 7d05c0ddb5262f23bb8d1f38381caef5dd0a327d..a2bc98c997a7af4ab86e97095422f6a2e104e9d7 100644 --- a/src/learn.rs +++ b/src/learn.rs @@ -23,7 +23,7 @@ use crate::{ scenarios::Scenario, scores::{self, Scores}, }, - optim::{self, bfgs, OptimResult}, + optim::{self, OptimResult}, output, GeneTriplet, Parameters, };