feat: emit a warning when both package.publish and --index are specified

Author: motorailgun

src/cargo/ops/registry/publish.rs

@@ -797,30 +797,44 @@ fn package_list(pkgs: impl IntoIterator<Item = PackageId>, final_sep: &str) -> S
 
 fn resolve_registry_or_index(
     opts: &PublishOpts<'_>,
-    just_pkgs: &[&Package],
+    pkgs: &[&Package],
 ) -> CargoResult<Option<RegistryOrIndex>> {
     let opt_index_or_registry = opts.reg_or_index.clone();
 
-    Ok(match opt_index_or_registry {
-        Some(r) => {
-            validate_registry(&just_pkgs, Some(&r))?;
-            Some(r)
+    let res = match opt_index_or_registry {
+        ref r @ Some(ref registry_or_index) => {
+            validate_registry(pkgs, r.as_ref())?;
+
+            let registry_is_specified_by_any_package = pkgs
+                .iter()
+                .any(|pkg| pkg.publish().as_ref().map(|v| v.len()).unwrap_or(0) > 0);
+
+            if registry_is_specified_by_any_package && registry_or_index.is_index() {
+                opts.gctx.shell().warn(r#"`--index` will ignore registries set by `package.publish` in Cargo.toml, and may cause unexpected push to prohibited registry
+help: use `--registry` instead or set `publish = true` in Cargo.toml to suppress this warning"#)?;
+            }
+
+            r.clone()
         }
         None => {
-            let reg = super::infer_registry(&just_pkgs)?;
-            validate_registry(&just_pkgs, reg.as_ref())?;
-            if let Some(RegistryOrIndex::Registry(registry)) = &reg {
-                if registry != CRATES_IO_REGISTRY {
-                    // Don't warn for crates.io.
-                    opts.gctx.shell().note(&format!(
-                        "found `{}` as only allowed registry. Publishing to it automatically.",
-                        registry
-                    ))?;
-                }
+            let registry_or_index = super::infer_registry(pkgs)?;
+            validate_registry(pkgs, registry_or_index.as_ref())?;
+
+            if let Some(RegistryOrIndex::Registry(ref registry)) = registry_or_index
+                && registry != CRATES_IO_REGISTRY
+            {
+                // Don't warn for crates.io.
+                opts.gctx.shell().note(&format!(
+                    "found `{}` as only allowed registry. Publishing to it automatically.",
+                    registry
+                ))?;
             }
-            reg
+
+            registry_or_index
         }
-    })
+    };
+
+    Ok(res)
 }
 
 fn validate_registry(pkgs: &[&Package], reg_or_index: Option<&RegistryOrIndex>) -> CargoResult<()> {

tests/testsuite/publish.rs

@@ -1016,7 +1016,6 @@ fn publish_when_both_publish_and_index_specified() {
         .arg(registry.token())
         .with_stderr_data(str![[r#"
 ...
-[WARNING] `cargo publish --token` is deprecated in favor of using `cargo login` and environment variables
 [UPDATING] [..] index
 [PACKAGING] foo v0.0.1 ([ROOT]/foo)
 [PACKAGED] 5 files, [FILE_SIZE]B ([FILE_SIZE]B compressed)
@@ -1067,6 +1066,7 @@ fn publish_failed_with_index_and_only_allowed_registry() {
         .arg(registry.index_url().as_str())
         .with_status(101)
         .with_stderr_data(str![[r#"
+...
 [ERROR] command-line argument --index requires --token to be specified
 
 "#]])