Merge pull request #1018 from MaxVerevkin/fix_clippy

refactoring: fix all clippy warnings

Author: ammgws

.gitignore

@@ -9,3 +9,5 @@ i3status-rust.iml
 
 *.bk
 /.config/
+
+.cargo

src/blocks/github.rs

@@ -193,7 +193,7 @@ impl<'a> Notifications<'a> {
             return Ok(Some(notif));
         }
 
-        if self.next_page_url == "" {
+        if self.next_page_url.is_empty() {
             return Ok(None);
         }
 

src/blocks/hueshift.rs

@@ -81,36 +81,35 @@ impl HueshiftConfig {
 
     /// Default current temp for any screens
     fn default_current_temp() -> u16 {
-        6500 as u16
+        6500
     }
     /// Max/Min hue temperature (min 1000K, max 10_000K)
     // TODO: Try to detect if we're using redshift or not
     // to set default max_temp either to 10_000K to 25_000K
     fn default_min_temp() -> u16 {
-        1000 as u16
+        1000
     }
     fn default_max_temp() -> u16 {
-        10_000 as u16
+        10_000
     }
 
     fn default_step() -> u16 {
-        100 as u16
+        100
     }
 
     /// Prefer any installed shifter, redshift is preferred though.
     fn default_hue_shifter() -> Option<HueShifter> {
-        let (redshift, sct) = what_is_supported();
-        if redshift {
-            return Some(HueShifter::Redshift);
-        } else if sct {
-            return Some(HueShifter::Sct);
+        if has_command("hueshift", "redshift").unwrap_or(false) {
+            Some(HueShifter::Redshift)
+        } else if has_command("hueshift", "sct").unwrap_or(false) {
+            Some(HueShifter::Sct)
+        } else {
+            None
         }
-
-        None
     }
 
     fn default_click_temp() -> u16 {
-        6500 as u16
+        6500
     }
 
     fn default_color_overrides() -> Option<BTreeMap<String, String>> {
@@ -216,22 +215,6 @@ impl Block for Hueshift {
     }
 }
 
-/// Currently, detects whether sct and redshift are installed.
-#[inline]
-fn what_is_supported() -> (bool, bool) {
-    let has_redshift = match has_command("hueshift", "redshift") {
-        Ok(has_redshift) => has_redshift,
-        Err(_) => false,
-    };
-
-    let has_sct = match has_command("hueshift", "sct") {
-        Ok(has_sct) => has_sct,
-        Err(_) => false,
-    };
-
-    (has_redshift, has_sct)
-}
-
 #[inline]
 fn update_hue(hue_shifter: &Option<HueShifter>, new_temp: u16) {
     match hue_shifter {

src/blocks/maildir.rs

@@ -76,10 +76,10 @@ impl MaildirConfig {
         Duration::from_secs(5)
     }
     fn default_threshold_warning() -> usize {
-        1 as usize
+        1
     }
     fn default_threshold_critical() -> usize {
-        10 as usize
+        10
     }
     fn default_icon() -> bool {
         true

src/blocks/music.rs

@@ -117,12 +117,12 @@ impl Music {
 
             // Calculate how many chars to keep from title and artist
             let mut ttrc = tlen - tnum;
-            if ttrc < 1 || ttrc > 5000 {
+            if !(1..5001).contains(&ttrc) {
                 ttrc = 1
             }
 
             let mut atrc = alen - anum;
-            if atrc < 1 || atrc > 5000 {
+            if !(1..5001).contains(&atrc) {
                 atrc = 1
             }
 
@@ -666,7 +666,7 @@ impl Block for Music {
 
             match event.button {
                 MouseButton::Left => {
-                    if action != "" && players.len() > 0 {
+                    if !action.is_empty() && players.len() > 0 {
                         let metadata = players.first().unwrap();
                         let m = Message::new_method_call(
                             metadata.interface_name.clone(),

src/blocks/speedtest.rs

@@ -221,14 +221,13 @@ impl Block for SpeedTest {
                     if self.config.bytes { "B/s" } else { "b/s" },
                 ));
 
-                // TODO: remove clippy workaround
-                #[allow(clippy::unknown_clippy_lints)]
-                #[allow(clippy::match_on_vec_items)]
-                self.text[0].set_state(match_range!(vals[0], default: (State::Critical) {
-                    0.0 ; 25.0 => State::Good,
-                    25.0 ; 60.0 => State::Info,
-                    60.0 ; 100.0 => State::Warning
-                }));
+                // ping is in milliseconds
+                self.text[0].set_state(match ping as i32 {
+                    0..=25_000 => State::Good,
+                    25_001..=60_000 => State::Info,
+                    60_001..=100_000 => State::Warning,
+                    _ => State::Critical,
+                });
             }
 
             Ok(None)

src/blocks/weather.rs

@@ -79,7 +79,7 @@ fn find_ip_location() -> Result<Option<String>> {
     let city = http_call_result
         .content
         .pointer("/city")
-        .map(|v| v.to_owned().to_string());
+        .map(|v| v.to_string());
 
     Ok(city)
 }
@@ -114,13 +114,12 @@ fn australian_apparent_temp(
 
     let metric_apparent_temp =
         temp_celsius + 0.33 * water_vapor_pressure - 0.7 * metric_wind_speed - 4.0;
-    let apparent_temp = if metric {
+
+    if metric {
         metric_apparent_temp
     } else {
         1.8 * metric_apparent_temp + 32.0
-    };
-
-    apparent_temp
+    }
 }
 
 // Convert wind direction in azimuth degrees to abbreviation names
@@ -208,7 +207,7 @@ impl Weather {
                 if (output.code >= 300 && output.code < 400) || output.code >= 500 {
                     return Err(BlockError(
                         "weather".to_owned(),
-                        format!("Invalid result from curl: {}", output.code).to_owned(),
+                        format!("Invalid result from curl: {}", output.code),
                     ));
                 };
 
@@ -332,7 +331,7 @@ impl ConfigBlock for Weather {
         let id = pseudo_uuid();
         Ok(Weather {
             id: id.clone(),
-            weather: ButtonWidget::new(config.clone(), &id),
+            weather: ButtonWidget::new(config, &id),
             format: block_config.format,
             weather_keys: HashMap::new(),
             service: block_config.service,

src/blocks/xrandr.rs

@@ -102,7 +102,7 @@ impl XrandrConfig {
     }
 
     fn default_step_width() -> u32 {
-        5 as u32
+        5
     }
 
     fn default_color_overrides() -> Option<BTreeMap<String, String>> {

src/util.rs

@@ -155,17 +155,6 @@ pub fn has_command(block_name: &str, command: &str) -> Result<bool> {
     Ok(exit_status.success())
 }
 
-macro_rules! match_range {
-    ($a:expr, default: ($default:expr) {$($lower:expr ; $upper:expr => $e:expr),+}) => (
-        match $a {
-            $(
-                t if t >= $lower && t <= $upper => { $e },
-            )+
-            _ => { $default }
-        }
-    )
-}
-
 macro_rules! map (
     { $($key:expr => $value:expr),+ } => {
         {

src/widgets/rotatingtext.rs

@@ -163,7 +163,7 @@ impl RotatingTextWidget {
             "separator_block_width": 0,
             "name" : self.id,
             "min_width":
-                if self.content == "" {
+                if self.content.is_empty() {
                     "".to_string()
                 } else {
                     let text_width = self.get_rotated_content().chars().count();