chore: cargo fmt

Signed-off-by: Sam Gammon <[email protected]>

Author: sgammon

crates/nassun/src/fetch/dir.rs

@@ -264,7 +264,7 @@ mod test {
     use super::*;
     use std::{fs::File, io::Write, path::PathBuf};
 
-    use tempfile::{tempdir, TempDir};
+    use tempfile::{TempDir, tempdir};
 
     use crate::error::IoContext;
 

crates/nassun/src/fetch/git.rs

@@ -11,8 +11,8 @@ use oro_package_spec::{GitInfo, PackageSpec};
 use url::Url;
 
 use crate::error::{NassunError, Result};
-use crate::fetch::dir::DirFetcher;
 use crate::fetch::PackageFetcher;
+use crate::fetch::dir::DirFetcher;
 use crate::package::Package;
 use crate::resolver::PackageResolution;
 use crate::tarball::Tarball;

crates/nassun/src/fetch/npm.rs

@@ -98,12 +98,7 @@ impl PackageFetcher for NpmFetcher {
     ) -> Result<Arc<CorgiPackument>> {
         // When fetching the packument itself, we need the _package_ name, not
         // its alias! Hence these shenanigans.
-        if let PackageSpec::Npm {
-            name,
-            scope,
-            ..
-        } = spec.target()
-        {
+        if let PackageSpec::Npm { name, scope, .. } = spec.target() {
             if let Some(packument) = self.corgi_packuments.get(name) {
                 if self.cache_packuments {
                     return Ok(packument.value().clone());
@@ -129,12 +124,7 @@ impl PackageFetcher for NpmFetcher {
             pkg @ PackageSpec::Npm { .. } => pkg,
             _ => unreachable!(),
         };
-        if let PackageSpec::Npm {
-            name,
-            scope,
-            ..
-        } = pkg
-        {
+        if let PackageSpec::Npm { name, scope, .. } = pkg {
             if let Some(packument) = self.packuments.get(name) {
                 if self.cache_packuments {
                     return Ok(packument.value().clone());

crates/nassun/src/package.rs

@@ -224,7 +224,10 @@ impl Package {
                         // (bad data, etc), then go ahead and do a network
                         // extract.
                         Err(e) => {
-                            tracing::warn!("extracting package {:?} from cache failed, possily due to cache corruption: {e}", self.resolved());
+                            tracing::warn!(
+                                "extracting package {:?} from cache failed, possily due to cache corruption: {e}",
+                                self.resolved()
+                            );
                             if let Some(entry) =
                                 cacache::index::find(cache, &crate::tarball::tarball_key(&sri))
                                     .map_err(|e| NassunError::ExtractCacheError(e, None))?

crates/nassun/src/tarball.rs

@@ -29,13 +29,13 @@ use ssri::{Integrity, IntegrityChecker};
 #[cfg(not(target_arch = "wasm32"))]
 use tempfile::NamedTempFile;
 
+use crate::TarballStream;
 use crate::entries::{Entries, Entry};
 #[cfg(not(target_arch = "wasm32"))]
 use crate::error::IoContext;
 use crate::error::{NassunError, Result};
 #[cfg(not(target_arch = "wasm32"))]
 use crate::package::ExtractMode;
-use crate::TarballStream;
 
 #[cfg(not(target_arch = "wasm32"))]
 const MAX_IN_MEMORY_TARBALL_SIZE: usize = 1024 * 1024 * 5;

crates/node-maintainer/src/error.rs

@@ -125,7 +125,9 @@ pub enum NodeMaintainerError {
     #[diagnostic(
         code(node_maintainer::junctions_not_supported),
         url(docsrs),
-        help("The isolated linker requires your Windows user to either be able to create symlinks, which requires Administrator privileges, or create junctions, which require an NTFS filesystem, among other things. If you see this message, you might consider switching to the 'hoisted' linker instead.")
+        help(
+            "The isolated linker requires your Windows user to either be able to create symlinks, which requires Administrator privileges, or create junctions, which require an NTFS filesystem, among other things. If you see this message, you might consider switching to the 'hoisted' linker instead."
+        )
     )]
     JunctionsNotSupported(
         std::path::PathBuf,
@@ -190,7 +192,9 @@ pub enum NodeMaintainerError {
     /// lockfile and get this error without any modifications to package.json,
     /// please [report this as a
     /// bug](https://github.com/orogene/orogene/issues/new).
-    #[error("Locked file was requested, but a new dependency tree was resolved that would cause changes to the lockfile. The contents of `package.json` may have changed since the last time the lockfile was updated.")]
+    #[error(
+        "Locked file was requested, but a new dependency tree was resolved that would cause changes to the lockfile. The contents of `package.json` may have changed since the last time the lockfile was updated."
+    )]
     #[diagnostic(
         code(node_maintainer::lockfile_mismatch),
         url(docsrs),

crates/node-maintainer/src/graph.rs

@@ -7,14 +7,14 @@ use std::{
 
 use indexmap::IndexMap;
 use kdl::KdlDocument;
-use nassun::{package::Package, PackageResolution, PackageSpec};
+use nassun::{PackageResolution, PackageSpec, package::Package};
 use oro_common::CorgiManifest;
-use petgraph::stable_graph::{EdgeIndex, NodeIndex, StableGraph};
 #[cfg(not(target_arch = "wasm32"))]
 use petgraph::Direction;
+use petgraph::stable_graph::{EdgeIndex, NodeIndex, StableGraph};
 use unicase::UniCase;
 
-use crate::{error::NodeMaintainerError, Lockfile, LockfileNode};
+use crate::{Lockfile, LockfileNode, error::NodeMaintainerError};
 
 #[cfg(debug_assertions)]
 use NodeMaintainerError::GraphValidationError;

crates/node-maintainer/src/linkers/hoisted.rs

@@ -2,7 +2,7 @@ use std::collections::HashSet;
 use std::ffi::OsStr;
 use std::path::PathBuf;
 use std::sync::atomic::AtomicUsize;
-use std::sync::{atomic, Arc};
+use std::sync::{Arc, atomic};
 
 use dashmap::DashSet;
 use futures::lock::Mutex;
@@ -98,7 +98,10 @@ impl HoistedLinker {
                 }
             }
 
-            tracing::debug!("No metadata file found in node_modules/. Pruned entire node_modules/ directory in {}ms.", start.elapsed().as_micros() / 1000);
+            tracing::debug!(
+                "No metadata file found in node_modules/. Pruned entire node_modules/ directory in {}ms.",
+                start.elapsed().as_micros() / 1000
+            );
 
             // TODO: get an accurate count here?
             return Ok(0);

crates/node-maintainer/src/linkers/isolated.rs

@@ -2,19 +2,19 @@ use std::{
     collections::{BinaryHeap, HashMap, HashSet},
     path::{Path, PathBuf},
     sync::{
-        atomic::{self, AtomicUsize},
         Arc,
+        atomic::{self, AtomicUsize},
     },
 };
 
 use dashmap::DashSet;
-use futures::{lock::Mutex, StreamExt, TryStreamExt};
+use futures::{StreamExt, TryStreamExt, lock::Mutex};
 use nassun::ExtractMode;
 use oro_common::BuildManifest;
-use petgraph::{stable_graph::NodeIndex, visit::EdgeRef, Direction};
+use petgraph::{Direction, stable_graph::NodeIndex, visit::EdgeRef};
 use ssri::Integrity;
 
-use crate::{error::IoContext, graph::Graph, NodeMaintainerError, META_FILE_NAME, STORE_DIR_NAME};
+use crate::{META_FILE_NAME, NodeMaintainerError, STORE_DIR_NAME, error::IoContext, graph::Graph};
 
 use super::LinkerOptions;
 
@@ -94,7 +94,10 @@ impl IsolatedLinker {
                 }
             }
 
-            tracing::debug!("No metadata file found in node_modules/. Pruned entire node_modules/ directory in {}ms.", start.elapsed().as_micros() / 1000);
+            tracing::debug!(
+                "No metadata file found in node_modules/. Pruned entire node_modules/ directory in {}ms.",
+                start.elapsed().as_micros() / 1000
+            );
 
             // TODO: get an accurate count here?
             return Ok(0);

crates/node-maintainer/src/linkers/mod.rs

@@ -9,7 +9,7 @@ use std::{
 };
 
 #[cfg(not(target_arch = "wasm32"))]
-use futures::{lock::Mutex, StreamExt, TryStreamExt};
+use futures::{StreamExt, TryStreamExt, lock::Mutex};
 #[cfg(not(target_arch = "wasm32"))]
 use hoisted::HoistedLinker;
 #[cfg(not(target_arch = "wasm32"))]
@@ -23,8 +23,8 @@ use petgraph::stable_graph::NodeIndex;
 
 #[cfg(not(target_arch = "wasm32"))]
 use crate::{
-    error::IoContext, graph::Graph, Lockfile, NodeMaintainerError, ProgressHandler, PruneProgress,
-    ScriptLineHandler, ScriptStartHandler,
+    Lockfile, NodeMaintainerError, ProgressHandler, PruneProgress, ScriptLineHandler,
+    ScriptStartHandler, error::IoContext, graph::Graph,
 };
 
 #[cfg(not(target_arch = "wasm32"))]