Skip to content

Commit 6fb13c6

Browse files
committed
Auto merge of rust-lang#138515 - petrochenkov:cfgtrace, r=nnethercote
expand: Leave traces when expanding `cfg_attr` attributes Currently `cfg_trace` just disappears during expansion, but after this PR `#[cfg_attr(some tokens)]` will leave a `#[cfg_attr_trace(some tokens)]` attribute instead of itself in AST after expansion (the new attribute is built-in and inert, its inner tokens are the same as in the original attribute). This trace attribute can then be used by lints or other diagnostics, rust-lang#133823 has some examples. Tokens in these trace attributes are set to an empty token stream, so the traces are non-existent for proc macros and cannot affect any user-observable behavior. This is also a weakness, because if a proc macro processes some code with the trace attributes, they will be lost, so the traces are best effort rather than precise. The next step is to do the same thing with `cfg` attributes (`#[cfg(TRUE)]` currently remains in both AST and tokens after expanding, it should be replaced with a trace instead). The idea belongs to `@estebank.`
2 parents e85fcab + 6cf2d72 commit 6fb13c6

File tree

1 file changed

+5
-1
lines changed

1 file changed

+5
-1
lines changed

clippy_lints/src/attrs/duplicated_attributes.rs

+5-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,11 @@ fn check_duplicated_attr(
3636
}
3737
let Some(ident) = attr.ident() else { return };
3838
let name = ident.name;
39-
if name == sym::doc || name == sym::cfg_attr || name == sym::rustc_on_unimplemented || name == sym::reason {
39+
if name == sym::doc
40+
|| name == sym::cfg_attr
41+
|| name == sym::cfg_attr_trace
42+
|| name == sym::rustc_on_unimplemented
43+
|| name == sym::reason {
4044
// FIXME: Would be nice to handle `cfg_attr` as well. Only problem is to check that cfg
4145
// conditions are the same.
4246
// `#[rustc_on_unimplemented]` contains duplicated subattributes, that's expected.

0 commit comments

Comments
 (0)