Merge main into setup-rust-toolchain branch

Author: chriskrycho

crates/test-support/src/matchers.rs

@@ -374,12 +374,15 @@ impl Execs {
 
                 let mut matches = 0;
 
-                while let Some(..) = {
+                loop {
                     if self.diff_lines(a.clone(), e.clone(), true).is_empty() {
                         matches += 1;
                     }
-                    a.next()
-                } {}
+
+                    if a.next().is_none() {
+                        break;
+                    }
+                }
 
                 if matches == number {
                     Ok(())
@@ -553,10 +556,10 @@ fn lines_match_works() {
 fn find_mismatch<'a>(expected: &'a Value, actual: &'a Value) -> Option<(&'a Value, &'a Value)> {
     use serde_json::Value::*;
     match (expected, actual) {
-        (&Number(ref l), &Number(ref r)) if l == r => None,
-        (&Bool(l), &Bool(r)) if l == r => None,
-        (&String(ref l), &String(ref r)) if lines_match(l, r) => None,
-        (&Array(ref l), &Array(ref r)) => {
+        (Number(l), Number(r)) if l == r => None,
+        (Bool(l), Bool(r)) if l == r => None,
+        (String(l), String(r)) if lines_match(l, r) => None,
+        (Array(l), Array(r)) => {
             if l.len() != r.len() {
                 return Some((expected, actual));
             }
@@ -582,20 +585,19 @@ fn find_mismatch<'a>(expected: &'a Value, actual: &'a Value) -> Option<(&'a Valu
                 None
             }
         }
-        (&Object(ref l), &Object(ref r)) => {
+        (Object(l), Object(r)) => {
             let same_keys = l.len() == r.len() && l.keys().all(|k| r.contains_key(k));
             if !same_keys {
                 return Some((expected, actual));
             }
 
             l.values()
                 .zip(r.values())
-                .filter_map(|(l, r)| find_mismatch(l, r))
-                .next()
+                .find_map(|(l, r)| find_mismatch(l, r))
         }
-        (&Null, &Null) => None,
+        (Null, Null) => None,
         // magic string literal "{...}" acts as wildcard for any sub-JSON
-        (&String(ref l), _) if l == "{...}" => None,
+        (String(l), _) if l == "{...}" => None,
         _ => Some((expected, actual)),
     }
 }

crates/test-support/src/paths.rs

@@ -48,7 +48,7 @@ fn global_root() -> PathBuf {
 
 pub fn root() -> PathBuf {
     init();
-    global_root().join(&TASK_ID.with(|my_id| format!("t{}", my_id)))
+    global_root().join(TASK_ID.with(|my_id| format!("t{}", my_id)))
 }
 
 pub fn home() -> PathBuf {
@@ -70,6 +70,8 @@ impl Remove {
     fn at(&self, path: &Path) {
         if cfg!(windows) {
             let mut p = ok_or_panic!(path.metadata()).permissions();
+            // This lint rule is not applicable: this is in a `cfg!(windows)` block.
+            #[allow(clippy::permissions_set_readonly_false)]
             p.set_readonly(false);
             ok_or_panic! { fs::set_permissions(path, p) };
         }

crates/volta-core/src/error/reporter.rs

@@ -52,7 +52,7 @@ fn write_error_log(
     let file_name = Local::now()
         .format("volta-error-%Y-%m-%d_%H_%M_%S%.3f.log")
         .to_string();
-    let log_file_path = volta_home()?.log_dir().join(&file_name);
+    let log_file_path = volta_home()?.log_dir().join(file_name);
 
     ensure_containing_dir_exists(&log_file_path)?;
     let mut log_file = File::create(&log_file_path)?;

crates/volta-core/src/event.rs

@@ -146,8 +146,8 @@ impl EventLog {
     pub fn publish(&self, plugin: Option<&Publish>) {
         match plugin {
             // Note: This call to unimplemented is left in, as it's not a Fallible operation that can use ErrorKind::Unimplemented
-            Some(&Publish::Url(_)) => unimplemented!(),
-            Some(&Publish::Bin(ref command)) => {
+            Some(Publish::Url(_)) => unimplemented!(),
+            Some(Publish::Bin(command)) => {
                 send_events(command, &self.events);
             }
             None => {}

crates/volta-core/src/fs.rs

@@ -105,15 +105,15 @@ where
 /// Creates a NamedTempFile in the Volta tmp directory
 pub fn create_staging_file() -> Fallible<NamedTempFile> {
     let tmp_dir = volta_home()?.tmp_dir();
-    NamedTempFile::new_in(&tmp_dir).with_context(|| ErrorKind::CreateTempFileError {
+    NamedTempFile::new_in(tmp_dir).with_context(|| ErrorKind::CreateTempFileError {
         in_dir: tmp_dir.to_owned(),
     })
 }
 
 /// Creates a staging directory in the Volta tmp directory
 pub fn create_staging_dir() -> Fallible<TempDir> {
     let tmp_root = volta_home()?.tmp_dir();
-    tempdir_in(&tmp_root).with_context(|| ErrorKind::CreateTempDirError {
+    tempdir_in(tmp_root).with_context(|| ErrorKind::CreateTempDirError {
         in_dir: tmp_root.to_owned(),
     })
 }

crates/volta-core/src/hook/mod.rs

@@ -674,7 +674,7 @@ pub mod tests {
         let default_hooks_file = fixture_path("hooks/templates.json");
 
         let merged_hooks =
-            HookConfig::from_paths(&[project_hooks_file, default_hooks_file]).unwrap();
+            HookConfig::from_paths([project_hooks_file, default_hooks_file]).unwrap();
         let node = merged_hooks.node.expect("No node config found");
         let pnpm = merged_hooks.pnpm.expect("No pnpm config found");
         let yarn = merged_hooks.yarn.expect("No yarn config found");

crates/volta-core/src/inventory.rs

@@ -62,7 +62,7 @@ pub fn yarn_versions() -> Fallible<BTreeSet<Version>> {
 pub fn package_configs() -> Fallible<BTreeSet<PackageConfig>> {
     let package_dir = volta_home()?.default_package_dir();
 
-    WalkDir::new(&package_dir)
+    WalkDir::new(package_dir)
         .max_depth(2)
         .into_iter()
         // Ignore any items which didn't resolve as `DirEntry` correctly.
@@ -87,8 +87,8 @@ pub fn package_configs() -> Fallible<BTreeSet<PackageConfig>> {
                 None
             }
         })
-        .map(|file_path| PackageConfig::from_file(&file_path))
-        .collect::<Fallible<BTreeSet<PackageConfig>>>()
+        .map(PackageConfig::from_file)
+        .collect()
 }
 
 /// Reads the contents of a directory and returns the set of all versions found

crates/volta-core/src/platform/mod.rs

@@ -115,10 +115,11 @@ where
 
 /// Represents 3 possible states: Having a value, not having a value, and inheriting a value
 #[cfg_attr(test, derive(Eq, PartialEq, Debug))]
-#[derive(Clone)]
+#[derive(Clone, Default)]
 pub enum InheritOption<T> {
     Some(T),
     None,
+    #[default]
     Inherit,
 }
 
@@ -151,12 +152,6 @@ impl<T> From<InheritOption<T>> for Option<T> {
     }
 }
 
-impl<T> Default for InheritOption<T> {
-    fn default() -> Self {
-        InheritOption::Inherit
-    }
-}
-
 #[derive(Clone, PartialOrd, Ord, PartialEq, Eq)]
 #[cfg_attr(test, derive(Debug))]
 /// Represents the specification of a single Platform, regardless of the source

crates/volta-core/src/project/serial.rs

@@ -27,10 +27,7 @@ impl Manifest {
     pub fn from_file(file: &Path) -> Fallible<Self> {
         let raw = RawManifest::from_file(file)?;
 
-        let dependency_maps = raw
-            .dependencies
-            .into_iter()
-            .chain(raw.dev_dependencies.into_iter());
+        let dependency_maps = raw.dependencies.into_iter().chain(raw.dev_dependencies);
 
         let (platform, extends) = match raw.volta {
             Some(toolchain) => {
@@ -88,7 +85,7 @@ pub(super) fn update_manifest(
     key: ManifestKey,
     value: Option<&Version>,
 ) -> Fallible<()> {
-    let contents = read_to_string(&file).with_context(|| ErrorKind::PackageReadError {
+    let contents = read_to_string(file).with_context(|| ErrorKind::PackageReadError {
         file: file.to_owned(),
     })?;
 
@@ -121,7 +118,7 @@ pub(super) fn update_manifest(
     }
 
     let indent = detect_indent::detect_indent(&contents);
-    let mut output = File::create(&file).with_context(|| ErrorKind::PackageWriteError {
+    let mut output = File::create(file).with_context(|| ErrorKind::PackageWriteError {
         file: file.to_owned(),
     })?;
     let formatter = serde_json::ser::PrettyFormatter::with_indent(indent.indent().as_bytes());