chore: rm &PathBuf

Author: DaniPopes

Cargo.toml

@@ -22,8 +22,9 @@ manual-string-new = "warn"
 uninlined-format-args = "warn"
 use-self = "warn"
 redundant-clone = "warn"
-# until <https://github.com/rust-lang/rust-clippy/issues/13885> is fixed
-literal-string-with-formatting-args = "allow"
+
+result-large-err = "allow"
+large-enum-variant = "allow"
 
 [workspace.lints.rust]
 rust-2018-idioms = "warn"

crates/compilers/src/flatten.rs

@@ -212,7 +212,7 @@ impl Flattener {
         let sources = Source::read_all_files(vec![target.to_path_buf()])?;
         let graph = Graph::<C::ParsedSource>::resolve_sources(&project.paths, sources)?;
 
-        let ordered_sources = collect_ordered_deps(&target.to_path_buf(), &project.paths, &graph)?;
+        let ordered_sources = collect_ordered_deps(target, &project.paths, &graph)?;
 
         #[cfg(windows)]
         let ordered_sources = {
@@ -244,7 +244,7 @@ impl Flattener {
             sources,
             asts,
             ordered_sources,
-            project_root: project.root().clone(),
+            project_root: project.root().to_path_buf(),
         })
     }
 
@@ -795,12 +795,12 @@ impl Flattener {
 
 /// Performs DFS to collect all dependencies of a target
 fn collect_deps<D: ParsedSource + MaybeSolData>(
-    path: &PathBuf,
+    path: &Path,
     paths: &ProjectPathsConfig<D::Language>,
     graph: &Graph<D>,
     deps: &mut HashSet<PathBuf>,
 ) -> Result<()> {
-    if deps.insert(path.clone()) {
+    if deps.insert(path.to_path_buf()) {
         let target_dir = path.parent().ok_or_else(|| {
             SolcError::msg(format!("failed to get parent directory for \"{}\"", path.display()))
         })?;
@@ -831,7 +831,7 @@ fn collect_deps<D: ParsedSource + MaybeSolData>(
 /// order. If files have the same number of dependencies, we sort them alphabetically.
 /// Target file is always placed last.
 pub fn collect_ordered_deps<D: ParsedSource + MaybeSolData>(
-    path: &PathBuf,
+    path: &Path,
     paths: &ProjectPathsConfig<D::Language>,
     graph: &Graph<D>,
 ) -> Result<Vec<PathBuf>> {
@@ -871,7 +871,7 @@ pub fn collect_ordered_deps<D: ParsedSource + MaybeSolData>(
     let mut ordered_deps =
         paths_with_deps_count.into_iter().map(|(_, path)| path).collect::<Vec<_>>();
 
-    ordered_deps.push(path.clone());
+    ordered_deps.push(path.to_path_buf());
 
     Ok(ordered_deps)
 }

crates/compilers/src/lib.rs

@@ -213,27 +213,27 @@ where
 
 impl<T: ArtifactOutput<CompilerContract = C::CompilerContract>, C: Compiler> Project<C, T> {
     /// Returns the path to the artifacts directory
-    pub fn artifacts_path(&self) -> &PathBuf {
+    pub fn artifacts_path(&self) -> &Path {
         &self.paths.artifacts
     }
 
     /// Returns the path to the sources directory
-    pub fn sources_path(&self) -> &PathBuf {
+    pub fn sources_path(&self) -> &Path {
         &self.paths.sources
     }
 
     /// Returns the path to the cache file
-    pub fn cache_path(&self) -> &PathBuf {
+    pub fn cache_path(&self) -> &Path {
         &self.paths.cache
     }
 
     /// Returns the path to the `build-info` directory nested in the artifacts dir
-    pub fn build_info_path(&self) -> &PathBuf {
+    pub fn build_info_path(&self) -> &Path {
         &self.paths.build_infos
     }
 
     /// Returns the root directory of the project
-    pub fn root(&self) -> &PathBuf {
+    pub fn root(&self) -> &Path {
         &self.paths.root
     }
 
@@ -349,7 +349,7 @@ impl<T: ArtifactOutput<CompilerContract = C::CompilerContract>, C: Compiler> Pro
             std::fs::remove_file(self.cache_path())
                 .map_err(|err| SolcIoError::new(err, self.cache_path()))?;
             if let Some(cache_folder) =
-                self.cache_path().parent().filter(|cache_folder| self.root() != cache_folder)
+                self.cache_path().parent().filter(|cache_folder| self.root() != *cache_folder)
             {
                 // remove the cache folder if the cache file was the only file
                 if cache_folder
@@ -368,14 +368,14 @@ impl<T: ArtifactOutput<CompilerContract = C::CompilerContract>, C: Compiler> Pro
         // clean the artifacts dir
         if self.artifacts_path().exists() && self.root() != self.artifacts_path() {
             std::fs::remove_dir_all(self.artifacts_path())
-                .map_err(|err| SolcIoError::new(err, self.artifacts_path().clone()))?;
+                .map_err(|err| SolcIoError::new(err, self.artifacts_path()))?;
             trace!("removed artifacts dir \"{}\"", self.artifacts_path().display());
         }
 
         // also clean the build-info dir, in case it's not nested in the artifacts dir
         if self.build_info_path().exists() && self.root() != self.build_info_path() {
             std::fs::remove_dir_all(self.build_info_path())
-                .map_err(|err| SolcIoError::new(err, self.build_info_path().clone()))?;
+                .map_err(|err| SolcIoError::new(err, self.build_info_path()))?;
             tracing::trace!("removed build-info dir \"{}\"", self.build_info_path().display());
         }
 

crates/compilers/src/preprocessor/deps.rs

@@ -28,7 +28,7 @@ impl PreprocessorDependencies {
         sess: &Session,
         hir: &Hir<'_>,
         paths: &[PathBuf],
-        src_dir: &PathBuf,
+        src_dir: &Path,
         root_dir: &Path,
         mocks: &mut HashSet<PathBuf>,
     ) -> Self {
@@ -128,7 +128,7 @@ struct BytecodeDependencyCollector<'hir> {
     /// Source content of current contract.
     src: &'hir str,
     /// Project source dir, used to determine if referenced contract is a source contract.
-    src_dir: &'hir PathBuf,
+    src_dir: &'hir Path,
     /// Dependencies collected for current contract.
     dependencies: Vec<BytecodeDependency>,
     /// Unique HIR ids of contracts referenced from current contract.
@@ -140,7 +140,7 @@ impl<'hir> BytecodeDependencyCollector<'hir> {
         source_map: &'hir SourceMap,
         hir: &'hir Hir<'hir>,
         src: &'hir str,
-        src_dir: &'hir PathBuf,
+        src_dir: &'hir Path,
     ) -> Self {
         Self {
             source_map,