chore: apply clippy advice

Author: EricCrosson

src/io.rs

@@ -4,7 +4,6 @@ use std::io::{BufWriter, Write};
 use std::path::Path;
 
 use serde::{Deserialize, Serialize};
-use serde_json;
 
 #[derive(Serialize, Deserialize, Debug, PartialEq)]
 pub struct TypescriptProjectReference {

src/lerna_manifest.rs

@@ -80,17 +80,17 @@ impl LernaManifest {
         })
     }
 
-    pub fn package_manifests_by_package_name<'a>(
-        &'a self,
-    ) -> Result<HashMap<String, &'a PackageManifest>, Box<dyn Error>> {
+    pub fn package_manifests_by_package_name(
+        &self,
+    ) -> Result<HashMap<String, &PackageManifest>, Box<dyn Error>> {
         self.internal_package_manifests
             .iter()
             .map(|manifest| Ok((manifest.contents.name.to_owned(), manifest)))
             .collect()
     }
 
     pub fn into_package_manifests_by_package_name(
-        &mut self,
+        mut self,
     ) -> Result<HashMap<String, PackageManifest>, Box<dyn Error>> {
         self.internal_package_manifests
             .drain(0..)

src/link.rs

@@ -34,10 +34,10 @@ fn key_children_by_parent(
 }
 
 // Serialize the TypeScript project references.
-fn create_project_references(children: &Vec<String>) -> TypescriptParentProjectReference {
+fn create_project_references(children: &[String]) -> TypescriptParentProjectReference {
     // Sort the TypeScript project references for deterministic file contents.
     // This minimizes diffs since the tsconfig.json files are stored in version control.
-    let mut sorted_children = children.clone();
+    let mut sorted_children = children.to_owned();
     sorted_children.sort_unstable();
     TypescriptParentProjectReference {
         files: [].to_vec(),
@@ -50,7 +50,7 @@ fn create_project_references(children: &Vec<String>) -> TypescriptParentProjectR
     }
 }
 
-fn vecs_match<T: PartialEq>(a: &Vec<T>, b: &Vec<T>) -> bool {
+fn vecs_match<T: PartialEq>(a: &[T], b: &[T]) -> bool {
     let matching = a.iter().zip(b.iter()).filter(|&(a, b)| a == b).count();
     matching == a.len() && matching == b.len()
 }
@@ -68,10 +68,10 @@ fn link_children_packages(
         .iter()
         .fold(HashMap::new(), key_children_by_parent)
         .iter()
-        .map(|(directory, children)| -> Result<(), Box<dyn Error>> {
+        .try_for_each(|(directory, children)| -> Result<(), Box<dyn Error>> {
             let desired_project_references = create_project_references(children);
             let tsconfig_filename = opts.root.join(directory).join("tsconfig.json");
-            let tsconfig = TypescriptConfig::from_directory(&opts.root, &directory)?;
+            let tsconfig = TypescriptConfig::from_directory(&opts.root, directory)?;
             let current_project_references = tsconfig
                 .contents
                 .get("references")
@@ -99,8 +99,7 @@ fn link_children_packages(
             } else {
                 write_project_references(tsconfig_filename, &desired_project_references)
             }
-        })
-        .collect::<Result<(), Box<dyn Error>>>()?;
+        })?;
 
     Ok(is_exit_success)
 }
@@ -162,9 +161,9 @@ fn link_package_dependencies(
             tsconfig
                 .contents
                 .as_object_mut()
-                .ok_or::<Box<dyn Error>>(
-                    String::from("Expected tsconfig.json to contain an Object").into(),
-                )?
+                .ok_or_else(|| -> Box<dyn Error> {
+                    String::from("Expected tsconfig.json to contain an Object").into()
+                })?
                 .insert(
                     String::from("references"),
                     serde_json::to_value(desired_project_references)?,
@@ -210,7 +209,7 @@ pub fn link_typescript_project_references(opts: crate::opts::Link) -> Result<(),
         .expect("Unable to link internal package dependencies");
 
     if opts.check_only && !(is_children_link_success && is_dependencies_link_success) {
-        return Err("Found out-of-date project references")?;
+        return Err("Found out-of-date project references".into());
     }
 
     // TODO(7): create `tsconfig.settings.json` files

src/make_depend.rs

@@ -65,11 +65,11 @@ pub fn make_dependency_makefile(opts: crate::opts::MakeDepend) -> Result<(), Box
 
     // create a string of the makefile contents
     let makefile_contents = MakefileTemplate {
-        root: &opts
+        root: opts
             .root
             .to_str()
             .expect("Monorepo root is not UTF_8 encodable"),
-        output_file: &opts
+        output_file: opts
             .output_file
             .to_str()
             .expect("Output file is not UTF-8 encodable"),
@@ -78,8 +78,8 @@ pub fn make_dependency_makefile(opts: crate::opts::MakeDepend) -> Result<(), Box
             .to_str()
             .expect("Package directory is not UTF-8 encodable"),
         scoped_package_name: &package_manifest.contents.name,
-        unscoped_package_name: &package_manifest.unscoped_package_name(),
-        pack_archive_filename: &package_manifest
+        unscoped_package_name: package_manifest.unscoped_package_name(),
+        pack_archive_filename: package_manifest
             .npm_pack_filename()
             .to_str()
             .expect("npm pack filename is not UTF-8 encodable"),
@@ -95,7 +95,7 @@ pub fn make_dependency_makefile(opts: crate::opts::MakeDepend) -> Result<(), Box
                 })
                 .collect(),
         create_pack_target: &opts.create_pack_target,
-        npm_pack_archive_dependencies: &npm_pack_archive_dependencies,
+        npm_pack_archive_dependencies,
         internal_npm_dependencies_exclusive: &npm_pack_archive_dependencies
             .keys()
             .map(|string| string.as_str())

src/package_manifest.rs

@@ -99,9 +99,9 @@ impl PackageManifest {
             self.contents
                 .extra_fields
                 .get(dependency_group)
-                .and_then(|v| serde_json::Value::as_object(v))
+                .and_then(serde_json::Value::as_object)
                 .map(|object| object.keys().collect())
-                .unwrap_or(Vec::new())
+                .unwrap_or_default()
         };
 
         get_dependency_group("dependencies")
@@ -130,12 +130,12 @@ impl PackageManifest {
 
         to_visit_package_manifests.push_back(self);
 
-        while to_visit_package_manifests.len() > 0 {
+        while !to_visit_package_manifests.is_empty() {
             let current_manifest = to_visit_package_manifests.pop_front().unwrap();
             seen_package_names.insert(&current_manifest.contents.name);
 
             for dependency in current_manifest
-                .get_internal_dependencies(&package_manifest_by_package_name)
+                .get_internal_dependencies(package_manifest_by_package_name)
                 .iter()
             {
                 internal_dependencies.insert(dependency.contents.name.to_owned());
@@ -169,14 +169,14 @@ impl PackageManifest {
         self.contents
             .extra_fields
             .get_mut(group_index)
-            .and_then(|value| serde_json::Value::as_object_mut(value))
+            .and_then(serde_json::Value::as_object_mut)
     }
 
     // Name of the archive generated by `npm pack`, for example "myscope-a-cool-package-1.0.0.tgz"
     pub fn npm_pack_file_basename(&self) -> String {
         format!(
             "{}-{}.tgz",
-            self.contents.name.trim_start_matches("@").replace("/", "-"),
+            self.contents.name.trim_start_matches('@').replace("/", "-"),
             &self.contents.version,
         )
     }
@@ -185,7 +185,7 @@ impl PackageManifest {
         self.directory().join(&self.npm_pack_file_basename())
     }
 
-    pub fn unscoped_package_name<'a>(&'a self) -> &'a str {
+    pub fn unscoped_package_name(&self) -> &str {
         match &self.contents.name.rsplit_once("/") {
             Some((_scope, name)) => name,
             None => &self.contents.name,

src/pin.rs

@@ -15,7 +15,7 @@ struct UnpinnedDependency {
 pub fn pin_version_numbers_in_internal_packages(
     opts: crate::opts::Pin,
 ) -> Result<(), Box<dyn Error>> {
-    let mut lerna_manifest = LernaManifest::from_directory(&opts.root)?;
+    let lerna_manifest = LernaManifest::from_directory(&opts.root)?;
     let mut package_manifest_by_package_name = lerna_manifest
         .into_package_manifests_by_package_name()
         .expect("Unable to read all package manifests");
@@ -77,7 +77,7 @@ pub fn pin_version_numbers_in_internal_packages(
                 });
         }
 
-        if dependencies_to_update.len() > 0 {
+        if !dependencies_to_update.is_empty() {
             if opts.check_only {
                 exit_code = 1;
                 println!(
@@ -97,7 +97,7 @@ pub fn pin_version_numbers_in_internal_packages(
     }
 
     if opts.check_only && exit_code != 0 {
-        return Err("Found unexpected dependency versions for internal packages")?;
+        return Err("Found unexpected dependency versions for internal packages".into());
     }
     Ok(())
 }

src/typescript_config.rs

@@ -3,8 +3,6 @@ use std::fs::File;
 use std::io::{BufReader, BufWriter, Write};
 use std::path::{Path, PathBuf};
 
-use serde_json;
-
 use crate::configuration_file::ConfigurationFile;
 
 pub struct TypescriptConfig {