chore: cargo fmt

sgammon · sgammon · commit d6a75382db17 · 2025-03-07T16:55:20.000-08:00
Signed-off-by: Sam Gammon &lt;sam@elide.dev&gt;
diff --git a/crates/nassun/src/fetch/dir.rs b/crates/nassun/src/fetch/dir.rs
@@ -240,7 +240,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;
 
diff --git a/crates/nassun/src/fetch/git.rs b/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;
diff --git a/crates/nassun/src/package.rs b/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))?
diff --git a/crates/nassun/src/tarball.rs b/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;
diff --git a/crates/node-maintainer/src/error.rs b/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),
diff --git a/crates/node-maintainer/src/graph.rs b/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;
diff --git a/crates/node-maintainer/src/into_kdl.rs b/crates/node-maintainer/src/into_kdl.rs
@@ -6,8 +6,8 @@ pub trait IntoKdl: IntoKdlSealed {}
 
 impl IntoKdl for KdlDocument {}
 impl IntoKdl for String {}
-impl IntoKdl for & str {}
-impl IntoKdl for & String {}
+impl IntoKdl for &str {}
+impl IntoKdl for &String {}
 
 impl IntoKdlSealed for KdlDocument {
     fn into_kdl(self) -> Result<KdlDocument, NodeMaintainerError> {
@@ -21,13 +21,13 @@ impl IntoKdlSealed for String {
     }
 }
 
-impl IntoKdlSealed for & str {
+impl IntoKdlSealed for &str {
     fn into_kdl(self) -> Result<KdlDocument, NodeMaintainerError> {
         Ok(self.parse()?)
     }
 }
 
-impl IntoKdlSealed for & String {
+impl IntoKdlSealed for &String {
     fn into_kdl(self) -> Result<KdlDocument, NodeMaintainerError> {
         Ok(self.parse()?)
     }
diff --git a/crates/node-maintainer/src/linkers/hoisted.rs b/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);
diff --git a/crates/node-maintainer/src/linkers/isolated.rs b/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);
diff --git a/crates/node-maintainer/src/linkers/mod.rs b/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"))]
diff --git a/crates/node-maintainer/src/lockfile.rs b/crates/node-maintainer/src/lockfile.rs
@@ -1,14 +1,14 @@
 use indexmap::IndexMap;
 use kdl::{KdlDocument, KdlNode};
-use nassun::{client::Nassun, package::Package, PackageResolution};
+use nassun::{PackageResolution, client::Nassun, package::Package};
 use node_semver::Version;
 use oro_common::CorgiManifest;
 use oro_package_spec::PackageSpec;
 use serde::{Deserialize, Serialize};
 use ssri::Integrity;
 use unicase::UniCase;
 
-use crate::{error::NodeMaintainerError, graph::DepType, IntoKdl};
+use crate::{IntoKdl, error::NodeMaintainerError, graph::DepType};
 
 /// A representation of a resolved lockfile.
 #[derive(Default, Debug, Clone, PartialEq, Eq)]
@@ -247,7 +247,9 @@ impl LockfileNode {
             .and_then(|i| i.as_string())
             .map(|i| i.parse())
             .transpose()
-            .map_err(|e| NodeMaintainerError::KdlLockfileIntegrityParseError(Box::new(node.clone()), e))?;
+            .map_err(|e| {
+                NodeMaintainerError::KdlLockfileIntegrityParseError(Box::new(node.clone()), e)
+            })?;
         let version = children
             .get_arg("version")
             .and_then(|val| val.as_string())
diff --git a/crates/node-maintainer/src/resolver.rs b/crates/node-maintainer/src/resolver.rs
@@ -9,22 +9,22 @@ use async_std::sync::Mutex;
 use colored::Colorize;
 use futures::{StreamExt, TryFutureExt};
 use indexmap::IndexMap;
+use nassun::PackageSpec;
 use nassun::client::Nassun;
 use nassun::package::Package;
-use nassun::PackageSpec;
 use oro_common::{CorgiManifest, CorgiVersionMetadata};
+use petgraph::Direction;
 use petgraph::stable_graph::NodeIndex;
 use petgraph::visit::EdgeRef;
-use petgraph::Direction;
 use unicase::UniCase;
 
+#[cfg(not(target_arch = "wasm32"))]
+use crate::META_FILE_NAME;
 #[cfg(not(target_arch = "wasm32"))]
 use crate::error::IoContext;
 use crate::error::NodeMaintainerError;
 use crate::graph::{DepType, Edge, Graph, Node};
 use crate::maintainer::{ProgressAdded, ProgressHandler};
-#[cfg(not(target_arch = "wasm32"))]
-use crate::META_FILE_NAME;
 use crate::{Lockfile, LockfileNode};
 
 #[derive(Debug, Clone)]
diff --git a/crates/node-maintainer/tests/resolver_basic.rs b/crates/node-maintainer/tests/resolver_basic.rs
@@ -6,8 +6,8 @@ use node_maintainer::NodeMaintainer;
 use pretty_assertions::assert_eq;
 use serde_json::json;
 use wiremock::{
-    matchers::{method, path},
     Mock, MockServer, ResponseTemplate,
+    matchers::{method, path},
 };
 
 #[async_std::test]
diff --git a/crates/oro-client/src/api/login.rs b/crates/oro-client/src/api/login.rs
@@ -1,8 +1,8 @@
 use crate::notify::Notify;
 use crate::{OroClient, OroClientError};
-use percent_encoding::{utf8_percent_encode, NON_ALPHANUMERIC};
-use reqwest::header::{HeaderMap, WWW_AUTHENTICATE};
+use percent_encoding::{NON_ALPHANUMERIC, utf8_percent_encode};
 use reqwest::StatusCode;
+use reqwest::header::{HeaderMap, WWW_AUTHENTICATE};
 use serde::{Deserialize, Serialize};
 use std::collections::HashMap;
 use std::time::Duration;
diff --git a/crates/oro-client/src/api/stream_external.rs b/crates/oro-client/src/api/stream_external.rs
@@ -1,6 +1,6 @@
 use futures::{
-    stream::{StreamExt, TryStreamExt},
     AsyncRead,
+    stream::{StreamExt, TryStreamExt},
 };
 use url::Url;
 
diff --git a/crates/oro-client/src/auth_middleware.rs b/crates/oro-client/src/auth_middleware.rs
@@ -1,6 +1,6 @@
 use std::{collections::HashMap, sync::Arc};
 
-use reqwest::{header::HeaderValue, Request, Response};
+use reqwest::{Request, Response, header::HeaderValue};
 use reqwest_middleware::{Middleware, Next, Result};
 use url::Url;
 
diff --git a/crates/oro-client/src/client.rs b/crates/oro-client/src/client.rs
@@ -1,7 +1,4 @@
 #[cfg(not(target_arch = "wasm32"))]
-use std::path::{Path, PathBuf};
-use std::{collections::HashMap, sync::Arc};
-#[cfg(not(target_arch = "wasm32"))]
 use http_cache_reqwest::{CACacheManager, Cache, CacheMode, HttpCache, HttpCacheOptions};
 #[cfg(target_arch = "wasm32")]
 use reqwest::Client;
@@ -10,7 +7,10 @@ use reqwest::ClientBuilder;
 #[cfg(not(target_arch = "wasm32"))]
 use reqwest::{NoProxy, Proxy};
 use reqwest_middleware::ClientWithMiddleware;
-use reqwest_retry::{policies::ExponentialBackoff, RetryTransientMiddleware};
+use reqwest_retry::{RetryTransientMiddleware, policies::ExponentialBackoff};
+#[cfg(not(target_arch = "wasm32"))]
+use std::path::{Path, PathBuf};
+use std::{collections::HashMap, sync::Arc};
 use url::Url;
 
 #[cfg(not(target_arch = "wasm32"))]
diff --git a/crates/oro-config/src/lib.rs b/crates/oro-config/src/lib.rs
@@ -4,7 +4,7 @@ use std::{collections::HashSet, ffi::OsString, path::PathBuf};
 
 pub use clap::{ArgMatches, Command};
 pub use config::Config as OroConfig;
-use config::{builder::DefaultState, ConfigBuilder, Environment, File, ValueKind};
+use config::{ConfigBuilder, Environment, File, ValueKind, builder::DefaultState};
 use kdl_source::KdlFormat;
 use miette::Result;
 
diff --git a/crates/oro-npm-account/src/config.rs b/crates/oro-npm-account/src/config.rs
@@ -1,4 +1,4 @@
-use base64::{engine::general_purpose, Engine as _};
+use base64::{Engine as _, engine::general_purpose};
 use kdl::{KdlDocument, KdlEntry, KdlNode, KdlValue};
 use reqwest::header::HeaderValue;
 use url::Url;
diff --git a/crates/oro-npm-account/src/login.rs b/crates/oro-npm-account/src/login.rs
@@ -2,8 +2,8 @@ use crate::error::OroNpmAccountError;
 use dialoguer::theme::ColorfulTheme;
 use dialoguer::{Input, Password};
 use open::that as open;
-use oro_client::login::{AuthType, DoneURLResponse, LoginCouchResponse, LoginOptions, Token};
 use oro_client::OroClient;
+use oro_client::login::{AuthType, DoneURLResponse, LoginCouchResponse, LoginOptions, Token};
 use url::Url;
 
 pub async fn login(
diff --git a/crates/oro-package-spec/src/error.rs b/crates/oro-package-spec/src/error.rs
@@ -13,7 +13,9 @@ use url::ParseError as UrlParseError;
 #[diagnostic(
     code(package_spec::no_parse),
     url(docsrs),
-    help("The syntax for package specifiers is documented here: https://orogene.dev/book/guide/node_modules.html#specifier-syntax")
+    help(
+        "The syntax for package specifiers is documented here: https://orogene.dev/book/guide/node_modules.html#specifier-syntax"
+    )
 )]
 pub struct PackageSpecError {
     pub input: String,
@@ -58,7 +60,9 @@ pub enum SpecErrorKind {
     InvalidCharacters(String),
     #[error("Drive letters on Windows can only be alphabetical. Got `{0}`.")]
     InvalidDriveLetter(char),
-    #[error("Invalid git host `{0}`. Only github:, gitlab:, gist:, and bitbucket: are supported in shorthands.")]
+    #[error(
+        "Invalid git host `{0}`. Only github:, gitlab:, gist:, and bitbucket: are supported in shorthands."
+    )]
     InvalidGitHost(String),
     #[error(transparent)]
     SemverParseError(SemverError),
diff --git a/crates/oro-script/src/error.rs b/crates/oro-script/src/error.rs
@@ -35,7 +35,9 @@ pub enum OroScriptError {
     /// means something went wrong while putting the variable back together.
     /// For more details on what may have happened, refer to the error
     /// message.
-    #[error("Failed to join new contents of PATH variable while trying to add a `node_modules/.bin` entry to the PATH.")]
+    #[error(
+        "Failed to join new contents of PATH variable while trying to add a `node_modules/.bin` entry to the PATH."
+    )]
     #[diagnostic(code(oro_script::join_path_error), url(docsrs))]
     JoinPathError(#[from] std::env::JoinPathsError),
 
diff --git a/examples/render-benchmarks.rs b/examples/render-benchmarks.rs
@@ -6,7 +6,7 @@ use std::{
 
 use backon::{BlockingRetryable, ConstantBuilder};
 use miette::{IntoDiagnostic, Result};
-use resvg::usvg_text_layout::{fontdb, TreeTextToPath};
+use resvg::usvg_text_layout::{TreeTextToPath, fontdb};
 use serde::Deserialize;
 
 fn main() -> Result<()> {
@@ -38,7 +38,12 @@ fn main() -> Result<()> {
     )?;
 
     render_to_png(
-        &plot_benchmark("Resolution + Cold Cache Comparison", &exec_benchmark("rm -rf node_modules pm-cache ~/.bun/install/cache yarn.lock package-lock.kdl package-lock.json bun.lockb pnpm-lock.yaml")?)?,
+        &plot_benchmark(
+            "Resolution + Cold Cache Comparison",
+            &exec_benchmark(
+                "rm -rf node_modules pm-cache ~/.bun/install/cache yarn.lock package-lock.kdl package-lock.json bun.lockb pnpm-lock.yaml",
+            )?,
+        )?,
         &root.join("assets").join("benchmarks-initial-install.png"),
         &fontdb,
     )?;
diff --git a/src/apply_args.rs b/src/apply_args.rs
@@ -386,11 +386,7 @@ impl ApplyArgs {
     }
 
     fn maybe_emoji(&self, emoji: &'static str) -> &'static str {
-        if self.emoji {
-            emoji
-        } else {
-            ""
-        }
+        if self.emoji { emoji } else { "" }
     }
 }
 
diff --git a/src/commands/add.rs b/src/commands/add.rs
diff --git a/src/commands/login.rs b/src/commands/login.rs
diff --git a/src/commands/remove.rs b/src/commands/remove.rs
diff --git a/src/commands/view.rs b/src/commands/view.rs
diff --git a/src/error.rs b/src/error.rs
diff --git a/src/lib.rs b/src/lib.rs

Original file line number	Diff line number	Diff line change
`@@ -6,8 +6,8 @@ pub trait IntoKdl: IntoKdlSealed {}`
`6`	`6`
`7`	`7`	`impl IntoKdl for KdlDocument {}`
`8`	`8`	`impl IntoKdl for String {}`
`9`		`-impl IntoKdl for & str {}`
`10`		`-impl IntoKdl for & String {}`
	`9`	`+impl IntoKdl for &str {}`
	`10`	`+impl IntoKdl for &String {}`
`11`	`11`
`12`	`12`	`impl IntoKdlSealed for KdlDocument {`
`13`	`13`	`fn into_kdl(self) -> Result<KdlDocument, NodeMaintainerError> {`
`@@ -21,13 +21,13 @@ impl IntoKdlSealed for String {`
`21`	`21`	`}`
`22`	`22`	`}`
`23`	`23`
`24`		`-impl IntoKdlSealed for & str {`
	`24`	`+impl IntoKdlSealed for &str {`
`25`	`25`	`fn into_kdl(self) -> Result<KdlDocument, NodeMaintainerError> {`
`26`	`26`	`Ok(self.parse()?)`
`27`	`27`	`}`
`28`	`28`	`}`
`29`	`29`
`30`		`-impl IntoKdlSealed for & String {`
	`30`	`+impl IntoKdlSealed for &String {`
`31`	`31`	`fn into_kdl(self) -> Result<KdlDocument, NodeMaintainerError> {`
`32`	`32`	`Ok(self.parse()?)`
`33`	`33`	`}`