fix clippy warnings

rkusa · Jun 22, 2021 · e1ae25b · e1ae25b
1 parent d4b5a8f
commit e1ae25b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/crates/datis-core/src/lib.rs b/crates/datis-core/src/lib.rs
@@ -171,7 +171,7 @@ impl Datis {
     pub fn pause(&mut self) -> Result<(), Error> {
         log::debug!("Shutting down all stations");
 
-        let shutdown_signals = mem::replace(&mut self.shutdown_signals, Vec::new());
+        let shutdown_signals = mem::take(&mut self.shutdown_signals);
         for signal in shutdown_signals {
             let _ = signal.send(());
         }

diff --git a/crates/datis-core/src/weather.rs b/crates/datis-core/src/weather.rs
@@ -92,7 +92,7 @@ impl WeatherInfo {
         let fog_vis = self.get_fog_visibility(alt);
         let vis = vec![clouds_vis, dust_vis, fog_vis]
             .into_iter()
-            .filter_map(|e| e)
+            .flatten()
             .min();
         // Visibility below 50m is considered as ZERO
         vis.map(|v| {
@@ -327,7 +327,7 @@ impl OldClouds {
 }
 
 impl CloudCoverage {
-    pub fn to_metar(&self) -> &str {
+    pub fn to_metar(self) -> &'static str {
         match self {
             CloudCoverage::Clear => "CLR",
             CloudCoverage::Few => "FEW",
@@ -351,7 +351,7 @@ impl std::fmt::Display for CloudCoverage {
 }
 
 impl WeatherCondition {
-    pub fn to_metar(&self) -> &str {
+    pub fn to_metar(self) -> &'static str {
         match self {
             WeatherCondition::SlightRain => "-RA",
             WeatherCondition::Rain => "RA",