Fix clippy warnings (#472)

mozilla · Feb 12, 2021 · e918c57 · e918c57
1 parent 0e66671
commit e918c57
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/preproc.rs b/src/preproc.rs
@@ -147,7 +147,7 @@ pub fn fix_includes<S: ::std::hash::BuildHasher>(
             for p in paths.iter() {
                 eprintln!("  - {:?}", p);
             }
-            eprintln!("");
+            eprintln!();
 
             scc_map.insert(replacement, paths);
         }

diff --git a/src/tools.rs b/src/tools.rs
@@ -238,7 +238,7 @@ pub(crate) fn remove_blank_lines(data: &mut Vec<u8>) {
     }
 }
 
-pub(crate) fn normalize_path<P: AsRef<Path>>(path: P) -> Option<PathBuf> {
+pub(crate) fn normalize_path<P: AsRef<Path>>(path: P) -> PathBuf {
     // Copied from Cargo sources: https://github.com/rust-lang/cargo/blob/master/src/cargo/util/paths.rs#L65
     let mut components = path.as_ref().components().peekable();
     let mut ret = if let Some(c @ Component::Prefix(..)) = components.peek().cloned() {
@@ -263,7 +263,7 @@ pub(crate) fn normalize_path<P: AsRef<Path>>(path: P) -> Option<PathBuf> {
             }
         }
     }
-    Some(ret)
+    ret
 }
 
 pub(crate) fn get_paths_dist(path1: &PathBuf, path2: &PathBuf) -> Option<usize> {
@@ -288,7 +288,7 @@ pub(crate) fn guess_file<S: ::std::hash::BuildHasher>(
     } else {
         include_path
     };
-    let include_path = normalize_path(include_path).unwrap();
+    let include_path = normalize_path(include_path);
     if let Some(possibilities) = all_files.get(include_path.file_name().unwrap().to_str().unwrap())
     {
         if possibilities.len() == 1 {