Fix `is_from_proc_macro` patterns #11538

Jarcho · 2023-09-19T20:37:13Z

changelog: none

rustbot · 2023-09-19T20:37:18Z

(rustbot has picked a reviewer for you, use r? to override)

Finally, after a few months I finally release this 0.9.9 version of the final 'is_from_proc_macro'. The main changes happen on: - Moving 'check_from_proc_macro.rs' from Clippy to rustc_lint - Applying a Jarcho's (yet to be merged) fix to that file (See rust-lang/rust-clippy#11538) - Change every occurence of 'is_from_proc_macro' to 'cx.in_proc_macro' - Added a new macro to 'rustc_lint/late.rs', now it checks if we're in Clippy, if we are indeed in Clippy, check if we're in a proc macro. - Apply some parallization to the checking with already provided functions (nothing too fancy, just using a parallization function) - Fix a bug on 'min_ident_chars.rs' - A few more things I don't remember... You can test this commit with 'RUST_BACKTRACE=full x test src/tools/clippy --keep-stage=2'

GuillaumeGomez · 2023-10-06T09:26:33Z

r? @Centri3

blyxyas · 2023-10-14T21:20:01Z

Maybe some optimizing would be pretty cool, we have a 3-second slowdown just from this PR on benchmarks.

Jarcho · 2023-10-14T22:09:06Z

Those results are quite suspicious given that part of this involves changing is_from_proc_macro to run only on as casts and not on every expression

Jarcho · 2023-11-02T10:27:03Z

Got around to checking this. Testing was done on the current master and this pr rebased onto it. Timed command is cargo dev dogfood after touch clippy_lints/src/lib.rs. Running both ten times got this pr as slightly faster (~52 seconds vs. ~56 seconds).

bors · 2023-11-02T16:48:24Z

