bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

check-cfg: mention the unexpected name and value in the primary message

Browse source
This commit is contained in:
Urgau 2023-10-12 16:49:56 +02:00
parent 72815dc08f
commit dcfc484b09
17 changed files with 62 additions and 58 deletions
Download patch file Download diff file Expand all files Collapse all files

8
compiler/rustc_attr/src/builtin.rs
View file

@ -548,7 +548,11 @@ pub fn cfg_matches(
UNEXPECTED_CFGS,
cfg.span,
lint_node_id,
"unexpected `cfg` condition value",
if let Some(value) = cfg.value {
format!("unexpected `cfg` condition value: `{value}`")
} else {
format!("unexpected `cfg` condition value: (none)")
},
BuiltinLintDiagnostics::UnexpectedCfgValue(
(cfg.name, cfg.name_span),
cfg.value.map(|v| (v, cfg.value_span.unwrap())),
@ -560,7 +564,7 @@ pub fn cfg_matches(
UNEXPECTED_CFGS,
cfg.span,
lint_node_id,
"unexpected `cfg` condition name",
format!("unexpected `cfg` condition name: `{}`", cfg.name),
BuiltinLintDiagnostics::UnexpectedCfgName(
(cfg.name, cfg.name_span),
cfg.value.map(|v| (v, cfg.value_span.unwrap())),