Skip to content

Commit ec0ca81

Browse files
committed
remove useless .collect
1 parent 470e083 commit ec0ca81

File tree

4 files changed

+39
-52
lines changed

4 files changed

+39
-52
lines changed

oryx-tui/src/ebpf/firewall.rs

+6-8
Original file line numberDiff line numberDiff line change
@@ -30,13 +30,12 @@ pub fn update_ipv4_blocklist(
3030
} else {
3131
let not_null_ports = blocked_ports
3232
.into_iter()
33-
.filter(|p| (*p != 0 && *p != port))
34-
.collect::<Vec<u16>>();
33+
.filter(|p| (*p != 0 && *p != port));
3534

3635
let mut blocked_ports = [0; MAX_RULES_PORT];
3736

38-
for (idx, p) in not_null_ports.iter().enumerate() {
39-
blocked_ports[idx] = *p;
37+
for (idx, p) in not_null_ports.enumerate() {
38+
blocked_ports[idx] = p;
4039
}
4140

4241
if blocked_ports.iter().all(|&port| port == 0) {
@@ -98,13 +97,12 @@ pub fn update_ipv6_blocklist(
9897
} else {
9998
let not_null_ports = blocked_ports
10099
.into_iter()
101-
.filter(|p| (*p != 0 && *p != port))
102-
.collect::<Vec<u16>>();
100+
.filter(|p| (*p != 0 && *p != port));
103101

104102
let mut blocked_ports = [0; MAX_RULES_PORT];
105103

106-
for (idx, p) in not_null_ports.iter().enumerate() {
107-
blocked_ports[idx] = *p;
104+
for (idx, p) in not_null_ports.enumerate() {
105+
blocked_ports[idx] = p;
108106
}
109107

110108
if blocked_ports.iter().all(|&port| port == 0) {

oryx-tui/src/help.rs

+3-8
Original file line numberDiff line numberDiff line change
@@ -119,14 +119,9 @@ impl Help {
119119

120120
self.block_height = block.height as usize;
121121
let widths = [Constraint::Length(20), Constraint::Fill(1)];
122-
let rows: Vec<Row> = self
123-
.keys
124-
.iter()
125-
.map(|key| {
126-
Row::new(vec![key.0.to_owned(), key.1.into()])
127-
.style(Style::default().fg(Color::White))
128-
})
129-
.collect();
122+
let rows = self.keys.iter().map(|key| {
123+
Row::new(vec![key.0.to_owned(), key.1.into()]).style(Style::default().fg(Color::White))
124+
});
130125
let rows_len = self.keys.len().saturating_sub(self.block_height - 6);
131126

132127
let table = Table::new(rows, widths).block(

oryx-tui/src/interface.rs

+29-33
Original file line numberDiff line numberDiff line change
@@ -168,40 +168,36 @@ impl Interface {
168168
Constraint::Fill(1),
169169
];
170170

171-
let interfaces: Vec<Row> = self
172-
.interfaces
173-
.iter()
174-
.map(|interface| {
175-
let addr = {
176-
match interface
177-
.addresses
178-
.iter()
179-
.find(|a| matches!(a, IpAddr::V4(_) | IpAddr::V6(_)))
180-
{
181-
Some(a) => a.to_string(),
182-
None => String::new(),
183-
}
184-
};
185-
186-
let state = if interface.is_up { "Up" } else { "Down" };
187-
188-
Row::new(if self.selected_interface.name == interface.name {
189-
vec![
190-
Line::from(" "),
191-
Line::from(interface.name.clone()),
192-
Line::from(state.to_string()).centered(),
193-
Line::from(addr.clone()),
194-
]
195-
} else {
196-
vec![
197-
Line::from(""),
198-
Line::from(interface.name.clone()),
199-
Line::from(state.to_string()).centered(),
200-
Line::from(addr.clone()),
201-
]
202-
})
171+
let interfaces = self.interfaces.iter().map(|interface| {
172+
let addr = {
173+
match interface
174+
.addresses
175+
.iter()
176+
.find(|a| matches!(a, IpAddr::V4(_) | IpAddr::V6(_)))
177+
{
178+
Some(a) => a.to_string(),
179+
None => String::new(),
180+
}
181+
};
182+
183+
let state = if interface.is_up { "Up" } else { "Down" };
184+
185+
Row::new(if self.selected_interface.name == interface.name {
186+
vec![
187+
Line::from(" "),
188+
Line::from(interface.name.clone()),
189+
Line::from(state.to_string()).centered(),
190+
Line::from(addr.clone()),
191+
]
192+
} else {
193+
vec![
194+
Line::from(""),
195+
Line::from(interface.name.clone()),
196+
Line::from(state.to_string()).centered(),
197+
Line::from(addr.clone()),
198+
]
203199
})
204-
.collect();
200+
});
205201

206202
let table = Table::new(interfaces, widths)
207203
.header(

oryx-tui/src/section/metrics.rs

+1-3
Original file line numberDiff line numberDiff line change
@@ -110,9 +110,7 @@ impl Metrics {
110110
pub fn render(&mut self, frame: &mut Frame, block: Rect) {
111111
self.window_height = block.height.saturating_sub(4) as usize / 8;
112112

113-
let constraints: Vec<Constraint> = (0..self.window_height)
114-
.map(|_| Constraint::Length(8))
115-
.collect();
113+
let constraints = (0..self.window_height).map(|_| Constraint::Length(8));
116114

117115
let chunks = Layout::default()
118116
.direction(Direction::Vertical)

0 commit comments

Comments
 (0)