Merge pull request #1274 from GuillaumeGomez/fix-clippy-warnings

Fix clippy warnings

Author: GuillaumeGomez

src/db/file.rs

@@ -29,21 +29,21 @@ pub fn add_path_into_database<P: AsRef<Path>>(
 ) -> Result<(Value, CompressionAlgorithms)> {
     let (file_list, algorithms) = storage.store_all(prefix, path.as_ref())?;
     Ok((
-        file_list_to_json(file_list.into_iter().collect())?,
+        file_list_to_json(file_list.into_iter().collect()),
         algorithms,
     ))
 }
 
-fn file_list_to_json(file_list: Vec<(PathBuf, String)>) -> Result<Value> {
-    let file_list: Vec<_> = file_list
-        .into_iter()
-        .map(|(path, name)| {
-            Value::Array(vec![
-                Value::String(name),
-                Value::String(path.into_os_string().into_string().unwrap()),
-            ])
-        })
-        .collect();
-
-    Ok(Value::Array(file_list))
+fn file_list_to_json(file_list: Vec<(PathBuf, String)>) -> Value {
+    Value::Array(
+        file_list
+            .into_iter()
+            .map(|(path, name)| {
+                Value::Array(vec![
+                    Value::String(name),
+                    Value::String(path.into_os_string().into_string().unwrap()),
+                ])
+            })
+            .collect(),
+    )
 }

src/docbuilder/crates.rs

@@ -3,9 +3,9 @@ use failure::err_msg;
 use serde_json::Value;
 use std::io::prelude::*;
 use std::io::BufReader;
-use std::{fs, path::PathBuf, str::FromStr};
+use std::{fs, path::Path, str::FromStr};
 
-fn crates_from_file<F>(path: &PathBuf, func: &mut F) -> Result<()>
+fn crates_from_file<F>(path: &Path, func: &mut F) -> Result<()>
 where
     F: FnMut(&str, &str),
 {
@@ -61,7 +61,7 @@ where
     Ok(())
 }
 
-pub fn crates_from_path<F>(path: &PathBuf, func: &mut F) -> Result<()>
+pub fn crates_from_path<F>(path: &Path, func: &mut F) -> Result<()>
 where
     F: FnMut(&str, &str),
 {

src/docbuilder/rustwide_builder.rs

@@ -584,11 +584,12 @@ impl RustwideBuilder {
         }
 
         // Add docs.rs specific arguments
-        let mut cargo_args = Vec::new();
-        // We know that `metadata` unconditionally passes `-Z rustdoc-map`.
-        // Don't copy paste this, since that fact is not stable and may change in the future.
-        cargo_args.push("-Zunstable-options".into());
-        cargo_args.push(r#"--config=doc.extern-map.registries.crates-io="https://docs.rs""#.into());
+        let mut cargo_args = vec![
+            // We know that `metadata` unconditionally passes `-Z rustdoc-map`.
+            // Don't copy paste this, since that fact is not stable and may change in the future.
+            "-Zunstable-options".into(),
+            r#"--config=doc.extern-map.registries.crates-io="https://docs.rs""#.into(),
+        ];
         if let Some(cpu_limit) = self.config.build_cpu_limit {
             cargo_args.push(format!("-j{}", cpu_limit));
         }

src/storage/mod.rs

@@ -139,7 +139,7 @@ impl Storage {
                 conn = db.start_connection()?;
                 Box::new(conn.start_storage_transaction()?)
             }
-            StorageBackend::S3(s3) => Box::new(s3.start_storage_transaction()?),
+            StorageBackend::S3(s3) => Box::new(s3.start_storage_transaction()),
         };
 
         let res = f(trans.as_mut())?;
@@ -173,7 +173,7 @@ impl Storage {
                 let content = compress(file, alg)?;
                 let bucket_path = Path::new(prefix).join(&file_path).to_slash().unwrap();
 
-                let mime = detect_mime(&file_path)?;
+                let mime = detect_mime(&file_path);
                 file_paths_and_mimes.insert(file_path, mime.to_string());
                 algs.insert(alg);
 
@@ -207,7 +207,7 @@ impl Storage {
         let content = content.into();
         let alg = CompressionAlgorithm::default();
         let content = compress(&*content, alg)?;
-        let mime = detect_mime(&path)?.to_owned();
+        let mime = detect_mime(&path).to_owned();
 
         self.store_inner(std::iter::once(Ok(Blob {
             path,
@@ -272,11 +272,11 @@ trait StorageTransaction {
     fn complete(self: Box<Self>) -> Result<(), Error>;
 }
 
-fn detect_mime(file_path: impl AsRef<Path>) -> Result<&'static str, Error> {
+fn detect_mime(file_path: impl AsRef<Path>) -> &'static str {
     let mime = mime_guess::from_path(file_path.as_ref())
         .first_raw()
         .unwrap_or("text/plain");
-    Ok(match mime {
+    match mime {
         "text/plain" | "text/troff" | "text/x-markdown" | "text/x-rust" | "text/x-toml" => {
             match file_path.as_ref().extension().and_then(OsStr::to_str) {
                 Some("md") => "text/markdown",
@@ -291,7 +291,7 @@ fn detect_mime(file_path: impl AsRef<Path>) -> Result<&'static str, Error> {
         }
         "image/svg" => "image/svg+xml",
         _ => mime,
-    })
+    }
 }
 
 #[cfg(test)]
@@ -327,7 +327,6 @@ mod test {
 
     fn check_mime(path: &str, expected_mime: &str) {
         let detected_mime = detect_mime(Path::new(&path));
-        let detected_mime = detected_mime.expect("no mime was given");
         assert_eq!(detected_mime, expected_mime);
     }
 }

src/storage/s3.rs

@@ -132,8 +132,8 @@ impl S3Backend {
         })
     }
 
-    pub(super) fn start_storage_transaction(&self) -> Result<S3StorageTransaction, Error> {
-        Ok(S3StorageTransaction { s3: self })
+    pub(super) fn start_storage_transaction(&self) -> S3StorageTransaction {
+        S3StorageTransaction { s3: self }
     }
 
     #[cfg(test)]
@@ -146,7 +146,7 @@ impl S3Backend {
             panic!("safeguard to prevent deleting the production bucket");
         }
 
-        let mut transaction = Box::new(self.start_storage_transaction()?);
+        let mut transaction = Box::new(self.start_storage_transaction());
         transaction.delete_prefix("")?;
         transaction.complete()?;
 

src/web/mod.rs

@@ -614,10 +614,12 @@ mod test {
         Some(version)
     }
 
+    #[allow(clippy::unnecessary_wraps)]
     fn semver(version: &'static str) -> Option<String> {
         Some(version.into())
     }
 
+    #[allow(clippy::unnecessary_wraps)]
     fn exact(version: &'static str) -> Option<String> {
         Some(version.into())
     }

src/web/page/templates.rs

@@ -86,7 +86,7 @@ fn load_rustc_resource_suffix(conn: &mut Client) -> Result<String> {
 
     if let Ok(vers) = res[0].try_get::<_, Value>("value") {
         if let Some(vers_str) = vers.as_str() {
-            return Ok(crate::utils::parse_rustc_version(vers_str)?);
+            return crate::utils::parse_rustc_version(vers_str);
         }
     }
 
@@ -200,6 +200,7 @@ impl tera::Function for ReturnValue {
 
 /// Prettily format a timestamp
 // TODO: This can be replaced by chrono
+#[allow(clippy::unnecessary_wraps)]
 fn timeformat(value: &Value, args: &HashMap<String, Value>) -> TeraResult<Value> {
     let fmt = if let Some(Value::Bool(true)) = args.get("relative") {
         let value = DateTime::parse_from_rfc3339(value.as_str().unwrap())
@@ -235,13 +236,15 @@ fn timeformat(value: &Value, args: &HashMap<String, Value>) -> TeraResult<Value>
 }
 
 /// Print a tera value to stdout
+#[allow(clippy::unnecessary_wraps)]
 fn dbg(value: &Value, _args: &HashMap<String, Value>) -> TeraResult<Value> {
     println!("{:?}", value);
 
     Ok(value.clone())
 }
 
 /// Dedent a string by removing all leading whitespace
+#[allow(clippy::unnecessary_wraps)]
 fn dedent(value: &Value, args: &HashMap<String, Value>) -> TeraResult<Value> {
     let string = value.as_str().expect("dedent takes a string");
 

src/web/statics.rs

@@ -20,9 +20,9 @@ pub(crate) fn static_handler(req: &mut Request) -> IronResult<Response> {
     let file = file.join("/");
 
     Ok(match file.as_str() {
-        "vendored.css" => serve_resource(VENDORED_CSS, ContentType("text/css".parse().unwrap()))?,
-        "style.css" => serve_resource(STYLE_CSS, ContentType("text/css".parse().unwrap()))?,
-        "rustdoc.css" => serve_resource(RUSTDOC_CSS, ContentType("text/css".parse().unwrap()))?,
+        "vendored.css" => serve_resource(VENDORED_CSS, ContentType("text/css".parse().unwrap())),
+        "style.css" => serve_resource(STYLE_CSS, ContentType("text/css".parse().unwrap())),
+        "rustdoc.css" => serve_resource(RUSTDOC_CSS, ContentType("text/css".parse().unwrap())),
         file => serve_file(file)?,
     })
 }
@@ -79,10 +79,10 @@ fn serve_file(file: &str) -> IronResult<Response> {
         ));
     }
 
-    serve_resource(contents, content_type)
+    Ok(serve_resource(contents, content_type))
 }
 
-fn serve_resource<R, C>(resource: R, content_type: C) -> IronResult<Response>
+fn serve_resource<R, C>(resource: R, content_type: C) -> Response
 where
     R: AsRef<[u8]>,
     C: Into<Option<ContentType>>,
@@ -110,7 +110,7 @@ where
         response.headers.set(content_type);
     }
 
-    Ok(response)
+    response
 }
 
 pub(super) fn ico_handler(req: &mut Request) -> IronResult<Response> {