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

Author: motorailgun

src/cargo/ops/registry/publish.rs

@@ -797,28 +797,51 @@ 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>> {
-    Ok(match opts.reg_or_index.clone() {
-        Some(r) => {
-            validate_registry(&just_pkgs, Some(&r))?;
-            Some(r)
-        }
-        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 opt_index_or_registry = opts.reg_or_index.clone();
+    let registry_is_specified_by_any_package = pkgs
+        .iter()
+        .any(|pkg| pkg.publish().as_ref().map(|v| v.len()).unwrap_or(0) > 0);
+
+    let res = match (opt_index_or_registry, registry_is_specified_by_any_package) {
+        // both `package.publish` and `--index` or `--registry` are specified
+        (Some(opt_reg_or_index), true) => {
+            validate_registry(pkgs, Some(&opt_reg_or_index))?;
+
+            match opt_reg_or_index {
+                r @ RegistryOrIndex::Registry(_) => Some(r),
+                r @ RegistryOrIndex::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"#)?;
+
+                    Some(r)
                 }
             }
-            reg
         }
-    })
+        // only `package.publish` section
+        (None, true) => {
+            let registry_or_index = super::infer_registry(pkgs)?;
+            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
+                ))?;
+            }
+
+            registry_or_index
+        }
+        (Some(opt_reg), false) => {
+            validate_registry(pkgs, Some(&opt_reg))?;
+            Some(opt_reg)
+        }
+        (None, false) => None,
+    };
+
+    Ok(res)
 }
 
 fn validate_registry(pkgs: &[&Package], reg_or_index: Option<&RegistryOrIndex>) -> CargoResult<()> {

tests/testsuite/publish.rs

@@ -1016,17 +1016,9 @@ 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)
-[VERIFYING] foo v0.0.1 ([ROOT]/foo)
-[COMPILING] foo v0.0.1 ([ROOT]/foo/target/package/foo-0.0.1)
-[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s
-[UPLOADING] foo v0.0.1 ([ROOT]/foo)
-[UPLOADED] foo v0.0.1 to registry [..]
-[NOTE] waiting for foo v0.0.1 to be available at registry [..]
-[HELP] you may press ctrl-c to skip waiting; the crate should be available shortly
+[WARNING] `--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
+...
 [PUBLISHED] foo v0.0.1 at registry [..]
 "#]])
         .run();
@@ -1067,6 +1059,8 @@ fn publish_failed_with_index_and_only_allowed_registry() {
         .arg(registry.index_url().as_str())
         .with_status(101)
         .with_stderr_data(str![[r#"
+[WARNING] `--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
 [ERROR] command-line argument --index requires --token to be specified
 
 "#]])