Skip to content

Commit e50266e

Browse files
committed
update deps and fix new clippy lints
1 parent 04cdea9 commit e50266e

19 files changed

Lines changed: 89 additions & 84 deletions

Cargo.lock

Lines changed: 39 additions & 39 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ rfd = "0.15.4"
5454
phf = "0.12.1"
5555
phf_shared = "0.12.1"
5656
splines = "5.0.0"
57-
clap = { version = "4.5.42", features = ["derive"] }
57+
clap = { version = "4.5.44", features = ["derive"] }
5858
tokio = { version = "1.47.1", features = ["macros"] }
5959
async-channel = "2.5.0"
6060

@@ -79,7 +79,7 @@ serial_test = { version = "3.2.0", default-features = false }
7979
[build-dependencies]
8080
phf_codegen = "0.12.1"
8181
phf_shared = "0.12.1"
82-
rustrict = { version = "0.7.35", default-features = false, features = ["censor"] }
82+
rustrict = { version = "0.7.36", default-features = false, features = ["censor"] }
8383

8484
[target."cfg(windows)".build-dependencies]
8585
winres = "0.1.12"

src/chart/manage_chart_data.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -145,10 +145,10 @@ fn reduce_all_time_data(all_time: &mut Vec<(f32, f32)>) {
145145
while all_time.len() > 150 {
146146
let mut new_vec = Vec::new();
147147
all_time.iter().enumerate().for_each(|(i, (x, y))| {
148-
if i % 2 == 0 {
149-
if let Some(next) = all_time.get(i + 1) {
150-
new_vec.push((*x, (y + next.1) / 2.0));
151-
}
148+
if i % 2 == 0
149+
&& let Some(next) = all_time.get(i + 1)
150+
{
151+
new_vec.push((*x, (y + next.1) / 2.0));
152152
}
153153
});
154154
*all_time = new_vec;

src/chart/types/traffic_chart.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ impl TrafficChart {
8080
}
8181
}
8282

83-
pub fn view(&self) -> Element<Message, StyleType> {
83+
pub fn view(&self) -> Element<'_, Message, StyleType> {
8484
let x_labels = if self.is_live_capture || self.thumbnail {
8585
None
8686
} else {

src/gui/components/header.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ use crate::translations::translations_3::thumbnail_mode_translation;
1919
use crate::utils::types::icon::Icon;
2020
use crate::{Language, SNIFFNET_TITLECASE, StyleType};
2121

22-
pub fn header(sniffer: &Sniffer) -> Container<Message, StyleType> {
22+
pub fn header(sniffer: &Sniffer) -> Container<'_, Message, StyleType> {
2323
let thumbnail = sniffer.thumbnail;
2424
let ConfigSettings {
2525
style,

src/gui/components/tab.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -99,12 +99,12 @@ fn new_page_tab<'a>(
9999
.align_y(alignment::Alignment::Center),
100100
);
101101

102-
if let Some(num) = unread {
103-
if num > 0 {
104-
content = content
105-
.push(Space::with_width(7))
106-
.push(notifications_badge(font_headers, num));
107-
}
102+
if let Some(num) = unread
103+
&& num > 0
104+
{
105+
content = content
106+
.push(Space::with_width(7))
107+
.push(notifications_badge(font_headers, num));
108108
}
109109

110110
content = content.push(horizontal_space());

src/gui/pages/connection_details_page.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ use iced::{Alignment, Font, Length, Padding};
4444
pub fn connection_details_page(
4545
sniffer: &Sniffer,
4646
key: AddressPortPair,
47-
) -> Container<Message, StyleType> {
47+
) -> Container<'_, Message, StyleType> {
4848
Container::new(page_content(sniffer, &key))
4949
}
5050

src/gui/pages/initial_page.rs

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ use crate::utils::types::icon::Icon;
4343
use crate::{ConfigSettings, IpVersion, Language, Protocol, StyleType};
4444

4545
/// Computes the body of gui initial page
46-
pub fn initial_page(sniffer: &Sniffer) -> Container<Message, StyleType> {
46+
pub fn initial_page(sniffer: &Sniffer) -> Container<'_, Message, StyleType> {
4747
let ConfigSettings {
4848
style,
4949
language,
@@ -129,7 +129,7 @@ fn col_ip_buttons(
129129
active_ip_filters: &HashSet<IpVersion>,
130130
font: Font,
131131
language: Language,
132-
) -> Column<Message, StyleType> {
132+
) -> Column<'_, Message, StyleType> {
133133
let mut buttons_row = Row::new().spacing(5).padding(Padding::ZERO.left(5));
134134
for option in IpVersion::ALL {
135135
let is_active = active_ip_filters.contains(&option);
@@ -168,7 +168,7 @@ fn col_protocol_buttons(
168168
active_protocol_filters: &HashSet<Protocol>,
169169
font: Font,
170170
language: Language,
171-
) -> Column<Message, StyleType> {
171+
) -> Column<'_, Message, StyleType> {
172172
let mut buttons_row = Row::new().spacing(5).padding(Padding::ZERO.left(5));
173173
for option in Protocol::ALL {
174174
let is_active = active_protocol_filters.contains(&option);
@@ -203,7 +203,11 @@ fn col_protocol_buttons(
203203
.push(buttons_row)
204204
}
205205

206-
fn col_address_input(value: &str, font: Font, language: Language) -> Column<Message, StyleType> {
206+
fn col_address_input(
207+
value: &str,
208+
font: Font,
209+
language: Language,
210+
) -> Column<'_, Message, StyleType> {
207211
let is_error = if value.is_empty() {
208212
false
209213
} else {
@@ -234,7 +238,7 @@ fn col_address_input(value: &str, font: Font, language: Language) -> Column<Mess
234238
.push(input_row)
235239
}
236240

237-
fn col_port_input(value: &str, font: Font, language: Language) -> Column<Message, StyleType> {
241+
fn col_port_input(value: &str, font: Font, language: Language) -> Column<'_, Message, StyleType> {
238242
let is_error = if value.is_empty() {
239243
false
240244
} else {
@@ -270,7 +274,7 @@ fn button_start(
270274
language: Language,
271275
color_gradient: GradientType,
272276
filters: &Filters,
273-
) -> Tooltip<Message, StyleType> {
277+
) -> Tooltip<'_, Message, StyleType> {
274278
let mut content = button(
275279
Icon::Rocket
276280
.to_text()
@@ -299,7 +303,7 @@ fn button_start(
299303
.class(ContainerType::Tooltip)
300304
}
301305

302-
fn get_col_adapter(sniffer: &Sniffer, font: Font) -> Column<Message, StyleType> {
306+
fn get_col_adapter(sniffer: &Sniffer, font: Font) -> Column<'_, Message, StyleType> {
303307
let ConfigSettings { language, .. } = sniffer.configs.settings;
304308

305309
let mut dev_str_list = vec![];

0 commit comments

Comments
 (0)