Add --public support for cargo add

Author: linyihai

src/bin/cargo/commands/add.rs

@@ -76,6 +76,18 @@ Example uses:
                 "ignore-rust-version",
                 "Ignore `rust-version` specification in packages (unstable)"
             ),
+            flag("public", "Mark the dependency as public")
+                .long_help("Mark the dependency as public
+
+The dependnecy will be visible in both of your crate and outside."),
+            flag("no-public", "Mark the dependency as private")
+                .conflicts_with("dev")
+                .long_help("Mark the dependency as private
+
+The dependnecy will be only visible in your crate other than outside.")
+                .conflicts_with("dev")
+                .overrides_with("public"),
+
         ])
         .arg_manifest_path_without_unsupported_path_tip()
         .arg_package("Package to modify")
@@ -235,6 +247,7 @@ fn parse_dependencies(config: &Config, matches: &ArgMatches) -> CargoResult<Vec<
     };
     let default_features = default_features(matches);
     let optional = optional(matches);
+    let public = public(matches);
 
     let mut crates = matches
         .get_many::<String>("crates")
@@ -325,6 +338,7 @@ fn parse_dependencies(config: &Config, matches: &ArgMatches) -> CargoResult<Vec<
             features,
             default_features,
             optional,
+            public,
             registry: registry.clone(),
             path: path.map(String::from),
             git: git.map(String::from),
@@ -353,6 +367,10 @@ fn optional(matches: &ArgMatches) -> Option<bool> {
     resolve_bool_arg(matches.flag("optional"), matches.flag("no-optional"))
 }
 
+fn public(matches: &ArgMatches) -> Option<bool> {
+    resolve_bool_arg(matches.flag("public"), matches.flag("no-public"))
+}
+
 fn resolve_bool_arg(yes: bool, no: bool) -> Option<bool> {
     match (yes, no) {
         (true, false) => Some(true),

src/cargo/ops/cargo_add/mod.rs

@@ -244,6 +244,9 @@ pub struct DepOp {
     /// Whether dependency is optional
     pub optional: Option<bool>,
 
+    /// Whether dependency is public
+    pub public: Option<bool>,
+
     /// Registry for looking up dependency version
     pub registry: Option<String>,
 
@@ -758,6 +761,13 @@ fn populate_dependency(mut dependency: Dependency, arg: &DepOp) -> Dependency {
             dependency.optional = None;
         }
     }
+    if let Some(value) = arg.public {
+        if value {
+            dependency.public = Some(true);
+        } else {
+            dependency.public = None;
+        }
+    }
     if let Some(value) = arg.default_features {
         if value {
             dependency.default_features = None;
@@ -945,6 +955,9 @@ fn print_action_msg(shell: &mut Shell, dep: &DependencyUI, section: &[String]) -
     if dep.optional().unwrap_or(false) {
         write!(message, " optional")?;
     }
+    if dep.public().unwrap_or(false) {
+        write!(message, " public")?;
+    }
     let section = if section.len() == 1 {
         section[0].clone()
     } else {

src/cargo/util/toml_mut/dependency.rs

@@ -25,6 +25,9 @@ pub struct Dependency {
     /// Whether the dependency is opted-in with a feature flag.
     pub optional: Option<bool>,
 
+    /// Whether the dependency is marked as public.
+    pub public: Option<bool>,
+
     /// List of features to add (or None to keep features unchanged).
     pub features: Option<IndexSet<String>>,
     /// Whether default features are enabled.
@@ -54,6 +57,7 @@ impl Dependency {
             source: None,
             registry: None,
             rename: None,
+            public: None,
         }
     }
 
@@ -163,6 +167,11 @@ impl Dependency {
         self.optional
     }
 
+    /// Get whether the dep is public.
+    pub fn public(&self) -> Option<bool> {
+        self.public
+    }
+
     /// Get the SourceID for this dependency.
     pub fn source_id(&self, config: &Config) -> CargoResult<MaybeWorkspace<SourceId>> {
         match &self.source.as_ref() {
@@ -325,6 +334,7 @@ impl Dependency {
             };
 
             let optional = table.get("optional").and_then(|v| v.as_bool());
+            let public = table.get("public").and_then(|v| v.as_bool());
 
             let dep = Self {
                 name,
@@ -334,6 +344,7 @@ impl Dependency {
                 default_features,
                 features,
                 optional,
+                public,
                 inherited_features: None,
             };
             Ok(dep)
@@ -366,6 +377,7 @@ impl Dependency {
             crate_root.display()
         );
         let table: toml_edit::Item = match (
+            self.public.unwrap_or(false),
             self.optional.unwrap_or(false),
             self.features.as_ref(),
             self.default_features.unwrap_or(true),
@@ -375,21 +387,22 @@ impl Dependency {
         ) {
             // Extra short when version flag only
             (
+                false,
                 false,
                 None,
                 true,
                 Some(Source::Registry(RegistrySource { version: v })),
                 None,
                 None,
             ) => toml_edit::value(v),
-            (false, None, true, Some(Source::Workspace(WorkspaceSource {})), None, None) => {
+            (false, false, None, true, Some(Source::Workspace(WorkspaceSource {})), None, None) => {
                 let mut table = toml_edit::InlineTable::default();
                 table.set_dotted(true);
                 table.insert("workspace", true.into());
                 toml_edit::value(toml_edit::Value::InlineTable(table))
             }
             // Other cases are represented as an inline table
-            (_, _, _, _, _, _) => {
+            (_, _, _, _, _, _, _) => {
                 let mut table = toml_edit::InlineTable::default();
 
                 match &self.source {
@@ -442,6 +455,9 @@ impl Dependency {
                 if let Some(v) = self.optional {
                     table.insert("optional", v.into());
                 }
+                if let Some(v) = self.public {
+                    table.insert("public", v.into());
+                }
 
                 toml_edit::value(toml_edit::Value::InlineTable(table))
             }
@@ -579,6 +595,15 @@ impl Dependency {
                     table.remove("optional");
                 }
             }
+            match self.public {
+                Some(v) => {
+                    table.set_dotted(false);
+                    overwrite_value(table, "public", v);
+                }
+                None => {
+                    table.remove("public");
+                }
+            }
         } else {
             unreachable!("Invalid dependency type: {}", item.type_name());
         }