Auto merge of #9666 - hi-rustin:rustin-patch-warn, r=ehuss

Warning when using features in patch part of #3034
rust-lang · Jul 9, 2021 · 18f2598 · 18f2598
2 parents cc80b40 a846226
commit 18f2598
Show file tree

Hide file tree

Showing 2 changed files with 104 additions and 0 deletions.
diff --git a/src/cargo/core/registry.rs b/src/cargo/core/registry.rs
@@ -292,6 292,14 @@ impl<'cfg> PackageRegistry<'cfg> {
  dep.package_name()
  );
 
  if dep.features().len() != 0 || !dep.uses_default_features() {
  self.source_config.config().shell().warn(format!(
  "patch for `{}` uses the features mechanism. \
  default-features and features will not take effect because the patch dependency does not support this mechanism",
  dep.package_name()
  ))?;
  }
 
  // Go straight to the source for resolving `dep`. Load it as we
  // normally would and then ask it directly for the list of summaries
  // corresponding to this `dep`.

diff --git a/tests/testsuite/patch.rs b/tests/testsuite/patch.rs
@@ -787,6 787,102 @@ fn add_ignored_patch() {
  .run();
 }
 
 #[cargo_test]
 fn add_patch_with_features() {
  Package::new("bar", "0.1.0").publish();
 
  let p = project()
  .file(
  "Cargo.toml",
  r#"
  [package]
  name = "foo"
  version = "0.0.1"
  authors = []
 
  [dependencies]
  bar = "0.1.0"
 
  [patch.crates-io]
  bar = { path = 'bar', features = ["some_feature"] }
  "#,
  )
  .file("src/lib.rs", "")
  .file("bar/Cargo.toml", &basic_manifest("bar", "0.1.0"))
  .file("bar/src/lib.rs", r#""#)
  .build();
 
  p.cargo("build")
  .with_stderr(
  "\
 [WARNING] patch for `bar` uses the features mechanism. \
 default-features and features will not take effect because the patch dependency does not support this mechanism
 [UPDATING] `[ROOT][..]` index
 [COMPILING] bar v0.1.0 ([CWD]/bar)
 [COMPILING] foo v0.0.1 ([CWD])
 [FINISHED] dev [unoptimized debuginfo] target(s) in [..]
 ",
  )
  .run();
  p.cargo("build")
  .with_stderr(
  "\
 [WARNING] patch for `bar` uses the features mechanism. \
 default-features and features will not take effect because the patch dependency does not support this mechanism
 [FINISHED] [..]
 ",
  )
  .run();
 }
 
 #[cargo_test]
 fn add_patch_with_setting_default_features() {
  Package::new("bar", "0.1.0").publish();
 
  let p = project()
  .file(
  "Cargo.toml",
  r#"
  [package]
  name = "foo"
  version = "0.0.1"
  authors = []
 
  [dependencies]
  bar = "0.1.0"
 
  [patch.crates-io]
  bar = { path = 'bar', default-features = false, features = ["none_default_feature"] }
  "#,
  )
  .file("src/lib.rs", "")
  .file("bar/Cargo.toml", &basic_manifest("bar", "0.1.0"))
  .file("bar/src/lib.rs", r#""#)
  .build();
 
  p.cargo("build")
  .with_stderr(
  "\
 [WARNING] patch for `bar` uses the features mechanism. \
 default-features and features will not take effect because the patch dependency does not support this mechanism
 [UPDATING] `[ROOT][..]` index
 [COMPILING] bar v0.1.0 ([CWD]/bar)
 [COMPILING] foo v0.0.1 ([CWD])
 [FINISHED] dev [unoptimized debuginfo] target(s) in [..]
 ",
  )
  .run();
  p.cargo("build")
  .with_stderr(
  "\
 [WARNING] patch for `bar` uses the features mechanism. \
 default-features and features will not take effect because the patch dependency does not support this mechanism
 [FINISHED] [..]
 ",
  )
  .run();
 }
 
 #[cargo_test]
 fn no_warn_ws_patch() {
  Package::new("c", "0.1.0").publish();