Drop unrelated formatting changes

An earlier commit ran rustfmt across the whole workspace and swept
import reordering and line wrapping in 120+ files that this fix does
not touch. Restore those files to main so the change is reviewable;
only the pnpm-workspace.yaml fix and its tests remain.

Assisted-by: Claude Code:claude-opus-5-5

Author: claude

crates/socket-patch-cli/src/commands/apply.rs

@@ -2,7 +2,9 @@ use clap::Args;
 use socket_patch_core::api::blob_fetcher::get_missing_blobs;
 use socket_patch_core::api::client::{get_api_client_with_overrides, ApiClient};
 use socket_patch_core::crawlers::ruby_crawler::config_path_ignored_warning;
-use socket_patch_core::crawlers::{detect_npm_pkg_manager, Ecosystem, NpmPkgManager, RubyCrawler};
+use socket_patch_core::crawlers::{
+    detect_npm_pkg_manager, Ecosystem, NpmPkgManager, RubyCrawler,
+};
 use socket_patch_core::manifest::operations::read_manifest;
 use socket_patch_core::manifest::schema::{PatchFileInfo, PatchManifest, PatchRecord};
 use socket_patch_core::patch::apply::{

crates/socket-patch-cli/src/commands/list.rs

@@ -431,10 +431,7 @@ pub async fn run(args: ListArgs) -> i32 {
                 detail: detail.clone(),
             });
         } else if !args.common.silent {
-            eprintln!(
-                "Warning: {}",
-                crate::commands::rollback::capitalize_first(detail)
-            );
+            eprintln!("Warning: {}", crate::commands::rollback::capitalize_first(detail));
         }
     }
     let vendor_state = crate::commands::vendor_state_lenient(&loaded.vendor, args.common.silent);
@@ -776,18 +773,12 @@ mod tests {
         let listings = HostedListing::from_pins(
             &[
                 pin("pkg:npm/minimist@1.2.2", &record.uuid),
-                pin(
-                    "pkg:npm/other@1.0.0",
-                    "33333333-3333-4333-8333-333333333333",
-                ),
+                pin("pkg:npm/other@1.0.0", "33333333-3333-4333-8333-333333333333"),
             ],
             Some(&legacy),
         );
         assert_eq!(listings[0].record, record);
-        assert_eq!(
-            listings[1].record.uuid,
-            "33333333-3333-4333-8333-333333333333"
-        );
+        assert_eq!(listings[1].record.uuid, "33333333-3333-4333-8333-333333333333");
         assert!(listings[1].record.vulnerabilities.is_empty());
         assert_eq!(listings[1].lockfiles, vec!["yarn.lock".to_string()]);
     }

crates/socket-patch-cli/src/commands/mod.rs

@@ -1,19 +1,19 @@
 pub mod apply;
 pub(crate) mod bun_preflight;
-pub(crate) mod composer_hints;
 pub(crate) mod context;
+pub(crate) mod composer_hints;
 pub(crate) mod fetch_stage;
 pub mod get;
 pub mod hosted_bundle;
 pub mod list;
 pub(crate) mod lock_cli;
 pub mod remove;
 pub mod repair;
+pub(crate) mod vendored_backend;
 pub mod rollback;
 pub mod scan;
 pub mod update;
 pub mod vendor;
-pub(crate) mod vendored_backend;
 pub mod vex;
 pub(crate) mod vex_consumed;
 pub(crate) mod vex_sources;
@@ -97,11 +97,9 @@ pub(crate) async fn hosted_state_from_lockfiles(
     common: &crate::args::GlobalArgs,
     root: &Path,
 ) -> socket_patch_core::patch::redirect::RedirectState {
-    hosted_state_from_pins(
-        &socket_patch_core::patch::redirect::upstream::HostedPin::all(
-            &discover_wiring(common, root).await,
-        ),
-    )
+    hosted_state_from_pins(&socket_patch_core::patch::redirect::upstream::HostedPin::all(
+        &discover_wiring(common, root).await,
+    ))
 }
 
 /// [`hosted_state_from_lockfiles`] over already-discovered pins. A purl
