Skip to content

Commit 8a13ccd

Browse files
sypharsyphar
committed
fix new clippy warnings
1 parent 4924b95 commit 8a13ccd

File tree

11 files changed

+28
-32
lines changed

11 files changed

+28
-32
lines changed

‎crates/font-awesome-as-a-crate/build.rs

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,7 @@ fn write_fontawesome_sprite() {
3030
file.read_to_string(&mut data)
3131
.expect("fontawesome file read");
3232
// if this assert goes off, add more hashes here and in the format! below
33-
assert!(
34-
data.find("###").is_none(),
35-
"file {} breaks raw string",
36-
filename,
37-
);
33+
assert!(!data.contains("###"), "file {} breaks raw string", filename);
3834
dest_file
3935
.write_all(
4036
format!(

‎src/build_queue.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ impl BuildQueue {
101101
None => return Ok(()),
102102
};
103103

104-
let res = f(&to_process);
104+
let res = f(to_process);
105105
self.metrics.total_builds.inc();
106106
match res {
107107
Ok(()) => {

‎src/db/add_package.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ pub(crate) fn add_package_into_database(
120120

121121
let release_id: i32 = rows[0].get(0);
122122

123-
add_keywords_into_database(conn, &metadata_pkg, release_id)?;
123+
add_keywords_into_database(conn, metadata_pkg, release_id)?;
124124
add_compression_into_database(conn, compression_algorithms.into_iter(), release_id)?;
125125

126126
// Update the crates table with the new release

‎src/docbuilder/rustwide_builder.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ impl RustwideBuilder {
5454
let mut builder = WorkspaceBuilder::new(&config.rustwide_workspace, USER_AGENT)
5555
.running_inside_docker(config.inside_docker);
5656
if let Some(custom_image) = &config.docker_image {
57-
let image = match SandboxImage::local(&custom_image) {
57+
let image = match SandboxImage::local(custom_image) {
5858
Ok(i) => i,
5959
Err(CommandError::SandboxImageMissing(_)) => SandboxImage::remote(custom_image)?,
6060
Err(err) => return Err(err.into()),
@@ -315,7 +315,7 @@ impl RustwideBuilder {
315315

316316
// Perform an initial build
317317
let res =
318-
self.execute_build(default_target, true, &build, &limits, &metadata, false)?;
318+
self.execute_build(default_target, true, build, &limits, &metadata, false)?;
319319
if res.result.successful {
320320
if let Some(name) = res.cargo_metadata.root().library_name() {
321321
let host_target = build.host_target_dir();
@@ -336,9 +336,9 @@ impl RustwideBuilder {
336336
debug!("building package {} {} for {}", name, version, target);
337337
self.build_target(
338338
target,
339-
&build,
339+
build,
340340
&limits,
341-
&local_storage.path(),
341+
local_storage.path(),
342342
&mut successful_targets,
343343
&metadata,
344344
)?;
@@ -724,7 +724,7 @@ mod tests {
724724
let version = DUMMY_CRATE_VERSION;
725725
let default_target = "x86_64-unknown-linux-gnu";
726726

727-
assert_eq!(env.config().include_default_targets, true);
727+
assert!(env.config().include_default_targets);
728728

729729
let mut builder = RustwideBuilder::init(env).unwrap();
730730
builder
@@ -752,7 +752,7 @@ mod tests {
752752
.unwrap();
753753
let row = rows.get(0).unwrap();
754754

755-
assert_eq!(row.get::<_, bool>("rustdoc_status"), true);
755+
assert!(row.get::<_, bool>("rustdoc_status"));
756756
assert_eq!(row.get::<_, String>("default_target"), default_target);
757757
assert!(row.get::<_, Option<i32>>("total_items").is_some());
758758

‎src/repositories/updater.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ impl fmt::Debug for RepositoryStatsUpdater {
6767
impl RepositoryStatsUpdater {
6868
pub fn new(config: &Config, pool: Pool) -> Self {
6969
let mut updaters: Vec<Box<dyn RepositoryForge + Send + Sync>> = Vec::new();
70-
if let Ok(Some(updater)) = GitHub::new(&config) {
70+
if let Ok(Some(updater)) = GitHub::new(config) {
7171
updaters.push(Box::new(updater));
7272
}
7373
if let Ok(updater) = GitLab::new("gitlab.com", &config.gitlab_accesstoken) {

‎src/web/build_details.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ pub fn build_details_handler(req: &mut Request) -> IronResult<Response> {
6363
} else {
6464
let target: String = row.get("default_target");
6565
let path = format!("build-logs/{}/{}.txt", id, target);
66-
let file = ctry!(req, File::from_path(&storage, &path, &config));
66+
let file = ctry!(req, File::from_path(storage, &path, config));
6767
ctry!(req, String::from_utf8(file.0.content))
6868
};
6969
BuildDetails {
@@ -79,7 +79,7 @@ pub fn build_details_handler(req: &mut Request) -> IronResult<Response> {
7979
};
8080

8181
BuildDetailsPage {
82-
metadata: cexpect!(req, MetaData::from_crate(&mut conn, &name, &version)),
82+
metadata: cexpect!(req, MetaData::from_crate(&mut conn, name, version)),
8383
build_details,
8484
}
8585
.into_response(req)

‎src/web/builds.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ pub fn build_list_handler(req: &mut Request) -> IronResult<Response> {
117117
Ok(resp)
118118
} else {
119119
BuildsPage {
120-
metadata: cexpect!(req, MetaData::from_crate(&mut conn, &name, &version)),
120+
metadata: cexpect!(req, MetaData::from_crate(&mut conn, name, &version)),
121121
builds,
122122
limits,
123123
}

‎src/web/crate_details.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ where
6161
{
6262
markdown
6363
.as_ref()
64-
.map(|markdown| render_markdown(&markdown))
64+
.map(|markdown| render_markdown(markdown))
6565
.serialize(serializer)
6666
}
6767

@@ -280,10 +280,10 @@ pub fn crate_details_handler(req: &mut Request) -> IronResult<Response> {
280280

281281
let mut conn = extension!(req, Pool).get()?;
282282

283-
match match_version(&mut conn, &name, req_version).and_then(|m| m.assume_exact())? {
283+
match match_version(&mut conn, name, req_version).and_then(|m| m.assume_exact())? {
284284
MatchSemver::Exact((version, _)) => {
285285
let updater = extension!(req, RepositoryStatsUpdater);
286-
let details = cexpect!(req, CrateDetails::new(&mut conn, &name, &version, &updater));
286+
let details = cexpect!(req, CrateDetails::new(&mut conn, name, &version, updater));
287287

288288
CrateDetailsPage { details }.into_response(req)
289289
}

‎src/web/features.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ pub fn build_features_handler(req: &mut Request) -> IronResult<Response> {
6969
}
7070

7171
FeaturesPage {
72-
metadata: cexpect!(req, MetaData::from_crate(&mut conn, &name, &version)),
72+
metadata: cexpect!(req, MetaData::from_crate(&mut conn, name, &version)),
7373
features,
7474
default_len,
7575
}

‎src/web/rustdoc.rs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ pub fn rustdoc_redirector_handler(req: &mut Request) -> IronResult<Response> {
116116

117117
let path = req.url.path();
118118
let path = path.join("/");
119-
return match File::from_path(&storage, &path, &config) {
119+
return match File::from_path(storage, &path, config) {
120120
Ok(f) => Ok(f.serve()),
121121
Err(..) => Err(Nope::ResourceNotFound.into()),
122122
};
@@ -328,7 +328,7 @@ pub fn rustdoc_html_server_handler(req: &mut Request) -> IronResult<Response> {
328328

329329
// Get the crate's details from the database
330330
// NOTE: we know this crate must exist because we just checked it above (or else `match_version` is buggy)
331-
let krate = cexpect!(req, CrateDetails::new(&mut conn, &name, &version, &updater));
331+
let krate = cexpect!(req, CrateDetails::new(&mut conn, &name, &version, updater));
332332

333333
// if visiting the full path to the default target, remove the target from the path
334334
// expects a req_path that looks like `[/:target]/.*`
@@ -353,7 +353,7 @@ pub fn rustdoc_html_server_handler(req: &mut Request) -> IronResult<Response> {
353353
let mut path = ctry!(req, percent_decode(path.as_bytes()).decode_utf8());
354354

355355
// Attempt to load the file from the database
356-
let file = match File::from_path(&storage, &path, &config) {
356+
let file = match File::from_path(storage, &path, config) {
357357
Ok(file) => file,
358358
Err(err) => {
359359
log::debug!("got error serving {}: {}", path, err);
@@ -543,7 +543,7 @@ pub fn target_redirect_handler(req: &mut Request) -> IronResult<Response> {
543543
let base = redirect_base(req);
544544
let updater = extension!(req, RepositoryStatsUpdater);
545545

546-
let crate_details = match CrateDetails::new(&mut conn, &name, &version, &updater) {
546+
let crate_details = match CrateDetails::new(&mut conn, name, version, updater) {
547547
Some(krate) => krate,
548548
None => return Err(Nope::VersionNotFound.into()),
549549
};
@@ -568,8 +568,8 @@ pub fn target_redirect_handler(req: &mut Request) -> IronResult<Response> {
568568
let path = path_for_version(
569569
&file_path,
570570
&crate_details.metadata.doc_targets,
571-
&storage,
572-
&config,
571+
storage,
572+
config,
573573
);
574574
let url = format!(
575575
"{base}/{name}/{version}/{path}",
@@ -601,7 +601,7 @@ pub fn badge_handler(req: &mut Request) -> IronResult<Response> {
601601
let mut conn = extension!(req, Pool).get()?;
602602

603603
let options =
604-
match match_version(&mut conn, &name, Some(&version)).and_then(|m| m.assume_exact()) {
604+
match match_version(&mut conn, name, Some(&version)).and_then(|m| m.assume_exact()) {
605605
Ok(MatchSemver::Exact((version, id))) => {
606606
let rows = ctry!(
607607
req,
@@ -681,7 +681,7 @@ impl Handler for SharedResourceHandler {
681681
let storage = extension!(req, Storage);
682682
let config = extension!(req, Config);
683683

684-
if let Ok(file) = File::from_path(&storage, filename, &config) {
684+
if let Ok(file) = File::from_path(storage, filename, config) {
685685
return Ok(file.serve());
686686
}
687687
}

‎src/web/source.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ pub fn source_browser_handler(req: &mut Request) -> IronResult<Response> {
172172
// remove first elements from path which is /crate/:name/:version/source
173173
req_path.drain(0..4);
174174

175-
let v = match_version(&mut conn, &crate_name, Some(req_version))?;
175+
let v = match_version(&mut conn, crate_name, Some(req_version))?;
176176
if let Some(new_name) = &v.corrected_name {
177177
// `match_version` checked against -/_ typos, so if we have a name here we should
178178
// use that instead
@@ -222,7 +222,7 @@ pub fn source_browser_handler(req: &mut Request) -> IronResult<Response> {
222222
// try to get actual file first
223223
// skip if request is a directory
224224
let file = if !file_path.ends_with('/') {
225-
DbFile::from_path(&storage, &file_path, &config).ok()
225+
DbFile::from_path(storage, &file_path, config).ok()
226226
} else {
227227
None
228228
};
@@ -243,7 +243,7 @@ pub fn source_browser_handler(req: &mut Request) -> IronResult<Response> {
243243
(None, false)
244244
};
245245

246-
let file_list = FileList::from_path(&mut conn, &crate_name, &version, &req_path)
246+
let file_list = FileList::from_path(&mut conn, crate_name, &version, &req_path)
247247
.ok_or(Nope::ResourceNotFound)?;
248248

249249
SourcePage {

0 commit comments

Comments
 (0)