silence some clippy warnings

nand-nor · nand-nor · commit 54fbe55fc7c7 · 2025-04-29T19:51:20.000-04:00
diff --git a/oryx-tui/src/filter.rs b/oryx-tui/src/filter.rs
@@ -645,12 +645,12 @@ impl Filter {
                             .map(|filter| {
                                 if self.transport.applied_protocols.contains(filter) {
                                     Span::styled(
-                                        format!(" {}  ", filter),
+                                        format!(" {filter}  "),
                                         Style::default().light_green(),
                                     )
                                 } else {
                                     Span::styled(
-                                        format!(" {}  ", filter),
+                                        format!(" {filter}  "),
                                         Style::default().light_red(),
                                     )
                                 }
@@ -666,12 +666,12 @@ impl Filter {
                             .map(|filter| {
                                 if self.network.applied_protocols.contains(filter) {
                                     Span::styled(
-                                        format!(" {}  ", filter),
+                                        format!(" {filter}  "),
                                         Style::default().light_green(),
                                     )
                                 } else {
                                     Span::styled(
-                                        format!(" {}  ", filter),
+                                        format!(" {filter}  "),
                                         Style::default().light_red(),
                                     )
                                 }
@@ -687,12 +687,12 @@ impl Filter {
                             .map(|filter| {
                                 if self.link.applied_protocols.contains(filter) {
                                     Span::styled(
-                                        format!(" {}  ", filter),
+                                        format!(" {filter}  "),
                                         Style::default().light_green(),
                                     )
                                 } else {
                                     Span::styled(
-                                        format!(" {}  ", filter),
+                                        format!(" {filter}  "),
                                         Style::default().light_red(),
                                     )
                                 }
@@ -708,12 +708,12 @@ impl Filter {
                             .map(|filter| {
                                 if self.traffic_direction.applied_direction.contains(filter) {
                                     Span::styled(
-                                        format!("󰞁 {}  ", filter),
+                                        format!("󰞁 {filter}  "),
                                         Style::default().light_green(),
                                     )
                                 } else {
                                     Span::styled(
-                                        format!("󰿝 {}  ", filter),
+                                        format!("󰿝 {filter}  "),
                                         Style::default().light_red(),
                                     )
                                 }
diff --git a/oryx-tui/src/filter/link.rs b/oryx-tui/src/filter/link.rs
@@ -50,13 +50,7 @@ impl LinkFilter {
 
     pub fn scroll_up(&mut self) {
         let i = match self.state.selected() {
-            Some(i) => {
-                if i > 1 {
-                    i - 1
-                } else {
-                    0
-                }
-            }
+            Some(i) => i.saturating_sub(1),
             None => 0,
         };
 
diff --git a/oryx-tui/src/filter/network.rs b/oryx-tui/src/filter/network.rs
@@ -55,13 +55,7 @@ impl NetworkFilter {
 
     pub fn scroll_up(&mut self) {
         let i = match self.state.selected() {
-            Some(i) => {
-                if i > 1 {
-                    i - 1
-                } else {
-                    0
-                }
-            }
+            Some(i) => i.saturating_sub(1),
             None => 0,
         };
 
diff --git a/oryx-tui/src/filter/transport.rs b/oryx-tui/src/filter/transport.rs
@@ -54,13 +54,7 @@ impl TransportFilter {
 
     pub fn scroll_up(&mut self) {
         let i = match self.state.selected() {
-            Some(i) => {
-                if i > 1 {
-                    i - 1
-                } else {
-                    0
-                }
-            }
+            Some(i) => i.saturating_sub(1),
             None => 0,
         };
 
diff --git a/oryx-tui/src/help.rs b/oryx-tui/src/help.rs
@@ -83,13 +83,7 @@ impl Help {
     }
     pub fn scroll_up(&mut self) {
         let i = match self.state.selected() {
-            Some(i) => {
-                if i > 1 {
-                    i - 1
-                } else {
-                    0
-                }
-            }
+            Some(i) => i.saturating_sub(1),
             None => 1,
         };
         *self.state.offset_mut() = i;
diff --git a/oryx-tui/src/interface.rs b/oryx-tui/src/interface.rs
@@ -142,13 +142,7 @@ impl Interface {
     }
     pub fn scroll_up(&mut self) {
         let i = match self.state.selected() {
-            Some(i) => {
-                if i > 1 {
-                    i - 1
-                } else {
-                    0
-                }
-            }
+            Some(i) => i.saturating_sub(1),
             None => 0,
         };
 
diff --git a/oryx-tui/src/packet.rs b/oryx-tui/src/packet.rs
@@ -33,8 +33,8 @@ pub enum NetworkPacket {
 impl Display for NetworkPacket {
     fn fmt(&self, f: &mut core::fmt::Formatter<'_>) -> core::fmt::Result {
         match self {
-            Self::Arp(packet) => write!(f, "{}", packet),
-            Self::Ip(packet) => write!(f, "{}", packet),
+            Self::Arp(packet) => write!(f, "{packet}"),
+            Self::Ip(packet) => write!(f, "{packet}"),
         }
     }
 }
diff --git a/oryx-tui/src/section/firewall.rs b/oryx-tui/src/section/firewall.rs
@@ -42,7 +42,7 @@ pub enum BlockedPort {
 impl Display for BlockedPort {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         match self {
-            BlockedPort::Single(p) => write!(f, "{}", p),
+            BlockedPort::Single(p) => write!(f, "{p}"),
             BlockedPort::All => write!(f, "*"),
         }
     }
@@ -605,13 +605,7 @@ impl Firewall {
                         return Ok(());
                     }
                     let i = match self.state.selected() {
-                        Some(i) => {
-                            if i > 1 {
-                                i - 1
-                            } else {
-                                0
-                            }
-                        }
+                        Some(i) => i.saturating_sub(1),
                         None => 0,
                     };
 

Original file line number	Diff line number	Diff line change
`@@ -645,12 +645,12 @@ impl Filter {`
`645`	`645`	`.map(\|filter\| {`
`646`	`646`	`if self.transport.applied_protocols.contains(filter) {`
`647`	`647`	`Span::styled(`
`648`		`- format!(" {} ", filter),`
	`648`	`+ format!(" {filter} "),`
`649`	`649`	`Style::default().light_green(),`
`650`	`650`	`)`
`651`	`651`	`} else {`
`652`	`652`	`Span::styled(`
`653`		`- format!(" {} ", filter),`
	`653`	`+ format!(" {filter} "),`
`654`	`654`	`Style::default().light_red(),`
`655`	`655`	`)`
`656`	`656`	`}`
`@@ -666,12 +666,12 @@ impl Filter {`
`666`	`666`	`.map(\|filter\| {`
`667`	`667`	`if self.network.applied_protocols.contains(filter) {`
`668`	`668`	`Span::styled(`
`669`		`- format!(" {} ", filter),`
	`669`	`+ format!(" {filter} "),`
`670`	`670`	`Style::default().light_green(),`
`671`	`671`	`)`
`672`	`672`	`} else {`
`673`	`673`	`Span::styled(`
`674`		`- format!(" {} ", filter),`
	`674`	`+ format!(" {filter} "),`
`675`	`675`	`Style::default().light_red(),`
`676`	`676`	`)`
`677`	`677`	`}`
`@@ -687,12 +687,12 @@ impl Filter {`
`687`	`687`	`.map(\|filter\| {`
`688`	`688`	`if self.link.applied_protocols.contains(filter) {`
`689`	`689`	`Span::styled(`
`690`		`- format!(" {} ", filter),`
	`690`	`+ format!(" {filter} "),`
`691`	`691`	`Style::default().light_green(),`
`692`	`692`	`)`
`693`	`693`	`} else {`
`694`	`694`	`Span::styled(`
`695`		`- format!(" {} ", filter),`
	`695`	`+ format!(" {filter} "),`
`696`	`696`	`Style::default().light_red(),`
`697`	`697`	`)`
`698`	`698`	`}`
`@@ -708,12 +708,12 @@ impl Filter {`
`708`	`708`	`.map(\|filter\| {`
`709`	`709`	`if self.traffic_direction.applied_direction.contains(filter) {`
`710`	`710`	`Span::styled(`
`711`		`- format!("󰞁 {} ", filter),`
	`711`	`+ format!("󰞁 {filter} "),`
`712`	`712`	`Style::default().light_green(),`
`713`	`713`	`)`
`714`	`714`	`} else {`
`715`	`715`	`Span::styled(`
`716`		`- format!("󰿝 {} ", filter),`
	`716`	`+ format!("󰿝 {filter} "),`
`717`	`717`	`Style::default().light_red(),`
`718`	`718`	`)`
`719`	`719`	`}`
Original file line number	Diff line number	Diff line change
`@@ -33,8 +33,8 @@ pub enum NetworkPacket {`
`33`	`33`	`impl Display for NetworkPacket {`
`34`	`34`	`fn fmt(&self, f: &mut core::fmt::Formatter<'_>) -> core::fmt::Result {`
`35`	`35`	`match self {`
`36`		`- Self::Arp(packet) => write!(f, "{}", packet),`
`37`		`- Self::Ip(packet) => write!(f, "{}", packet),`
	`36`	`+ Self::Arp(packet) => write!(f, "{packet}"),`
	`37`	`+ Self::Ip(packet) => write!(f, "{packet}"),`
`38`	`38`	`}`
`39`	`39`	`}`
`40`	`40`	`}`