@@ -111,17 +109,18 @@ pub(crate) fn hosted_state_from_pins(
 ) -> socket_patch_core::patch::redirect::RedirectState {
     let mut state = socket_patch_core::patch::redirect::RedirectState::new();
     for pin in pins {
-        state.records.entry(pin.purl.clone()).or_insert_with(|| {
-            socket_patch_core::manifest::schema::PatchRecord {
+        state
+            .records
+            .entry(pin.purl.clone())
+            .or_insert_with(|| socket_patch_core::manifest::schema::PatchRecord {
                 uuid: pin.uuid.clone(),
                 exported_at: String::new(),
                 files: Default::default(),
                 vulnerabilities: Default::default(),
                 description: String::new(),
                 license: String::new(),
                 tier: String::new(),
-            }
-        });
+            });
     }
     state
 }
@@ -148,3 +147,4 @@ pub(crate) fn vendor_state_lenient(
         }
     }
 }
+

crates/socket-patch-cli/src/commands/remove.rs

@@ -17,9 +17,9 @@ use super::rollback::{
     pin_before_hash_blobs, rollback_patches_inner, run_hosted_leg, sweep_failure,
     sweep_unused_artifacts, HostedLegOutcome, InnerSelection,
 };
+use crate::commands::vendored_backend::{RevertedEntry, VendorRevertStep, VendoredBackend};
 use crate::args::{apply_env_toggles, GlobalArgs};
 use crate::commands::lock_cli::acquire_or_emit;
-use crate::commands::vendored_backend::{RevertedEntry, VendorRevertStep, VendoredBackend};
 use crate::json_envelope::{Command, Envelope, EnvelopeError, PatchAction, PatchEvent, Status};
 use crate::ui::plural;
 

crates/socket-patch-cli/src/commands/rollback.rs

@@ -10,13 +10,13 @@ use socket_patch_core::manifest::operations::{
 };
 use socket_patch_core::manifest::schema::{PatchFileInfo, PatchManifest, PatchRecord};
 use socket_patch_core::patch::apply::select_installed_variants;
-use socket_patch_core::patch::redirect::upstream::HostedPin;
 use socket_patch_core::patch::rollback::{
     cannot_rollback_error, rollback_package_patch, verify_file_rollback, RollbackResult,
     VerifyRollbackResult, VerifyRollbackStatus,
 };
 use socket_patch_core::telemetry::{track_patch_rollback_failed, track_patch_rolled_back};
 use socket_patch_core::utils::purl::{patch_matches, strip_purl_qualifiers};
+use socket_patch_core::patch::redirect::upstream::HostedPin;
 use socket_patch_core::vendor::{purl_keys_cover, RevertOpts, VendorState};
 use std::collections::{HashMap, HashSet};
 use std::path::{Path, PathBuf};
@@ -1026,8 +1026,7 @@ pub(crate) async fn run_hosted_leg(common: &GlobalArgs, pins: &[HostedPin]) -> H
             .iter()
             .map(|(code, detail)| (code.to_string(), detail.clone())),
     );
-    out.edited_files
-        .extend(outcome.reverted_files.iter().cloned());
+    out.edited_files.extend(outcome.reverted_files.iter().cloned());
     let unwound: Vec<_> = vlt_targets
         .into_iter()
         .filter(|t| out.reverted.iter().any(|p| p == &t.purl))
@@ -1158,11 +1157,7 @@ pub async fn run(args: RollbackArgs) -> i32 {
             } else if !args.common.silent {
                 println!(
                     "{} the pre-v5 hosted ledger {}: no lockfile pins a hosted patch.",
-                    if args.common.dry_run {
-                        "Would remove"
-                    } else {
-                        "Removed"
-                    },
+                    if args.common.dry_run { "Would remove" } else { "Removed" },
                     socket_patch_core::patch::redirect::REDIRECT_STATE_REL
                 );
             }

crates/socket-patch-cli/src/commands/scan/hosted.rs

