refactor: extract yank to its own module

src/cargo/ops/registry/mod.rs

@@ -6,6 +6,7 @@ mod login;
 mod logout;
 mod publish;
 mod search;
+mod yank;
 
 use std::collections::HashSet;
 use std::path::PathBuf;
@@ -34,6 +35,7 @@ pub use self::logout::registry_logout;
 pub use self::publish::publish;
 pub use self::publish::PublishOpts;
 pub use self::search::search;
+pub use self::yank::yank;
 
 /// Registry settings loaded from config files.
 ///
@@ -431,68 +433,6 @@ pub fn modify_owners(config: &Config, opts: &OwnersOptions) -> CargoResult<()> {
     Ok(())
 }
 
-pub fn yank(
-    config: &Config,
-    krate: Option<String>,
-    version: Option<String>,
-    token: Option<Secret<String>>,
-    index: Option<String>,
-    undo: bool,
-    reg: Option<String>,
-) -> CargoResult<()> {
-    let name = match krate {
-        Some(name) => name,
-        None => {
-            let manifest_path = find_root_manifest_for_wd(config.cwd())?;
-            let ws = Workspace::new(&manifest_path, config)?;
-            ws.current()?.package_id().name().to_string()
-        }
-    };
-    let version = match version {
-        Some(v) => v,
-        None => bail!("a version must be specified to yank"),
-    };
-
-    let message = if undo {
-        auth::Mutation::Unyank {
-            name: &name,
-            vers: &version,
-        }
-    } else {
-        auth::Mutation::Yank {
-            name: &name,
-            vers: &version,
-        }
-    };
-
-    let (mut registry, _) = registry(
-        config,
-        token.as_ref().map(Secret::as_deref),
-        index.as_deref(),
-        reg.as_deref(),
-        true,
-        Some(message),
-    )?;
-
-    let package_spec = format!("{}@{}", name, version);
-    if undo {
-        config.shell().status("Unyank", package_spec)?;
-        registry.unyank(&name, &version).with_context(|| {
-            format!(
-                "failed to undo a yank from the registry at {}",
-                registry.host()
-            )
-        })?;
-    } else {
-        config.shell().status("Yank", package_spec)?;
-        registry
-            .yank(&name, &version)
-            .with_context(|| format!("failed to yank from the registry at {}", registry.host()))?;
-    }
-
-    Ok(())
-}
-
 /// Gets the SourceId for an index or registry setting.
 ///
 /// The `index` and `reg` values are from the command-line or config settings.

src/cargo/ops/registry/yank.rs

@@ -0,0 +1,76 @@
+//! Interacts with the registry [yank] and [unyank] API.
+//!
+//! [yank]: https://doc.rust-lang.org/nightly/cargo/reference/registry-web-api.html#yank
+//! [unyank]: https://doc.rust-lang.org/nightly/cargo/reference/registry-web-api.html#unyank
+
+use anyhow::bail;
+use anyhow::Context as _;
+
+use crate::core::Workspace;
+use crate::util::auth;
+use crate::util::auth::Secret;
+use crate::util::config::Config;
+use crate::util::errors::CargoResult;
+use crate::util::important_paths::find_root_manifest_for_wd;
+
+pub fn yank(
+    config: &Config,
+    krate: Option<String>,
+    version: Option<String>,
+    token: Option<Secret<String>>,
+    index: Option<String>,
+    undo: bool,
+    reg: Option<String>,
+) -> CargoResult<()> {
+    let name = match krate {
+        Some(name) => name,
+        None => {
+            let manifest_path = find_root_manifest_for_wd(config.cwd())?;
+            let ws = Workspace::new(&manifest_path, config)?;
+            ws.current()?.package_id().name().to_string()
+        }
+    };
+    let version = match version {
+        Some(v) => v,
+        None => bail!("a version must be specified to yank"),
+    };
+
+    let message = if undo {
+        auth::Mutation::Unyank {
+            name: &name,
+            vers: &version,
+        }
+    } else {
+        auth::Mutation::Yank {
+            name: &name,
+            vers: &version,
+        }
+    };
+
+    let (mut registry, _) = super::registry(
+        config,
+        token.as_ref().map(Secret::as_deref),
+        index.as_deref(),
+        reg.as_deref(),
+        true,
+        Some(message),
+    )?;
+
+    let package_spec = format!("{}@{}", name, version);
+    if undo {
+        config.shell().status("Unyank", package_spec)?;
+        registry.unyank(&name, &version).with_context(|| {
+            format!(
+                "failed to undo a yank from the registry at {}",
+                registry.host()
+            )
+        })?;
+    } else {
+        config.shell().status("Yank", package_spec)?;
+        registry
+            .yank(&name, &version)
+            .with_context(|| format!("failed to yank from the registry at {}", registry.host()))?;
+    }
+
+    Ok(())
+}