fix new clippy warnings

syphar · syphar · commit 8a13ccd887c6 · 2021-06-20T09:22:01.000+02:00
diff --git a/crates/font-awesome-as-a-crate/build.rs b/crates/font-awesome-as-a-crate/build.rs
@@ -30,11 +30,7 @@ fn write_fontawesome_sprite() {
             file.read_to_string(&mut data)
                 .expect("fontawesome file read");
             // if this assert goes off, add more hashes here and in the format! below
-            assert!(
-                data.find("###").is_none(),
-                "file {} breaks raw string",
-                filename,
-            );
+            assert!(!data.contains("###"), "file {} breaks raw string", filename);
             dest_file
                 .write_all(
                     format!(
diff --git a/src/build_queue.rs b/src/build_queue.rs
@@ -101,7 +101,7 @@ impl BuildQueue {
             None => return Ok(()),
         };
 
-        let res = f(&to_process);
+        let res = f(to_process);
         self.metrics.total_builds.inc();
         match res {
             Ok(()) => {
diff --git a/src/db/add_package.rs b/src/db/add_package.rs
@@ -120,7 +120,7 @@ pub(crate) fn add_package_into_database(
 
     let release_id: i32 = rows[0].get(0);
 
-    add_keywords_into_database(conn, &metadata_pkg, release_id)?;
+    add_keywords_into_database(conn, metadata_pkg, release_id)?;
     add_compression_into_database(conn, compression_algorithms.into_iter(), release_id)?;
 
     // Update the crates table with the new release
diff --git a/src/docbuilder/rustwide_builder.rs b/src/docbuilder/rustwide_builder.rs
@@ -54,7 +54,7 @@ impl RustwideBuilder {
         let mut builder = WorkspaceBuilder::new(&config.rustwide_workspace, USER_AGENT)
             .running_inside_docker(config.inside_docker);
         if let Some(custom_image) = &config.docker_image {
-            let image = match SandboxImage::local(&custom_image) {
+            let image = match SandboxImage::local(custom_image) {
                 Ok(i) => i,
                 Err(CommandError::SandboxImageMissing(_)) => SandboxImage::remote(custom_image)?,
                 Err(err) => return Err(err.into()),
@@ -315,7 +315,7 @@ impl RustwideBuilder {
 
                 // Perform an initial build
                 let res =
-                    self.execute_build(default_target, true, &build, &limits, &metadata, false)?;
+                    self.execute_build(default_target, true, build, &limits, &metadata, false)?;
                 if res.result.successful {
                     if let Some(name) = res.cargo_metadata.root().library_name() {
                         let host_target = build.host_target_dir();
@@ -336,9 +336,9 @@ impl RustwideBuilder {
                         debug!("building package {} {} for {}", name, version, target);
                         self.build_target(
                             target,
-                            &build,
+                            build,
                             &limits,
-                            &local_storage.path(),
+                            local_storage.path(),
                             &mut successful_targets,
                             &metadata,
                         )?;
@@ -724,7 +724,7 @@ mod tests {
             let version = DUMMY_CRATE_VERSION;
             let default_target = "x86_64-unknown-linux-gnu";
 
-            assert_eq!(env.config().include_default_targets, true);
+            assert!(env.config().include_default_targets);
 
             let mut builder = RustwideBuilder::init(env).unwrap();
             builder
@@ -752,7 +752,7 @@ mod tests {
                 .unwrap();
             let row = rows.get(0).unwrap();
 
-            assert_eq!(row.get::<_, bool>("rustdoc_status"), true);
+            assert!(row.get::<_, bool>("rustdoc_status"));
             assert_eq!(row.get::<_, String>("default_target"), default_target);
             assert!(row.get::<_, Option<i32>>("total_items").is_some());
 
diff --git a/src/repositories/updater.rs b/src/repositories/updater.rs
@@ -67,7 +67,7 @@ impl fmt::Debug for RepositoryStatsUpdater {
 impl RepositoryStatsUpdater {
     pub fn new(config: &Config, pool: Pool) -> Self {
         let mut updaters: Vec<Box<dyn RepositoryForge + Send + Sync>> = Vec::new();
-        if let Ok(Some(updater)) = GitHub::new(&config) {
+        if let Ok(Some(updater)) = GitHub::new(config) {
             updaters.push(Box::new(updater));
         }
         if let Ok(updater) = GitLab::new("gitlab.com", &config.gitlab_accesstoken) {
diff --git a/src/web/build_details.rs b/src/web/build_details.rs
@@ -63,7 +63,7 @@ pub fn build_details_handler(req: &mut Request) -> IronResult<Response> {
         } else {
             let target: String = row.get("default_target");
             let path = format!("build-logs/{}/{}.txt", id, target);
-            let file = ctry!(req, File::from_path(&storage, &path, &config));
+            let file = ctry!(req, File::from_path(storage, &path, config));
             ctry!(req, String::from_utf8(file.0.content))
         };
         BuildDetails {
@@ -79,7 +79,7 @@ pub fn build_details_handler(req: &mut Request) -> IronResult<Response> {
     };
 
     BuildDetailsPage {
-        metadata: cexpect!(req, MetaData::from_crate(&mut conn, &name, &version)),
+        metadata: cexpect!(req, MetaData::from_crate(&mut conn, name, version)),
         build_details,
     }
     .into_response(req)
diff --git a/src/web/builds.rs b/src/web/builds.rs
@@ -117,7 +117,7 @@ pub fn build_list_handler(req: &mut Request) -> IronResult<Response> {
         Ok(resp)
     } else {
         BuildsPage {
-            metadata: cexpect!(req, MetaData::from_crate(&mut conn, &name, &version)),
+            metadata: cexpect!(req, MetaData::from_crate(&mut conn, name, &version)),
             builds,
             limits,
         }
diff --git a/src/web/crate_details.rs b/src/web/crate_details.rs
@@ -61,7 +61,7 @@ where
 {
     markdown
         .as_ref()
-        .map(|markdown| render_markdown(&markdown))
+        .map(|markdown| render_markdown(markdown))
         .serialize(serializer)
 }
 
@@ -280,10 +280,10 @@ pub fn crate_details_handler(req: &mut Request) -> IronResult<Response> {
 
     let mut conn = extension!(req, Pool).get()?;
 
-    match match_version(&mut conn, &name, req_version).and_then(|m| m.assume_exact())? {
+    match match_version(&mut conn, name, req_version).and_then(|m| m.assume_exact())? {
         MatchSemver::Exact((version, _)) => {
             let updater = extension!(req, RepositoryStatsUpdater);
-            let details = cexpect!(req, CrateDetails::new(&mut conn, &name, &version, &updater));
+            let details = cexpect!(req, CrateDetails::new(&mut conn, name, &version, updater));
 
             CrateDetailsPage { details }.into_response(req)
         }
diff --git a/src/web/features.rs b/src/web/features.rs
@@ -69,7 +69,7 @@ pub fn build_features_handler(req: &mut Request) -> IronResult<Response> {
     }
 
     FeaturesPage {
-        metadata: cexpect!(req, MetaData::from_crate(&mut conn, &name, &version)),
+        metadata: cexpect!(req, MetaData::from_crate(&mut conn, name, &version)),
         features,
         default_len,
     }
diff --git a/src/web/rustdoc.rs b/src/web/rustdoc.rs
@@ -116,7 +116,7 @@ pub fn rustdoc_redirector_handler(req: &mut Request) -> IronResult<Response> {
 
             let path = req.url.path();
             let path = path.join("/");
-            return match File::from_path(&storage, &path, &config) {
+            return match File::from_path(storage, &path, config) {
                 Ok(f) => Ok(f.serve()),
                 Err(..) => Err(Nope::ResourceNotFound.into()),
             };
@@ -328,7 +328,7 @@ pub fn rustdoc_html_server_handler(req: &mut Request) -> IronResult<Response> {
 
     // Get the crate's details from the database
     // NOTE: we know this crate must exist because we just checked it above (or else `match_version` is buggy)
-    let krate = cexpect!(req, CrateDetails::new(&mut conn, &name, &version, &updater));
+    let krate = cexpect!(req, CrateDetails::new(&mut conn, &name, &version, updater));
 
     // if visiting the full path to the default target, remove the target from the path
     // expects a req_path that looks like `[/:target]/.*`
@@ -353,7 +353,7 @@ pub fn rustdoc_html_server_handler(req: &mut Request) -> IronResult<Response> {
     let mut path = ctry!(req, percent_decode(path.as_bytes()).decode_utf8());
 
     // Attempt to load the file from the database
-    let file = match File::from_path(&storage, &path, &config) {
+    let file = match File::from_path(storage, &path, config) {
         Ok(file) => file,
         Err(err) => {
             log::debug!("got error serving {}: {}", path, err);
@@ -543,7 +543,7 @@ pub fn target_redirect_handler(req: &mut Request) -> IronResult<Response> {
     let base = redirect_base(req);
     let updater = extension!(req, RepositoryStatsUpdater);
 
-    let crate_details = match CrateDetails::new(&mut conn, &name, &version, &updater) {
+    let crate_details = match CrateDetails::new(&mut conn, name, version, updater) {
         Some(krate) => krate,
         None => return Err(Nope::VersionNotFound.into()),
     };
@@ -568,8 +568,8 @@ pub fn target_redirect_handler(req: &mut Request) -> IronResult<Response> {
     let path = path_for_version(
         &file_path,
         &crate_details.metadata.doc_targets,
-        &storage,
-        &config,
+        storage,
+        config,
     );
     let url = format!(
         "{base}/{name}/{version}/{path}",
@@ -601,7 +601,7 @@ pub fn badge_handler(req: &mut Request) -> IronResult<Response> {
     let mut conn = extension!(req, Pool).get()?;
 
     let options =
-        match match_version(&mut conn, &name, Some(&version)).and_then(|m| m.assume_exact()) {
+        match match_version(&mut conn, name, Some(&version)).and_then(|m| m.assume_exact()) {
             Ok(MatchSemver::Exact((version, id))) => {
                 let rows = ctry!(
                     req,
@@ -681,7 +681,7 @@ impl Handler for SharedResourceHandler {
                 let storage = extension!(req, Storage);
                 let config = extension!(req, Config);
 
-                if let Ok(file) = File::from_path(&storage, filename, &config) {
+                if let Ok(file) = File::from_path(storage, filename, config) {
                     return Ok(file.serve());
                 }
             }
diff --git a/src/web/source.rs b/src/web/source.rs
@@ -172,7 +172,7 @@ pub fn source_browser_handler(req: &mut Request) -> IronResult<Response> {
     // remove first elements from path which is /crate/:name/:version/source
     req_path.drain(0..4);
 
-    let v = match_version(&mut conn, &crate_name, Some(req_version))?;
+    let v = match_version(&mut conn, crate_name, Some(req_version))?;
     if let Some(new_name) = &v.corrected_name {
         // `match_version` checked against -/_ typos, so if we have a name here we should
         // use that instead
@@ -222,7 +222,7 @@ pub fn source_browser_handler(req: &mut Request) -> IronResult<Response> {
     // try to get actual file first
     // skip if request is a directory
     let file = if !file_path.ends_with('/') {
-        DbFile::from_path(&storage, &file_path, &config).ok()
+        DbFile::from_path(storage, &file_path, config).ok()
     } else {
         None
     };
@@ -243,7 +243,7 @@ pub fn source_browser_handler(req: &mut Request) -> IronResult<Response> {
         (None, false)
     };
 
-    let file_list = FileList::from_path(&mut conn, &crate_name, &version, &req_path)
+    let file_list = FileList::from_path(&mut conn, crate_name, &version, &req_path)
         .ok_or(Nope::ResourceNotFound)?;
 
     SourcePage {

Original file line number	Diff line number	Diff line change
`@@ -67,7 +67,7 @@ impl fmt::Debug for RepositoryStatsUpdater {`
`67`	`67`	`impl RepositoryStatsUpdater {`
`68`	`68`	`pub fn new(config: &Config, pool: Pool) -> Self {`
`69`	`69`	`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) {`
`71`	`71`	`updaters.push(Box::new(updater));`
`72`	`72`	`}`
`73`	`73`	`if let Ok(updater) = GitLab::new("gitlab.com", &config.gitlab_accesstoken) {`
Original file line number	Diff line number	Diff line change
`@@ -117,7 +117,7 @@ pub fn build_list_handler(req: &mut Request) -> IronResult<Response> {`
`117`	`117`	`Ok(resp)`
`118`	`118`	`} else {`
`119`	`119`	`BuildsPage {`
`120`		`- metadata: cexpect!(req, MetaData::from_crate(&mut conn, &name, &version)),`
	`120`	`+ metadata: cexpect!(req, MetaData::from_crate(&mut conn, name, &version)),`
`121`	`121`	`builds,`
`122`	`122`	`limits,`
`123`	`123`	`}`
Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,7 @@ where`
`61`	`61`	`{`
`62`	`62`	`markdown`
`63`	`63`	`.as_ref()`
`64`		`- .map(\|markdown\| render_markdown(&markdown))`
	`64`	`+ .map(\|markdown\| render_markdown(markdown))`
`65`	`65`	`.serialize(serializer)`
`66`	`66`	`}`
`67`	`67`
`@@ -280,10 +280,10 @@ pub fn crate_details_handler(req: &mut Request) -> IronResult<Response> {`
`280`	`280`
`281`	`281`	`let mut conn = extension!(req, Pool).get()?;`
`282`	`282`
`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())? {`
`284`	`284`	`MatchSemver::Exact((version, _)) => {`
`285`	`285`	`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));`
`287`	`287`
`288`	`288`	`CrateDetailsPage { details }.into_response(req)`
`289`	`289`	`}`
Original file line number	Diff line number	Diff line change
`@@ -69,7 +69,7 @@ pub fn build_features_handler(req: &mut Request) -> IronResult<Response> {`
`69`	`69`	`}`
`70`	`70`
`71`	`71`	`FeaturesPage {`
`72`		`- metadata: cexpect!(req, MetaData::from_crate(&mut conn, &name, &version)),`
	`72`	`+ metadata: cexpect!(req, MetaData::from_crate(&mut conn, name, &version)),`
`73`	`73`	`features,`
`74`	`74`	`default_len,`
`75`	`75`	`}`