Expose cargo add internals as utils

Move cargo add utils out for future use by other subcommands (namely cargo
remove, per rust-lang#10520).

src/bin/cargo/commands/add.rs

@@ -6,9 +6,9 @@ use cargo::core::FeatureValue;
 use cargo::ops::cargo_add::add;
 use cargo::ops::cargo_add::AddOptions;
 use cargo::ops::cargo_add::DepOp;
-use cargo::ops::cargo_add::DepTable;
 use cargo::ops::resolve_ws;
 use cargo::util::command_prelude::*;
+use cargo::util::edit::manifest::DepTable;
 use cargo::util::interning::InternedString;
 use cargo::CargoResult;
 

src/cargo/ops/cargo_add/crate_spec.rs

@@ -3,7 +3,7 @@
 use anyhow::Context as _;
 
 use super::Dependency;
-use super::RegistrySource;
+use crate::util::edit::dependency::RegistrySource;
 use crate::util::validate_package_name;
 use crate::CargoResult;
 

src/cargo/ops/cargo_add/mod.rs

@@ -1,9 +1,6 @@
 //! Core of cargo-add command
 
 mod crate_spec;
-mod dependency;
-mod manifest;
-
 use anyhow::Context;
 use std::collections::BTreeSet;
 use std::collections::VecDeque;
@@ -23,18 +20,17 @@ use crate::core::QueryKind;
 use crate::core::Registry;
 use crate::core::Shell;
 use crate::core::Workspace;
+use crate::util::edit::dependency::Dependency;
+use crate::util::edit::dependency::GitSource;
+use crate::util::edit::dependency::MaybeWorkspace;
+use crate::util::edit::dependency::PathSource;
+use crate::util::edit::dependency::Source;
+use crate::util::edit::dependency::WorkspaceSource;
+use crate::util::edit::manifest::DepTable;
+use crate::util::edit::manifest::LocalManifest;
 use crate::CargoResult;
 use crate::Config;
 use crate_spec::CrateSpec;
-use dependency::Dependency;
-use dependency::GitSource;
-use dependency::PathSource;
-use dependency::RegistrySource;
-use dependency::Source;
-use manifest::LocalManifest;
-
-use crate::ops::cargo_add::dependency::{MaybeWorkspace, WorkspaceSource};
-pub use manifest::DepTable;
 
 /// Information on what dependencies should be added
 #[derive(Clone, Debug)]

src/cargo/ops/cargo_add/dependency.rs → src/cargo/util/edit/dependency.rs

@@ -938,7 +938,7 @@ impl Display for WorkspaceSource {
 mod tests {
     use std::path::Path;
 
-    use crate::ops::cargo_add::manifest::LocalManifest;
+    use crate::util::edit::manifest::LocalManifest;
     use cargo_util::paths;
 
     use super::*;

src/cargo/util/edit/mod.rs

@@ -0,0 +1,4 @@
+//! Utilities for editing Cargo.toml manifests
+
+pub mod dependency;
+pub mod manifest;

src/cargo/util/mod.rs

@@ -35,6 +35,7 @@ mod counter;
 pub mod cpu;
 mod dependency_queue;
 pub mod diagnostic_server;
+pub mod edit;
 pub mod errors;
 mod flock;
 pub mod graph;