Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit d285e06

Browse files
ByronByron
committed
cargo clippy
1 parent 651001d commit d285e06

16 files changed

Lines changed: 101 additions & 109 deletions

File tree

‎criner-waste-report/src/result.rs‎

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ fn split_to_matched_and_unmatched(
5151
globset: &globset::GlobSet,
5252
) -> (Vec<TarHeader>, Vec<TarHeader>) {
5353
let mut unmatched = Vec::new();
54+
#[allow(clippy::unnecessary_filter_map)] // we need to keep the unmatched element
5455
let matched = entries
5556
.into_iter()
5657
.filter_map(|e| {
@@ -367,21 +368,12 @@ fn to_crate_relative_path(source_file_path: impl AsRef<Path>, relative_path: imp
367368
.expect("directory containing the file");
368369
let leading_parent_path_components = relative_path
369370
.components()
370-
.take_while(|c| match c {
371-
ParentDir | CurDir => true,
372-
_ => false,
373-
})
374-
.filter(|c| match c {
375-
ParentDir => true,
376-
_ => false,
377-
})
371+
.take_while(|c| matches!(c, ParentDir | CurDir))
372+
.filter(|c| matches!(c, ParentDir))
378373
.count();
379374
let components_to_take_from_relative_path = relative_path
380375
.components()
381-
.filter(|c| match c {
382-
CurDir => false,
383-
_ => true,
384-
})
376+
.filter(|c| !matches!(c, CurDir))
385377
.skip(leading_parent_path_components);
386378
let components_to_take = source_path
387379
.components()

‎criner/src/engine/run.rs‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ pub struct GlobStageRunSettings {
2323
pub run: StageRunSettings,
2424
}
2525

26+
#[allow(clippy::too_many_arguments)]
2627
/// Runs the statistics and mining engine.
2728
/// May run for a long time unless a deadline is specified.
2829
/// Even though timeouts can be achieved from outside of the future, knowing the deadline may be used
@@ -174,6 +175,7 @@ impl From<Interruptible> for prodash::render::tui::Event {
174175
}
175176
}
176177

178+
#[allow(clippy::too_many_arguments)]
177179
/// For convenience, run the engine and block until done.
178180
pub fn blocking(
179181
db: impl AsRef<Path>,
@@ -220,7 +222,7 @@ pub fn blocking(
220222
gui_options,
221223
futures_util::stream::select(
222224
context_stream(&db, start_of_computation),
223-
interrupt_control_stream.map(|v| Event::from(v)),
225+
interrupt_control_stream.map(Event::from),
224226
),
225227
)?);
226228

‎criner/src/engine/stage/db_download/convert.rs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -260,6 +260,7 @@ pub fn into_versions_by_crate_id(
260260
map
261261
}
262262

263+
#[allow(clippy::too_many_arguments)]
263264
pub fn into_crates(
264265
crates: Vec<csv_model::Crate>,
265266
mut keywords_by_id: BTreeMap<csv_model::Id, csv_model::Keyword>,

‎criner/src/engine/stage/db_download/mod.rs‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -119,19 +119,17 @@ fn extract_and_ingest(db: Db, mut progress: prodash::tree::Item, db_file_path: P
119119
ByteSize(num_bytes_seen)
120120
));
121121

122-
let users = users.ok_or_else(|| Error::Bug("expected users.csv in crates-io db dump"))?;
123-
let teams = teams.ok_or_else(|| Error::Bug("expected teams.csv in crates-io db dump"))?;
124-
let versions = versions.ok_or_else(|| Error::Bug("expected versions.csv in crates-io db dump"))?;
125-
let version_authors =
126-
version_authors.ok_or_else(|| Error::Bug("expected version_authors.csv in crates-io db dump"))?;
127-
let crates = crates.ok_or_else(|| Error::Bug("expected crates.csv in crates-io db dump"))?;
128-
let keywords = keywords.ok_or_else(|| Error::Bug("expected keywords.csv in crates-io db dump"))?;
129-
let crates_keywords =
130-
crates_keywords.ok_or_else(|| Error::Bug("expected crates_keywords.csv in crates-io db dump"))?;
131-
let categories = categories.ok_or_else(|| Error::Bug("expected categories.csv in crates-io db dump"))?;
122+
let users = users.ok_or(Error::Bug("expected users.csv in crates-io db dump"))?;
123+
let teams = teams.ok_or(Error::Bug("expected teams.csv in crates-io db dump"))?;
124+
let versions = versions.ok_or(Error::Bug("expected versions.csv in crates-io db dump"))?;
125+
let version_authors = version_authors.ok_or(Error::Bug("expected version_authors.csv in crates-io db dump"))?;
126+
let crates = crates.ok_or(Error::Bug("expected crates.csv in crates-io db dump"))?;
127+
let keywords = keywords.ok_or(Error::Bug("expected keywords.csv in crates-io db dump"))?;
128+
let crates_keywords = crates_keywords.ok_or(Error::Bug("expected crates_keywords.csv in crates-io db dump"))?;
129+
let categories = categories.ok_or(Error::Bug("expected categories.csv in crates-io db dump"))?;
132130
let crates_categories =
133-
crates_categories.ok_or_else(|| Error::Bug("expected crates_categories.csv in crates-io db dump"))?;
134-
let crate_owners = crate_owners.ok_or_else(|| Error::Bug("expected crate_owners.csv in crates-io db dump"))?;
131+
crates_categories.ok_or(Error::Bug("expected crates_categories.csv in crates-io db dump"))?;
132+
let crate_owners = crate_owners.ok_or(Error::Bug("expected crate_owners.csv in crates-io db dump"))?;
135133

136134
progress.init(Some(4), Some("conversion steps".into()));
137135
progress.set_name("transform actors");
@@ -217,7 +215,9 @@ pub async fn schedule(
217215
tx_io
218216
};
219217

220-
let today_yyyy_mm_dd = time::OffsetDateTime::now_local().format("%F");
218+
let today_yyyy_mm_dd = time::OffsetDateTime::try_now_local()
219+
.unwrap_or_else(|_| time::OffsetDateTime::now_utc())
220+
.format("%F");
221221
let file_suffix = "db-dump.tar.gz";
222222
let task_key = format!(
223223
"{}{}{}",

‎criner/src/engine/stage/processing.rs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ pub async fn process(
2828
let rx = rx.clone();
2929
crate::smol::Task::spawn(blocking::unblock(move || -> Result<_> {
3030
let agent = work::cpubound::Agent::new(assets_dir, &db)?;
31+
#[allow(clippy::unit_arg)] // don't know where the unit is supposed to be
3132
Ok(futures_lite::future::block_on(
3233
work::generic::processor(db, progress, rx, agent, max_retries_on_timeout).map(|r| {
3334
if let Err(e) = r {

‎criner/src/engine/stage/report/mod.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ pub async fn generate(
2525
.expect("assets directory to be in criner.db")
2626
.join("reports");
2727
let glob_str = glob.as_deref();
28-
let num_crates = krates.count_filtered(glob_str.clone()) as usize;
28+
let num_crates = krates.count_filtered(glob_str) as usize;
2929
let chunk_size = 500.min(num_crates);
3030
if chunk_size == 0 {
3131
return Ok(());

‎criner/src/engine/work/cpubound.rs‎

Lines changed: 32 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -39,37 +39,35 @@ impl crate::engine::work::generic::Processor for Agent {
3939
progress: &mut prodash::tree::Item,
4040
) -> Result<(model::Task, String, String)> {
4141
progress.init(None, Some("files extracted".into()));
42-
match request {
43-
ExtractRequest {
44-
download_task,
45-
crate_name,
46-
crate_version,
47-
} => {
48-
let progress_info = format!("CPU UNZIP+UNTAR {}:{}", crate_name, crate_version);
49-
let dummy_task = default_persisted_extraction_task();
50-
let mut task_key = String::new();
51-
dummy_task.fq_key(&crate_name, &crate_version, &mut task_key);
52-
53-
let downloaded_crate = super::schedule::download_file_path(
54-
&self.asset_dir,
55-
&crate_name,
56-
&crate_version,
57-
&download_task.process,
58-
&download_task.version,
59-
"crate",
60-
);
61-
let dummy_result = model::TaskResult::ExplodedCrate {
62-
entries_meta_data: vec![],
63-
selected_entries: vec![],
64-
};
65-
66-
let mut key = String::with_capacity(task_key.len() * 2);
67-
dummy_result.fq_key(&crate_name, &crate_version, &dummy_task, &mut key);
68-
69-
self.state = Some(ProcessingState { downloaded_crate, key });
70-
Ok((dummy_task, task_key, progress_info))
71-
}
72-
}
42+
let ExtractRequest {
43+
download_task,
44+
crate_name,
45+
crate_version,
46+
} = request;
47+
48+
let progress_info = format!("CPU UNZIP+UNTAR {}:{}", crate_name, crate_version);
49+
let dummy_task = default_persisted_extraction_task();
50+
let mut task_key = String::new();
51+
dummy_task.fq_key(&crate_name, &crate_version, &mut task_key);
52+
53+
let downloaded_crate = super::schedule::download_file_path(
54+
&self.asset_dir,
55+
&crate_name,
56+
&crate_version,
57+
&download_task.process,
58+
&download_task.version,
59+
"crate",
60+
);
61+
let dummy_result = model::TaskResult::ExplodedCrate {
62+
entries_meta_data: vec![],
63+
selected_entries: vec![],
64+
};
65+
66+
let mut key = String::with_capacity(task_key.len() * 2);
67+
dummy_result.fq_key(&crate_name, &crate_version, &dummy_task, &mut key);
68+
69+
self.state = Some(ProcessingState { downloaded_crate, key });
70+
Ok((dummy_task, task_key, progress_info))
7371
}
7472

7573
fn idle_message(&self) -> String {
@@ -168,7 +166,7 @@ fn extract_crate(
168166
};
169167
files.push((
170168
meta_data.last().expect("to have pushed one just now").to_owned(),
171-
slice.to_owned().into(),
169+
slice.to_owned(),
172170
));
173171
}
174172
}
@@ -178,8 +176,8 @@ fn extract_crate(
178176
));
179177

180178
let task_result = model::TaskResult::ExplodedCrate {
181-
entries_meta_data: meta_data.into(),
182-
selected_entries: files.into(),
179+
entries_meta_data: meta_data,
180+
selected_entries: files,
183181
};
184182
results.insert(progress, &key, &task_result)?;
185183

‎criner/src/engine/work/iobound.rs‎

Lines changed: 28 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -68,40 +68,36 @@ where
6868
progress: &mut prodash::tree::Item,
6969
) -> Result<(model::Task, String, String)> {
7070
progress.init(None, None);
71-
match request {
72-
DownloadRequest {
73-
output_file_path,
74-
progress_name,
75-
task_key,
76-
crate_name_and_version,
77-
kind,
78-
url,
79-
} => {
80-
let dummy_task = default_persisted_download_task();
81-
let progress_name = format!("↓ {}", progress_name);
71+
let DownloadRequest {
72+
output_file_path,
73+
progress_name,
74+
task_key,
75+
crate_name_and_version,
76+
kind,
77+
url,
78+
} = request;
79+
let dummy_task = default_persisted_download_task();
80+
let progress_name = format!("↓ {}", progress_name);
8281

83-
let task_result = model::TaskResult::Download {
84-
kind: kind.to_owned(),
85-
url: String::new(),
86-
content_length: 0,
87-
content_type: None,
88-
};
82+
let task_result = model::TaskResult::Download {
83+
kind: kind.to_owned(),
84+
url: String::new(),
85+
content_length: 0,
86+
content_type: None,
87+
};
8988

90-
self.next_action_state =
91-
(self.make_state)(crate_name_and_version.clone(), &dummy_task, &output_file_path);
92-
self.state = Some(ProcessingState {
93-
url,
94-
kind,
95-
output_file_path,
96-
result_key: crate_name_and_version.as_ref().map(|(crate_name, crate_version)| {
97-
let mut result_key = String::with_capacity(task_key.len() * 2);
98-
task_result.fq_key(&crate_name, &crate_version, &dummy_task, &mut result_key);
99-
result_key
100-
}),
101-
});
102-
Ok((dummy_task, task_key, progress_name))
103-
}
104-
}
89+
self.next_action_state = (self.make_state)(crate_name_and_version.clone(), &dummy_task, &output_file_path);
90+
self.state = Some(ProcessingState {
91+
url,
92+
kind,
93+
output_file_path,
94+
result_key: crate_name_and_version.as_ref().map(|(crate_name, crate_version)| {
95+
let mut result_key = String::with_capacity(task_key.len() * 2);
96+
task_result.fq_key(&crate_name, &crate_version, &dummy_task, &mut result_key);
97+
result_key
98+
}),
99+
});
100+
Ok((dummy_task, task_key, progress_name))
105101
}
106102

107103
fn idle_message(&self) -> String {

‎criner/src/engine/work/schedule.rs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ pub enum AsyncResult {
2828
Done,
2929
}
3030

31+
#[allow(clippy::too_many_arguments)]
3132
pub async fn tasks(
3233
assets_dir: &Path,
3334
tasks: &persistence::TaskTable,

‎criner/src/error.rs‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
11
use crates_index_diff::git2;
2-
use humantime;
3-
use rmp_serde;
42
use std::{fmt, time};
53

64
#[derive(Debug)]

0 commit comments

Comments
 (0)