From 44c166e9ace21835b2794005573c2b1964e29acc Mon Sep 17 00:00:00 2001
From: Urgau <urgau@numericable.fr>
Date: Tue, 19 Nov 2024 20:32:48 +0100
Subject: [PATCH 1/3] Add Cargo revision and values to the check-cfg macro test
---
tests/ui/check-cfg/auxiliary/cfg_macro.rs | 16 ++++++++
.../report-in-external-macros.cargo.stderr | 39 +++++++++++++++++++
.../ui/check-cfg/report-in-external-macros.rs | 11 +++++-
.../report-in-external-macros.rustc.stderr | 35 +++++++++++++++++
.../report-in-external-macros.stderr | 14 -------
5 files changed, 100 insertions(+), 15 deletions(-)
create mode 100644 tests/ui/check-cfg/report-in-external-macros.cargo.stderr
create mode 100644 tests/ui/check-cfg/report-in-external-macros.rustc.stderr
delete mode 100644 tests/ui/check-cfg/report-in-external-macros.stderr
diff --git a/tests/ui/check-cfg/auxiliary/cfg_macro.rs b/tests/ui/check-cfg/auxiliary/cfg_macro.rs
index d68accd9202f7..1293fd6975e67 100644
--- a/tests/ui/check-cfg/auxiliary/cfg_macro.rs
+++ b/tests/ui/check-cfg/auxiliary/cfg_macro.rs
@@ -9,3 +9,19 @@ macro_rules! my_lib_macro {
$crate::my_lib_func()
};
}
+
+#[macro_export]
+macro_rules! my_lib_macro_value {
+ () => {
+ #[cfg(panic = "UNEXPECTED_VALUE")]
+ $crate::my_lib_func()
+ };
+}
+
+#[macro_export]
+macro_rules! my_lib_macro_feature {
+ () => {
+ #[cfg(feature = "UNEXPECTED_FEATURE")]
+ $crate::my_lib_func()
+ };
+}
diff --git a/tests/ui/check-cfg/report-in-external-macros.cargo.stderr b/tests/ui/check-cfg/report-in-external-macros.cargo.stderr
new file mode 100644
index 0000000000000..98c7a06834713
--- /dev/null
+++ b/tests/ui/check-cfg/report-in-external-macros.cargo.stderr
@@ -0,0 +1,39 @@
+warning: unexpected `cfg` condition name: `my_lib_cfg`
+ --> $DIR/report-in-external-macros.rs:13:5
+ |
+LL | cfg_macro::my_lib_macro!();
+ | ^^^^^^^^^^^^^^^^^^^^^^^^^^
+ |
+ = help: expected names are: `clippy`, `debug_assertions`, `doc`, `doctest`, `feature`, `fmt_debug`, `miri`, `overflow_checks`, `panic`, `proc_macro`, `relocation_model`, `rustfmt`, `sanitize`, `sanitizer_cfi_generalize_pointers`, `sanitizer_cfi_normalize_integers`, `target_abi`, `target_arch`, `target_endian`, `target_env`, `target_family`, `target_feature`, `target_has_atomic`, `target_has_atomic_equal_alignment`, `target_has_atomic_load_store`, `target_os`, `target_pointer_width`, `target_thread_local`, `target_vendor`, `test`, `ub_checks`, `unix`, and `windows`
+ = help: consider using a Cargo feature instead
+ = help: or consider adding in `Cargo.toml` the `check-cfg` lint config for the lint:
+ [lints.rust]
+ unexpected_cfgs = { level = "warn", check-cfg = ['cfg(my_lib_cfg)'] }
+ = help: or consider adding `println!("cargo::rustc-check-cfg=cfg(my_lib_cfg)");` to the top of the `build.rs`
+ = note: see <https://doc.rust-lang.org/nightly/rustc/check-cfg/cargo-specifics.html> for more information about checking conditional configuration
+ = note: `#[warn(unexpected_cfgs)]` on by default
+ = note: this warning originates in the macro `cfg_macro::my_lib_macro` (in Nightly builds, run with -Z macro-backtrace for more info)
+
+warning: unexpected `cfg` condition value: `UNEXPECTED_VALUE`
+ --> $DIR/report-in-external-macros.rs:16:5
+ |
+LL | cfg_macro::my_lib_macro_value!();
+ | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+ |
+ = note: expected values for `panic` are: `abort` and `unwind`
+ = note: see <https://doc.rust-lang.org/nightly/rustc/check-cfg/cargo-specifics.html> for more information about checking conditional configuration
+ = note: this warning originates in the macro `cfg_macro::my_lib_macro_value` (in Nightly builds, run with -Z macro-backtrace for more info)
+
+warning: unexpected `cfg` condition value: `UNEXPECTED_FEATURE`
+ --> $DIR/report-in-external-macros.rs:19:5
+ |
+LL | cfg_macro::my_lib_macro_feature!();
+ | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+ |
+ = note: no expected values for `feature`
+ = help: consider adding `UNEXPECTED_FEATURE` as a feature in `Cargo.toml`
+ = note: see <https://doc.rust-lang.org/nightly/rustc/check-cfg/cargo-specifics.html> for more information about checking conditional configuration
+ = note: this warning originates in the macro `cfg_macro::my_lib_macro_feature` (in Nightly builds, run with -Z macro-backtrace for more info)
+
+warning: 3 warnings emitted
+
diff --git a/tests/ui/check-cfg/report-in-external-macros.rs b/tests/ui/check-cfg/report-in-external-macros.rs
index 56550b04af305..72c2f6f6618fb 100644
--- a/tests/ui/check-cfg/report-in-external-macros.rs
+++ b/tests/ui/check-cfg/report-in-external-macros.rs
@@ -3,10 +3,19 @@
//@ check-pass
//@ no-auto-check-cfg
+//@ revisions: cargo rustc
+//@ [rustc]unset-rustc-env:CARGO_CRATE_NAME
+//@ [cargo]rustc-env:CARGO_CRATE_NAME=foo
//@ aux-crate: cfg_macro=cfg_macro.rs
-//@ compile-flags: --check-cfg=cfg()
+//@ compile-flags: --check-cfg=cfg(feature,values())
fn main() {
cfg_macro::my_lib_macro!();
//~^ WARNING unexpected `cfg` condition name
+
+ cfg_macro::my_lib_macro_value!();
+ //~^ WARNING unexpected `cfg` condition value
+
+ cfg_macro::my_lib_macro_feature!();
+ //~^ WARNING unexpected `cfg` condition value
}
diff --git a/tests/ui/check-cfg/report-in-external-macros.rustc.stderr b/tests/ui/check-cfg/report-in-external-macros.rustc.stderr
new file mode 100644
index 0000000000000..15d12c064554b
--- /dev/null
+++ b/tests/ui/check-cfg/report-in-external-macros.rustc.stderr
@@ -0,0 +1,35 @@
+warning: unexpected `cfg` condition name: `my_lib_cfg`
+ --> $DIR/report-in-external-macros.rs:13:5
+ |
+LL | cfg_macro::my_lib_macro!();
+ | ^^^^^^^^^^^^^^^^^^^^^^^^^^
+ |
+ = help: expected names are: `clippy`, `debug_assertions`, `doc`, `doctest`, `feature`, `fmt_debug`, `miri`, `overflow_checks`, `panic`, `proc_macro`, `relocation_model`, `rustfmt`, `sanitize`, `sanitizer_cfi_generalize_pointers`, `sanitizer_cfi_normalize_integers`, `target_abi`, `target_arch`, `target_endian`, `target_env`, `target_family`, `target_feature`, `target_has_atomic`, `target_has_atomic_equal_alignment`, `target_has_atomic_load_store`, `target_os`, `target_pointer_width`, `target_thread_local`, `target_vendor`, `test`, `ub_checks`, `unix`, and `windows`
+ = help: to expect this configuration use `--check-cfg=cfg(my_lib_cfg)`
+ = note: see <https://doc.rust-lang.org/nightly/rustc/check-cfg.html> for more information about checking conditional configuration
+ = note: `#[warn(unexpected_cfgs)]` on by default
+ = note: this warning originates in the macro `cfg_macro::my_lib_macro` (in Nightly builds, run with -Z macro-backtrace for more info)
+
+warning: unexpected `cfg` condition value: `UNEXPECTED_VALUE`
+ --> $DIR/report-in-external-macros.rs:16:5
+ |
+LL | cfg_macro::my_lib_macro_value!();
+ | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+ |
+ = note: expected values for `panic` are: `abort` and `unwind`
+ = note: see <https://doc.rust-lang.org/nightly/rustc/check-cfg.html> for more information about checking conditional configuration
+ = note: this warning originates in the macro `cfg_macro::my_lib_macro_value` (in Nightly builds, run with -Z macro-backtrace for more info)
+
+warning: unexpected `cfg` condition value: `UNEXPECTED_FEATURE`
+ --> $DIR/report-in-external-macros.rs:19:5
+ |
+LL | cfg_macro::my_lib_macro_feature!();
+ | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+ |
+ = note: no expected values for `feature`
+ = help: to expect this configuration use `--check-cfg=cfg(feature, values("UNEXPECTED_FEATURE"))`
+ = note: see <https://doc.rust-lang.org/nightly/rustc/check-cfg.html> for more information about checking conditional configuration
+ = note: this warning originates in the macro `cfg_macro::my_lib_macro_feature` (in Nightly builds, run with -Z macro-backtrace for more info)
+
+warning: 3 warnings emitted
+
diff --git a/tests/ui/check-cfg/report-in-external-macros.stderr b/tests/ui/check-cfg/report-in-external-macros.stderr
deleted file mode 100644
index 11300a4e40272..0000000000000
--- a/tests/ui/check-cfg/report-in-external-macros.stderr
+++ /dev/null
@@ -1,14 +0,0 @@
-warning: unexpected `cfg` condition name: `my_lib_cfg`
- --> $DIR/report-in-external-macros.rs:10:5
- |
-LL | cfg_macro::my_lib_macro!();
- | ^^^^^^^^^^^^^^^^^^^^^^^^^^
- |
- = help: expected names are: `clippy`, `debug_assertions`, `doc`, `doctest`, `fmt_debug`, `miri`, `overflow_checks`, `panic`, `proc_macro`, `relocation_model`, `rustfmt`, `sanitize`, `sanitizer_cfi_generalize_pointers`, `sanitizer_cfi_normalize_integers`, `target_abi`, `target_arch`, `target_endian`, `target_env`, `target_family`, `target_feature`, `target_has_atomic`, `target_has_atomic_equal_alignment`, `target_has_atomic_load_store`, `target_os`, `target_pointer_width`, `target_thread_local`, `target_vendor`, `test`, `ub_checks`, `unix`, and `windows`
- = help: to expect this configuration use `--check-cfg=cfg(my_lib_cfg)`
- = note: see <https://doc.rust-lang.org/nightly/rustc/check-cfg.html> for more information about checking conditional configuration
- = note: `#[warn(unexpected_cfgs)]` on by default
- = note: this warning originates in the macro `cfg_macro::my_lib_macro` (in Nightly builds, run with -Z macro-backtrace for more info)
-
-warning: 1 warning emitted
-
From 0ab3ae81a59aba3fed45d5894e931d4250c18aa8 Mon Sep 17 00:00:00 2001
From: Urgau <urgau@numericable.fr>
Date: Tue, 19 Nov 2024 21:23:54 +0100
Subject: [PATCH 2/3] Disable most Cargo check-cfg help in external macros
---
.../rustc_lint/src/context/diagnostics/check_cfg.rs | 13 ++++++++++---
.../report-in-external-macros.cargo.stderr | 6 ------
2 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/compiler/rustc_lint/src/context/diagnostics/check_cfg.rs b/compiler/rustc_lint/src/context/diagnostics/check_cfg.rs
index 16994846545df..4ab30ce32ee4f 100644
--- a/compiler/rustc_lint/src/context/diagnostics/check_cfg.rs
+++ b/compiler/rustc_lint/src/context/diagnostics/check_cfg.rs
@@ -85,6 +85,7 @@ pub(super) fn unexpected_cfg_name(
};
let is_from_cargo = rustc_session::utils::was_invoked_from_cargo();
+ let is_from_external_macro = rustc_middle::lint::in_external_macro(sess, name_span);
let mut is_feature_cfg = name == sym::feature;
let code_sugg = if is_feature_cfg && is_from_cargo {
@@ -185,7 +186,11 @@ pub(super) fn unexpected_cfg_name(
};
let invocation_help = if is_from_cargo {
- let sub = if !is_feature_cfg { Some(cargo_help_sub(sess, &inst)) } else { None };
+ let sub = if !is_feature_cfg && !is_from_external_macro {
+ Some(cargo_help_sub(sess, &inst))
+ } else {
+ None
+ };
lints::unexpected_cfg_name::InvocationHelp::Cargo { sub }
} else {
lints::unexpected_cfg_name::InvocationHelp::Rustc(lints::UnexpectedCfgRustcHelp::new(
@@ -216,7 +221,9 @@ pub(super) fn unexpected_cfg_value(
.copied()
.flatten()
.collect();
+
let is_from_cargo = rustc_session::utils::was_invoked_from_cargo();
+ let is_from_external_macro = rustc_middle::lint::in_external_macro(sess, name_span);
// Show the full list if all possible values for a given name, but don't do it
// for names as the possibilities could be very long
@@ -284,13 +291,13 @@ pub(super) fn unexpected_cfg_value(
};
let invocation_help = if is_from_cargo {
- let help = if name == sym::feature {
+ let help = if name == sym::feature && !is_from_external_macro {
if let Some((value, _value_span)) = value {
Some(lints::unexpected_cfg_value::CargoHelp::AddFeature { value })
} else {
Some(lints::unexpected_cfg_value::CargoHelp::DefineFeatures)
}
- } else if can_suggest_adding_value {
+ } else if can_suggest_adding_value && !is_from_external_macro {
Some(lints::unexpected_cfg_value::CargoHelp::Other(cargo_help_sub(sess, &inst)))
} else {
None
diff --git a/tests/ui/check-cfg/report-in-external-macros.cargo.stderr b/tests/ui/check-cfg/report-in-external-macros.cargo.stderr
index 98c7a06834713..0858b01e309c9 100644
--- a/tests/ui/check-cfg/report-in-external-macros.cargo.stderr
+++ b/tests/ui/check-cfg/report-in-external-macros.cargo.stderr
@@ -5,11 +5,6 @@ LL | cfg_macro::my_lib_macro!();
| ^^^^^^^^^^^^^^^^^^^^^^^^^^
|
= help: expected names are: `clippy`, `debug_assertions`, `doc`, `doctest`, `feature`, `fmt_debug`, `miri`, `overflow_checks`, `panic`, `proc_macro`, `relocation_model`, `rustfmt`, `sanitize`, `sanitizer_cfi_generalize_pointers`, `sanitizer_cfi_normalize_integers`, `target_abi`, `target_arch`, `target_endian`, `target_env`, `target_family`, `target_feature`, `target_has_atomic`, `target_has_atomic_equal_alignment`, `target_has_atomic_load_store`, `target_os`, `target_pointer_width`, `target_thread_local`, `target_vendor`, `test`, `ub_checks`, `unix`, and `windows`
- = help: consider using a Cargo feature instead
- = help: or consider adding in `Cargo.toml` the `check-cfg` lint config for the lint:
- [lints.rust]
- unexpected_cfgs = { level = "warn", check-cfg = ['cfg(my_lib_cfg)'] }
- = help: or consider adding `println!("cargo::rustc-check-cfg=cfg(my_lib_cfg)");` to the top of the `build.rs`
= note: see <https://doc.rust-lang.org/nightly/rustc/check-cfg/cargo-specifics.html> for more information about checking conditional configuration
= note: `#[warn(unexpected_cfgs)]` on by default
= note: this warning originates in the macro `cfg_macro::my_lib_macro` (in Nightly builds, run with -Z macro-backtrace for more info)
@@ -31,7 +26,6 @@ LL | cfg_macro::my_lib_macro_feature!();
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
|
= note: no expected values for `feature`
- = help: consider adding `UNEXPECTED_FEATURE` as a feature in `Cargo.toml`
= note: see <https://doc.rust-lang.org/nightly/rustc/check-cfg/cargo-specifics.html> for more information about checking conditional configuration
= note: this warning originates in the macro `cfg_macro::my_lib_macro_feature` (in Nightly builds, run with -Z macro-backtrace for more info)
From e2fbeec150b1bf4408cc7c30f4fa06e224186e71 Mon Sep 17 00:00:00 2001
From: Urgau <urgau@numericable.fr>
Date: Tue, 19 Nov 2024 22:46:11 +0100
Subject: [PATCH 3/3] Add external macro specific diagnostic to check-cfg
---
compiler/rustc_lint/messages.ftl | 4 ++
.../src/context/diagnostics/check_cfg.rs | 57 ++++++++++++++++---
compiler/rustc_lint/src/lints.rs | 44 ++++++++++++--
.../report-in-external-macros.cargo.stderr | 9 +++
.../report-in-external-macros.rustc.stderr | 6 ++
5 files changed, 108 insertions(+), 12 deletions(-)
diff --git a/compiler/rustc_lint/messages.ftl b/compiler/rustc_lint/messages.ftl
index 6e35d89b48800..436e14e93d29a 100644
--- a/compiler/rustc_lint/messages.ftl
+++ b/compiler/rustc_lint/messages.ftl
@@ -803,10 +803,14 @@ lint_unexpected_cfg_add_build_rs_println = or consider adding `{$build_rs_printl
lint_unexpected_cfg_add_cargo_feature = consider using a Cargo feature instead
lint_unexpected_cfg_add_cargo_toml_lint_cfg = or consider adding in `Cargo.toml` the `check-cfg` lint config for the lint:{$cargo_toml_lint_cfg}
lint_unexpected_cfg_add_cmdline_arg = to expect this configuration use `{$cmdline_arg}`
+lint_unexpected_cfg_cargo_update = the {$macro_kind} `{$macro_name}` may come from an old version of it's defining crate, try updating your dependencies with `cargo update`
+
lint_unexpected_cfg_define_features = consider defining some features in `Cargo.toml`
lint_unexpected_cfg_doc_cargo = see <https://doc.rust-lang.org/nightly/rustc/check-cfg/cargo-specifics.html> for more information about checking conditional configuration
lint_unexpected_cfg_doc_rustc = see <https://doc.rust-lang.org/nightly/rustc/check-cfg.html> for more information about checking conditional configuration
+lint_unexpected_cfg_from_external_macro_origin = using a cfg inside a {$macro_kind} will use the cfgs from the destination crate and not the ones from the defining crate
+lint_unexpected_cfg_from_external_macro_refer = try refering to `{$macro_name}` crate for guidance on how handle this unexpected cfg
lint_unexpected_cfg_name = unexpected `cfg` condition name: `{$name}`
lint_unexpected_cfg_name_expected_names = expected names are: {$possibilities}{$and_more ->
[0] {""}
diff --git a/compiler/rustc_lint/src/context/diagnostics/check_cfg.rs b/compiler/rustc_lint/src/context/diagnostics/check_cfg.rs
index 4ab30ce32ee4f..63a722f606762 100644
--- a/compiler/rustc_lint/src/context/diagnostics/check_cfg.rs
+++ b/compiler/rustc_lint/src/context/diagnostics/check_cfg.rs
@@ -1,9 +1,10 @@
+use rustc_hir::def_id::LOCAL_CRATE;
use rustc_middle::bug;
use rustc_session::Session;
use rustc_session::config::ExpectedValues;
use rustc_span::edit_distance::find_best_match_for_name;
use rustc_span::symbol::Ident;
-use rustc_span::{Span, Symbol, sym};
+use rustc_span::{ExpnKind, Span, Symbol, sym};
use crate::lints;
@@ -60,6 +61,35 @@ fn cargo_help_sub(
}
}
+fn rustc_macro_help(span: Span) -> Option<lints::UnexpectedCfgRustcMacroHelp> {
+ let oexpn = span.ctxt().outer_expn_data();
+ if let Some(def_id) = oexpn.macro_def_id
+ && let ExpnKind::Macro(macro_kind, macro_name) = oexpn.kind
+ && def_id.krate != LOCAL_CRATE
+ {
+ Some(lints::UnexpectedCfgRustcMacroHelp { macro_kind: macro_kind.descr(), macro_name })
+ } else {
+ None
+ }
+}
+
+fn cargo_macro_help(span: Span) -> Option<lints::UnexpectedCfgCargoMacroHelp> {
+ let oexpn = span.ctxt().outer_expn_data();
+ if let Some(def_id) = oexpn.macro_def_id
+ && let ExpnKind::Macro(macro_kind, macro_name) = oexpn.kind
+ && def_id.krate != LOCAL_CRATE
+ {
+ Some(lints::UnexpectedCfgCargoMacroHelp {
+ macro_kind: macro_kind.descr(),
+ macro_name,
+ // FIXME: Get access to a `TyCtxt` from an `EarlyContext`
+ // crate_name: cx.tcx.crate_name(def_id.krate),
+ })
+ } else {
+ None
+ }
+}
+
pub(super) fn unexpected_cfg_name(
sess: &Session,
(name, name_span): (Symbol, Span),
@@ -186,16 +216,21 @@ pub(super) fn unexpected_cfg_name(
};
let invocation_help = if is_from_cargo {
- let sub = if !is_feature_cfg && !is_from_external_macro {
+ let help = if !is_feature_cfg && !is_from_external_macro {
Some(cargo_help_sub(sess, &inst))
} else {
None
};
- lints::unexpected_cfg_name::InvocationHelp::Cargo { sub }
+ lints::unexpected_cfg_name::InvocationHelp::Cargo {
+ help,
+ macro_help: cargo_macro_help(name_span),
+ }
} else {
- lints::unexpected_cfg_name::InvocationHelp::Rustc(lints::UnexpectedCfgRustcHelp::new(
- &inst(EscapeQuotes::No),
- ))
+ let help = lints::UnexpectedCfgRustcHelp::new(&inst(EscapeQuotes::No));
+ lints::unexpected_cfg_name::InvocationHelp::Rustc {
+ help,
+ macro_help: rustc_macro_help(name_span),
+ }
};
lints::UnexpectedCfgName { code_sugg, invocation_help, name }
@@ -302,14 +337,20 @@ pub(super) fn unexpected_cfg_value(
} else {
None
};
- lints::unexpected_cfg_value::InvocationHelp::Cargo(help)
+ lints::unexpected_cfg_value::InvocationHelp::Cargo {
+ help,
+ macro_help: cargo_macro_help(name_span),
+ }
} else {
let help = if can_suggest_adding_value {
Some(lints::UnexpectedCfgRustcHelp::new(&inst(EscapeQuotes::No)))
} else {
None
};
- lints::unexpected_cfg_value::InvocationHelp::Rustc(help)
+ lints::unexpected_cfg_value::InvocationHelp::Rustc {
+ help,
+ macro_help: rustc_macro_help(name_span),
+ }
};
lints::UnexpectedCfgValue {
diff --git a/compiler/rustc_lint/src/lints.rs b/compiler/rustc_lint/src/lints.rs
index 352155729e51c..3bf9bf0700560 100644
--- a/compiler/rustc_lint/src/lints.rs
+++ b/compiler/rustc_lint/src/lints.rs
@@ -2131,6 +2131,25 @@ impl UnexpectedCfgRustcHelp {
}
}
+#[derive(Subdiagnostic)]
+#[note(lint_unexpected_cfg_from_external_macro_origin)]
+#[help(lint_unexpected_cfg_from_external_macro_refer)]
+pub(crate) struct UnexpectedCfgRustcMacroHelp {
+ pub macro_kind: &'static str,
+ pub macro_name: Symbol,
+}
+
+#[derive(Subdiagnostic)]
+#[note(lint_unexpected_cfg_from_external_macro_origin)]
+#[help(lint_unexpected_cfg_from_external_macro_refer)]
+#[help(lint_unexpected_cfg_cargo_update)]
+pub(crate) struct UnexpectedCfgCargoMacroHelp {
+ pub macro_kind: &'static str,
+ pub macro_name: Symbol,
+ // FIXME: Figure out a way to get the crate name
+ // crate_name: String,
+}
+
#[derive(LintDiagnostic)]
#[diag(lint_unexpected_cfg_name)]
pub(crate) struct UnexpectedCfgName {
@@ -2235,10 +2254,17 @@ pub(crate) mod unexpected_cfg_name {
#[note(lint_unexpected_cfg_doc_cargo)]
Cargo {
#[subdiagnostic]
- sub: Option<super::UnexpectedCfgCargoHelp>,
+ macro_help: Option<super::UnexpectedCfgCargoMacroHelp>,
+ #[subdiagnostic]
+ help: Option<super::UnexpectedCfgCargoHelp>,
},
#[note(lint_unexpected_cfg_doc_rustc)]
- Rustc(#[subdiagnostic] super::UnexpectedCfgRustcHelp),
+ Rustc {
+ #[subdiagnostic]
+ macro_help: Option<super::UnexpectedCfgRustcMacroHelp>,
+ #[subdiagnostic]
+ help: super::UnexpectedCfgRustcHelp,
+ },
}
}
@@ -2341,9 +2367,19 @@ pub(crate) mod unexpected_cfg_value {
#[derive(Subdiagnostic)]
pub(crate) enum InvocationHelp {
#[note(lint_unexpected_cfg_doc_cargo)]
- Cargo(#[subdiagnostic] Option<CargoHelp>),
+ Cargo {
+ #[subdiagnostic]
+ help: Option<CargoHelp>,
+ #[subdiagnostic]
+ macro_help: Option<super::UnexpectedCfgCargoMacroHelp>,
+ },
#[note(lint_unexpected_cfg_doc_rustc)]
- Rustc(#[subdiagnostic] Option<super::UnexpectedCfgRustcHelp>),
+ Rustc {
+ #[subdiagnostic]
+ help: Option<super::UnexpectedCfgRustcHelp>,
+ #[subdiagnostic]
+ macro_help: Option<super::UnexpectedCfgRustcMacroHelp>,
+ },
}
#[derive(Subdiagnostic)]
diff --git a/tests/ui/check-cfg/report-in-external-macros.cargo.stderr b/tests/ui/check-cfg/report-in-external-macros.cargo.stderr
index 0858b01e309c9..6fb397b5529b5 100644
--- a/tests/ui/check-cfg/report-in-external-macros.cargo.stderr
+++ b/tests/ui/check-cfg/report-in-external-macros.cargo.stderr
@@ -5,6 +5,9 @@ LL | cfg_macro::my_lib_macro!();
| ^^^^^^^^^^^^^^^^^^^^^^^^^^
|
= help: expected names are: `clippy`, `debug_assertions`, `doc`, `doctest`, `feature`, `fmt_debug`, `miri`, `overflow_checks`, `panic`, `proc_macro`, `relocation_model`, `rustfmt`, `sanitize`, `sanitizer_cfi_generalize_pointers`, `sanitizer_cfi_normalize_integers`, `target_abi`, `target_arch`, `target_endian`, `target_env`, `target_family`, `target_feature`, `target_has_atomic`, `target_has_atomic_equal_alignment`, `target_has_atomic_load_store`, `target_os`, `target_pointer_width`, `target_thread_local`, `target_vendor`, `test`, `ub_checks`, `unix`, and `windows`
+ = note: using a cfg inside a macro will use the cfgs from the destination crate and not the ones from the defining crate
+ = help: try refering to `cfg_macro::my_lib_macro` crate for guidance on how handle this unexpected cfg
+ = help: the macro `cfg_macro::my_lib_macro` may come from an old version of it's defining crate, try updating your dependencies with `cargo update`
= note: see <https://doc.rust-lang.org/nightly/rustc/check-cfg/cargo-specifics.html> for more information about checking conditional configuration
= note: `#[warn(unexpected_cfgs)]` on by default
= note: this warning originates in the macro `cfg_macro::my_lib_macro` (in Nightly builds, run with -Z macro-backtrace for more info)
@@ -16,6 +19,9 @@ LL | cfg_macro::my_lib_macro_value!();
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
|
= note: expected values for `panic` are: `abort` and `unwind`
+ = note: using a cfg inside a macro will use the cfgs from the destination crate and not the ones from the defining crate
+ = help: try refering to `cfg_macro::my_lib_macro_value` crate for guidance on how handle this unexpected cfg
+ = help: the macro `cfg_macro::my_lib_macro_value` may come from an old version of it's defining crate, try updating your dependencies with `cargo update`
= note: see <https://doc.rust-lang.org/nightly/rustc/check-cfg/cargo-specifics.html> for more information about checking conditional configuration
= note: this warning originates in the macro `cfg_macro::my_lib_macro_value` (in Nightly builds, run with -Z macro-backtrace for more info)
@@ -26,6 +32,9 @@ LL | cfg_macro::my_lib_macro_feature!();
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
|
= note: no expected values for `feature`
+ = note: using a cfg inside a macro will use the cfgs from the destination crate and not the ones from the defining crate
+ = help: try refering to `cfg_macro::my_lib_macro_feature` crate for guidance on how handle this unexpected cfg
+ = help: the macro `cfg_macro::my_lib_macro_feature` may come from an old version of it's defining crate, try updating your dependencies with `cargo update`
= note: see <https://doc.rust-lang.org/nightly/rustc/check-cfg/cargo-specifics.html> for more information about checking conditional configuration
= note: this warning originates in the macro `cfg_macro::my_lib_macro_feature` (in Nightly builds, run with -Z macro-backtrace for more info)
diff --git a/tests/ui/check-cfg/report-in-external-macros.rustc.stderr b/tests/ui/check-cfg/report-in-external-macros.rustc.stderr
index 15d12c064554b..1a03184ee814b 100644
--- a/tests/ui/check-cfg/report-in-external-macros.rustc.stderr
+++ b/tests/ui/check-cfg/report-in-external-macros.rustc.stderr
@@ -5,6 +5,8 @@ LL | cfg_macro::my_lib_macro!();
| ^^^^^^^^^^^^^^^^^^^^^^^^^^
|
= help: expected names are: `clippy`, `debug_assertions`, `doc`, `doctest`, `feature`, `fmt_debug`, `miri`, `overflow_checks`, `panic`, `proc_macro`, `relocation_model`, `rustfmt`, `sanitize`, `sanitizer_cfi_generalize_pointers`, `sanitizer_cfi_normalize_integers`, `target_abi`, `target_arch`, `target_endian`, `target_env`, `target_family`, `target_feature`, `target_has_atomic`, `target_has_atomic_equal_alignment`, `target_has_atomic_load_store`, `target_os`, `target_pointer_width`, `target_thread_local`, `target_vendor`, `test`, `ub_checks`, `unix`, and `windows`
+ = note: using a cfg inside a macro will use the cfgs from the destination crate and not the ones from the defining crate
+ = help: try refering to `cfg_macro::my_lib_macro` crate for guidance on how handle this unexpected cfg
= help: to expect this configuration use `--check-cfg=cfg(my_lib_cfg)`
= note: see <https://doc.rust-lang.org/nightly/rustc/check-cfg.html> for more information about checking conditional configuration
= note: `#[warn(unexpected_cfgs)]` on by default
@@ -17,6 +19,8 @@ LL | cfg_macro::my_lib_macro_value!();
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
|
= note: expected values for `panic` are: `abort` and `unwind`
+ = note: using a cfg inside a macro will use the cfgs from the destination crate and not the ones from the defining crate
+ = help: try refering to `cfg_macro::my_lib_macro_value` crate for guidance on how handle this unexpected cfg
= note: see <https://doc.rust-lang.org/nightly/rustc/check-cfg.html> for more information about checking conditional configuration
= note: this warning originates in the macro `cfg_macro::my_lib_macro_value` (in Nightly builds, run with -Z macro-backtrace for more info)
@@ -28,6 +32,8 @@ LL | cfg_macro::my_lib_macro_feature!();
|
= note: no expected values for `feature`
= help: to expect this configuration use `--check-cfg=cfg(feature, values("UNEXPECTED_FEATURE"))`
+ = note: using a cfg inside a macro will use the cfgs from the destination crate and not the ones from the defining crate
+ = help: try refering to `cfg_macro::my_lib_macro_feature` crate for guidance on how handle this unexpected cfg
= note: see <https://doc.rust-lang.org/nightly/rustc/check-cfg.html> for more information about checking conditional configuration
= note: this warning originates in the macro `cfg_macro::my_lib_macro_feature` (in Nightly builds, run with -Z macro-backtrace for more info)