☔ The latest upstream changes (presumably #11747) made this pull request unmergeable. Please resolve the merge conflicts.

Centri3

This overall looks good to me, I just want some clarification regarding parenthesis.

Centri3 · 2023-11-03T12:11:50Z

clippy_utils/src/check_proc_macro.rs

@@ -125,6 +121,7 @@ fn qpath_search_pat(path: &QPath<'_>) -> (Pat, Pat) {
 fn expr_search_pat(tcx: TyCtxt<'_>, e: &Expr<'_>) -> (Pat, Pat) {
    match e.kind {
        ExprKind::ConstBlock(_) => (Pat::Str("const"), Pat::Str("}")),
+        // Parenthesis are skipped before the patterns are matched.


This comment doesn't make much sense to me. I recall expressions within ExprKind::Paren retain the parenthesis' span? Can you elaborate on this further? Is this special for Tup?

It's referring to how the search patterns are matched to the source text. It's why the head and tail patterns for an empty tuple appear flipped.

I think I understand now. Can you update this comment then? Perhaps:

// Parentheses are skipped before the patterns are matched. With a non-empty tuple, the head/tail pattern will be the first/last expression - with an empty tuple, there are no expressions, so using the next/previous token will flip the parentheses

(If that's why anyway.)

This is ready after

flip1995 · 2023-11-09T15:26:36Z

Today is backport day. This PR isn't merged yet. What's the motivation behind backporting this? If this is only for performance improvements, I'd rather not backport it.

Jarcho · 2023-11-09T15:31:37Z

The first commit has an ICE fix.

flip1995 · 2023-11-09T16:08:51Z

As this is not merged yet, I'll include this backport in the next release cycle.

bors · 2023-11-10T18:25:35Z

☔ The latest upstream changes (presumably #11750) made this pull request unmergeable. Please resolve the merge conflicts.

dswij · 2023-12-11T07:48:46Z

@bors r+

bors · 2023-12-11T07:48:49Z

📌 Commit f3f2f17 has been approved by dswij

It is now in the queue for this repository.

bors · 2023-12-11T07:49:56Z

⌛ Testing commit f3f2f17 with merge 3813a7b...

bors · 2023-12-11T07:59:28Z

☀️ Test successful - checks-action_dev_test, checks-action_remark_test, checks-action_test
Approved by: dswij
Pushing 3813a7b to master...

flip1995 · 2023-12-21T14:18:14Z

The first commit is already contained in the Rust upstream beta branch.

flip1995 · 2023-12-21T14:22:05Z

Nvm, beta was apparently branched 1 day earlier than usual. I'll try to figure out how to backport those PRs anyway.

…troalbini [beta] Clippy beta backport PR towards stable, as beta was branched a day early and I missed the notification. - rust-lang/rust-clippy#11538 - rust-lang/rust-clippy#11756 - rust-lang/rust-clippy#11760 - rust-lang/rust-clippy#11953 r? `@pietroalbini`

rustbot assigned dswij Sep 19, 2023

rustbot added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties label Sep 19, 2023

Jarcho force-pushed the proc_mac branch from c99adbc to 36673b3 Compare September 20, 2023 08:41

rustbot assigned Centri3 and unassigned dswij Oct 6, 2023

blyxyas added the beta-nominated Nominated for backporting to the compiler in the beta channel. label Oct 7, 2023

Jarcho force-pushed the proc_mac branch from 36673b3 to 417ef7d Compare November 2, 2023 10:28

Centri3 approved these changes Nov 3, 2023

View reviewed changes

Jarcho force-pushed the proc_mac branch from 417ef7d to f4670a5 Compare November 5, 2023 10:32

Jarcho force-pushed the proc_mac branch from f4670a5 to bb4bbff Compare December 10, 2023 20:14

Jarcho added 2 commits December 10, 2023 15:36

Fix is_from_proc_macro patterns

184845f

Delay several is_from_proc_macro checks

f3f2f17

Jarcho force-pushed the proc_mac branch from bb4bbff to f3f2f17 Compare December 10, 2023 20:36

dswij approved these changes Dec 11, 2023

View reviewed changes

bors merged commit 3813a7b into rust-lang:master Dec 11, 2023
5 checks passed

flip1995 added beta-nominated Nominated for backporting to the compiler in the beta channel. and removed beta-nominated Nominated for backporting to the compiler in the beta channel. labels Dec 21, 2023

flip1995 mentioned this pull request Dec 21, 2023

[beta] Clippy beta backport rust-lang/rust#119188

Merged

flip1995 added beta-accepted Accepted for backporting to the compiler in the beta channel. and removed beta-nominated Nominated for backporting to the compiler in the beta channel. labels Jan 4, 2024

xFrednet removed the beta-accepted Accepted for backporting to the compiler in the beta channel. label Mar 18, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix `is_from_proc_macro` patterns #11538

Fix `is_from_proc_macro` patterns #11538

Jarcho commented Sep 19, 2023

rustbot commented Sep 19, 2023

GuillaumeGomez commented Oct 6, 2023

blyxyas commented Oct 14, 2023

Jarcho commented Oct 14, 2023

Jarcho commented Nov 2, 2023

bors commented Nov 2, 2023

Centri3 left a comment

Centri3 Nov 3, 2023

Jarcho Nov 3, 2023

Centri3 Nov 14, 2023 •

edited

Loading

flip1995 commented Nov 9, 2023

Jarcho commented Nov 9, 2023

flip1995 commented Nov 9, 2023

bors commented Nov 10, 2023

dswij commented Dec 11, 2023

bors commented Dec 11, 2023

bors commented Dec 11, 2023

bors commented Dec 11, 2023

flip1995 commented Dec 21, 2023

flip1995 commented Dec 21, 2023

Fix is_from_proc_macro patterns #11538

Fix is_from_proc_macro patterns #11538

Conversation

Jarcho commented Sep 19, 2023

rustbot commented Sep 19, 2023

GuillaumeGomez commented Oct 6, 2023

blyxyas commented Oct 14, 2023

Jarcho commented Oct 14, 2023

Jarcho commented Nov 2, 2023

bors commented Nov 2, 2023

Centri3 left a comment

Choose a reason for hiding this comment

Centri3 Nov 3, 2023

Choose a reason for hiding this comment

Jarcho Nov 3, 2023

Choose a reason for hiding this comment

Centri3 Nov 14, 2023 • edited Loading

Choose a reason for hiding this comment

flip1995 commented Nov 9, 2023

Jarcho commented Nov 9, 2023

flip1995 commented Nov 9, 2023

bors commented Nov 10, 2023

dswij commented Dec 11, 2023

bors commented Dec 11, 2023

bors commented Dec 11, 2023

bors commented Dec 11, 2023

flip1995 commented Dec 21, 2023

flip1995 commented Dec 21, 2023

Fix `is_from_proc_macro` patterns #11538

Fix `is_from_proc_macro` patterns #11538

Centri3 Nov 14, 2023 •

edited

Loading