@@ -934,8 +934,7 @@ pub(crate) async fn run_redirect_selected(
             socket_patch_core::utils::fs::read_regular_to_string_sync(path).ok()
         })
     };
-    let rewrite_options = || {
-        RewriteOptions {
+    let rewrite_options = || RewriteOptions {
         dry_run: common.dry_run,
         targets_pipenv_lock,
         pipenv_major,
@@ -947,7 +946,6 @@ pub(crate) async fn run_redirect_selected(
         npm_allow_remote_config: !common.no_npm_allow_remote_config,
         npm_outer: &npm_outer,
         blocking: true,
-    }
     };
     // The rollout gate plans again without its deferred rows: keep what
     // the second pass needs.
@@ -2173,19 +2171,13 @@ fn join_names(names: &[String], max: usize) -> String {
 /// artifacts, then verify with `vex`. After a vendored→hosted takeover
 /// (`vendored_removed`) the commit also has to carry the deleted vendored
 /// ledger entries and artifacts.
-fn format_next_steps(
-    files: &[String],
-    edits: &[socket_patch_core::patch::redirect::FileEdit],
-    vendored_removed: bool,
-) -> Vec<String> {
+fn format_next_steps(files: &[String], edits: &[socket_patch_core::patch::redirect::FileEdit], vendored_removed: bool) -> Vec<String> {
     if files.is_empty() && !vendored_removed {
         return Vec::new();
     }
     let mut commit: Vec<String> = Vec::new();
     if vendored_removed {
-        commit.push(
-            ".socket/vendor/ (the removed vendored ledger entries and artifacts)".to_string(),
-        );
+        commit.push(".socket/vendor/ (the removed vendored ledger entries and artifacts)".to_string());
     }
     commit.extend(files.iter().cloned());
     let npm = files
@@ -4168,43 +4160,19 @@ mod tests {
         use super::npm_allow_remote_one_line;
         let hosts = ["patch.socket.dev"];
         let cases = [
-            (
-                npm_allow_remote_configured_detail(&hosts, true, false),
-                "Note: set",
-            ),
-            (
-                npm_allow_remote_configured_detail(&hosts, false, false),
-                "Note: set",
-            ),
-            (
-                npm_allow_remote_configured_detail(&hosts, true, true),
-                "Note: would set",
-            ),
-            (
-                npm_allow_remote_already_detail(&hosts),
-                "Note: .npmrc already",
-            ),
-            (
-                npm_allow_remote_user_set_detail(&hosts, "none"),
-                "Warning: npm >=12",
-            ),
-            (
-                npm_allow_remote_env_set_detail(&hosts, "npm_config_allow_remote", "none"),
-                "Warning: npm >=12",
-            ),
+            (npm_allow_remote_configured_detail(&hosts, true, false), "Note: set"),
+            (npm_allow_remote_configured_detail(&hosts, false, false), "Note: set"),
+            (npm_allow_remote_configured_detail(&hosts, true, true), "Note: would set"),
+            (npm_allow_remote_already_detail(&hosts), "Note: .npmrc already"),
+            (npm_allow_remote_user_set_detail(&hosts, "none"), "Warning: npm >=12"),
+            (npm_allow_remote_env_set_detail(&hosts, "npm_config_allow_remote", "none"), "Warning: npm >=12"),
             (npm_allow_remote_manual_detail(&hosts), "Warning: npm >=12"),
-            (
-                npm_allow_remote_unreadable_detail(&hosts, "is a symlink"),
-                "Warning: npm >=12",
-            ),
+            (npm_allow_remote_unreadable_detail(&hosts, "is a symlink"), "Warning: npm >=12"),
         ];
         for (detail, start) in cases {
             let line = npm_allow_remote_one_line(&detail);
             assert!(line.starts_with(start), "{line}");
-            assert!(
-                !line.contains('\n') && line.ends_with("(details: --verbose)."),
-                "{line}"
-            );
+            assert!(!line.contains('\n') && line.ends_with("(details: --verbose)."), "{line}");
         }
     }
 }