From 08e0342a22d901b4203952c3d864279a3a6da9ff Mon Sep 17 00:00:00 2001 From: Anders Olsson Date: Mon, 22 Feb 2021 09:23:27 +0100 Subject: [PATCH] Fix some clippy warnings --- src/model/difference.rs | 2 +- src/model/ternary.rs | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/model/difference.rs b/src/model/difference.rs index cadf55c..4fdfff7 100644 --- a/src/model/difference.rs +++ b/src/model/difference.rs @@ -65,7 +65,7 @@ impl DifferenceModel { panic!("observations must be added in chronological order"); } - let var = var.unwrap_or_else(|| self.var); + let var = var.unwrap_or(self.var); let mut elems = self.process_items(winners, 1.0); elems.extend(self.process_items(losers, -1.0)); diff --git a/src/model/ternary.rs b/src/model/ternary.rs index d10003c..729f616 100644 --- a/src/model/ternary.rs +++ b/src/model/ternary.rs @@ -73,7 +73,7 @@ impl TernaryModel { panic!("observations must be added in chronological order"); } - let margin = margin.unwrap_or_else(|| self.margin); + let margin = margin.unwrap_or(self.margin); let mut elems = self.process_items(winners, 1.0); elems.extend(self.process_items(losers, -1.0)); @@ -162,7 +162,7 @@ impl TernaryModel { t: f64, margin: Option, ) -> (f64, f64, f64) { - let margin = margin.unwrap_or_else(|| self.margin); + let margin = margin.unwrap_or(self.margin); let mut elems = self.process_items(team_1, 1.0); elems.extend(self.process_items(team_2, -1.0));