Skip to content

Commit ff274ea

Browse files
authored
Unrolled build for rust-lang#132577
Rollup merge of rust-lang#132577 - Urgau:check-cfg-report-extern-macro, r=petrochenkov Report the `unexpected_cfgs` lint in external macros This PR marks the `unexpected_cfgs` lint as being reportable in external macros, as it's probably not the intention of the macro author to leave ineffective cfgs in the users code. Fixes rust-lang#132572 try-job: aarch64-gnu-debug
2 parents 89b6885 + 79c8e64 commit ff274ea

File tree

7 files changed

+46
-8
lines changed

7 files changed

+46
-8
lines changed

Cargo.lock

+2-2
Original file line numberDiff line numberDiff line change
@@ -111,9 +111,9 @@ dependencies = [
111111

112112
[[package]]
113113
name = "anstream"
114-
version = "0.6.17"
114+
version = "0.6.18"
115115
source = "registry+https://github.com/rust-lang/crates.io-index"
116-
checksum = "23a1e53f0f5d86382dafe1cf314783b2044280f406e7e1506368220ad11b1338"
116+
checksum = "8acc5369981196006228e28809f761875c0327210a891e941f4c683b3a99529b"
117117
dependencies = [
118118
"anstyle",
119119
"anstyle-parse",

compiler/rustc_lint_defs/src/builtin.rs

+1
Original file line numberDiff line numberDiff line change
@@ -3185,6 +3185,7 @@ declare_lint! {
31853185
pub UNEXPECTED_CFGS,
31863186
Warn,
31873187
"detects unexpected names and values in `#[cfg]` conditions",
3188+
report_in_external_macro
31883189
}
31893190

31903191
declare_lint! {

src/tools/miri/miri-script/Cargo.lock

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# This file is automatically @generated by Cargo.
22
# It is not intended for manual editing.
3-
version = 3
3+
version = 4
44

55
[[package]]
66
name = "anyhow"
@@ -521,15 +521,15 @@ checksum = "d135d17ab770252ad95e9a872d365cf3090e3be864a34ab46f48555993efc904"
521521

522522
[[package]]
523523
name = "xshell"
524-
version = "0.2.6"
524+
version = "0.2.7"
525525
source = "registry+https://github.com/rust-lang/crates.io-index"
526-
checksum = "6db0ab86eae739efd1b054a8d3d16041914030ac4e01cd1dca0cf252fd8b6437"
526+
checksum = "9e7290c623014758632efe00737145b6867b66292c42167f2ec381eb566a373d"
527527
dependencies = [
528528
"xshell-macros",
529529
]
530530

531531
[[package]]
532532
name = "xshell-macros"
533-
version = "0.2.6"
533+
version = "0.2.7"
534534
source = "registry+https://github.com/rust-lang/crates.io-index"
535-
checksum = "9d422e8e38ec76e2f06ee439ccc765e9c6a9638b9e7c9f2e8255e4d41e8bd852"
535+
checksum = "32ac00cd3f8ec9c1d33fb3e7958a82df6989c42d747bd326c822b1d625283547"
+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
// Inspired by https://github.com/rust-lang/cargo/issues/14775
2+
3+
pub fn my_lib_func() {}
4+
5+
#[macro_export]
6+
macro_rules! my_lib_macro {
7+
() => {
8+
#[cfg(my_lib_cfg)]
9+
$crate::my_lib_func()
10+
};
11+
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
// This test checks that we emit the `unexpected_cfgs` lint even in code
2+
// coming from an external macro.
3+
4+
//@ check-pass
5+
//@ no-auto-check-cfg
6+
//@ aux-crate: cfg_macro=cfg_macro.rs
7+
//@ compile-flags: --check-cfg=cfg()
8+
9+
fn main() {
10+
cfg_macro::my_lib_macro!();
11+
//~^ WARNING unexpected `cfg` condition name
12+
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
warning: unexpected `cfg` condition name: `my_lib_cfg`
2+
--> $DIR/report-in-external-macros.rs:10:5
3+
|
4+
LL | cfg_macro::my_lib_macro!();
5+
| ^^^^^^^^^^^^^^^^^^^^^^^^^^
6+
|
7+
= 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`
8+
= help: to expect this configuration use `--check-cfg=cfg(my_lib_cfg)`
9+
= note: see <https://doc.rust-lang.org/nightly/rustc/check-cfg.html> for more information about checking conditional configuration
10+
= note: `#[warn(unexpected_cfgs)]` on by default
11+
= note: this warning originates in the macro `cfg_macro::my_lib_macro` (in Nightly builds, run with -Z macro-backtrace for more info)
12+
13+
warning: 1 warning emitted
14+

0 commit comments

Comments
 (0)