Show note where the macro failed to match #103439

Noratrieb · 2022-10-23T15:11:22Z

When feeding the wrong tokens, it used to fail with a very generic error that wasn't very helpful. This change tries to help by noting where specifically the matching went wrong.

macro_rules! uwu {
    (a a a b) => {};
}
uwu! { a a a c }

error: no rules expected the token `c`
 --> macros.rs:5:14
  |
1 | macro_rules! uwu {
  | ---------------- when calling this macro
...
4 | uwu! { a a a c }
  |              ^ no rules expected this token in macro call
  |
+note: while trying to match `b`
+ --> macros.rs:2:12
+  |
+2 |     (a a a b) => {};
+  |            ^

rust-highfive · 2022-10-23T15:11:25Z

r? @lcnr

(rust-highfive has picked a reviewer for you, use r? to override)

Dylan-DPC · 2022-10-23T15:31:51Z

@bors try @rust-timer queue

rust-timer · 2022-10-23T15:31:52Z

Awaiting bors try build completion.

@rustbot label: +S-waiting-on-perf

bors · 2022-10-23T15:31:59Z

⌛ Trying commit 03254db9f4cfd213bb6ba05fa435097b51aabe89 with merge 1b60c6801809977dd5201067b34e8f2ffb884eb0...

bors · 2022-10-23T17:32:03Z

☀️ Try build successful - checks-actions
Build commit: 1b60c6801809977dd5201067b34e8f2ffb884eb0 (1b60c6801809977dd5201067b34e8f2ffb884eb0)

rust-timer · 2022-10-23T17:32:05Z

Queued 1b60c6801809977dd5201067b34e8f2ffb884eb0 with parent 9be2f35, future comparison URL.

rust-timer · 2022-10-23T18:49:19Z

Finished benchmarking commit (1b60c6801809977dd5201067b34e8f2ffb884eb0): comparison URL.

Overall result: ❌ regressions - ACTION NEEDED

Benchmarking this pull request likely means that it is perf-sensitive, so we're automatically marking it as not fit for rolling up. While you can manually mark this PR as fit for rollup, we strongly recommend not doing so since this PR may lead to changes in compiler perf.

Next Steps: If you can justify the regressions found in this try perf run, please indicate this with @rustbot label: +perf-regression-triaged along with sufficient written justification. If you cannot justify the regressions please fix the regressions and do another perf run. If the next run shows neutral or positive results, the label will be automatically removed.

@bors rollup=never
@rustbot label: +S-waiting-on-review -S-waiting-on-perf +perf-regression

Instruction count

This is a highly reliable metric that was used to determine the overall result at the top of this comment.

	mean¹	range	count²
Regressions ❌ (primary)	2.0%	[0.2%, 7.0%]	31
Regressions ❌ (secondary)	2.2%	[0.6%, 4.9%]	18
Improvements ✅ (primary)	-0.6%	[-0.6%, -0.6%]	1
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	1.9%	[-0.6%, 7.0%]	32

Max RSS (memory usage)

Results

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

	mean¹	range	count²
Regressions ❌ (primary)	-	-	0
Regressions ❌ (secondary)	-	-	0
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-5.0%	[-5.0%, -5.0%]	1
All ❌✅ (primary)	-	-	0

Cycles

Results

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

	mean¹	range	count²
Regressions ❌ (primary)	4.4%	[2.1%, 6.4%]	8
Regressions ❌ (secondary)	3.3%	[2.1%, 5.1%]	10
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	4.4%	[2.1%, 6.4%]	8

the arithmetic mean of the percent change ↩ ↩² ↩³
number of relevant changes ↩ ↩² ↩³

Noratrieb · 2022-10-23T18:50:53Z

Yes, as expected, the naive implementation is a regression as this path is very hot. I'll reimplement the diagnostic in a different way that keeps all new code in the cold diagnostics path.

src/test/ui/macros/macro-non-lifetime.stderr

lcnr · 2022-10-24T08:24:05Z

r? compiler

Noratrieb · 2022-10-24T21:13:18Z

this needs some more work and won't be ready for review for a while

@rustbot author

compiler-errors · 2022-10-27T20:16:22Z

@bors try @rust-timer queue

bors · 2022-11-14T18:21:28Z

📌 Commit a34d1cfde326eec323e61f8701e0fac780b322e2 has been approved by estebank

It is now in the queue for this repository.

Noratrieb · 2022-11-14T18:57:44Z

@estebank oh, I actually wanted to fix a few more diagnostics here before putting it up for review again but I've changed my mind on that, I think merging this is fine as is.. but can you r- it so I at least fix the commit message? :)

compiler-errors · 2022-11-14T18:58:28Z

@bors r-
@rustbot author

yeet

This shows a small note on what the macro matcher was currently processing to aid with "no rules expected the token X" errors.

Noratrieb · 2022-11-14T19:04:03Z

So, this should be fine now.
@rustbot ready

compiler-errors · 2022-11-14T19:04:47Z

@bors r=estebank

bors · 2022-11-14T19:04:50Z

📌 Commit 7e7c11c has been approved by estebank

It is now in the queue for this repository.

compiler-errors · 2022-11-14T20:42:59Z

@bors rollup-

Retry failed macro matching for diagnostics When a declarative macro fails to match, retry the matching to collect diagnostic info instead of collecting it on the fly in the hot path. Split out of #103439. You made a bunch of changes to declarative macro matching, so r? `@nnethercote` This change should produce a few small perf wins: rust-lang/rust#103439 (comment)

…iaskrgr Rollup of 9 pull requests Successful merges: - rust-lang#103439 (Show note where the macro failed to match) - rust-lang#103734 (Adjust stabilization version to 1.65.0 for wasi fds) - rust-lang#104148 (Visit attributes of trait impl items during AST validation) - rust-lang#104241 (Move most of unwind's build script to lib.rs) - rust-lang#104258 (Deduce closure signature from a type alias `impl Trait`'s supertraits) - rust-lang#104296 (Walk types more carefully in `ProhibitOpaqueTypes` visitor) - rust-lang#104309 (Slightly improve error message for invalid identifier) - rust-lang#104316 (Simplify suggestions for errors in generators.) - rust-lang#104339 (Add `rustc_deny_explicit_impl`) Failed merges: - rust-lang#103484 (Add `rust` to `let_underscore_lock` example) r? `@ghost` `@rustbot` modify labels: rollup

C0RR1T · 2022-11-15T21:04:13Z

Hyped for this one

Retry failed macro matching for diagnostics When a declarative macro fails to match, retry the matching to collect diagnostic info instead of collecting it on the fly in the hot path. Split out of #103439. You made a bunch of changes to declarative macro matching, so r? `@nnethercote` This change should produce a few small perf wins: rust-lang/rust#103439 (comment)

rust-highfive assigned lcnr Oct 23, 2022

rustbot added the T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. label Oct 23, 2022

rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Oct 23, 2022

rustbot added the S-waiting-on-perf Status: Waiting on a perf run to be completed. label Oct 23, 2022

rustbot added perf-regression Performance regression. and removed S-waiting-on-perf Status: Waiting on a perf run to be completed. labels Oct 23, 2022

jruderman reviewed Oct 24, 2022

View reviewed changes

src/test/ui/macros/macro-non-lifetime.stderr Outdated Show resolved Hide resolved

jruderman mentioned this pull request Oct 24, 2022

Terse diagnostic "unexpected end of macro invocation" when misusing assert_eq! #103238

Open

rust-highfive assigned estebank and unassigned lcnr Oct 24, 2022

rustbot added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Oct 24, 2022

Noratrieb force-pushed the help-me-with-my-macro branch from 03254db to 277bcda Compare October 24, 2022 21:14

This comment has been minimized.

Sign in to view

Noratrieb force-pushed the help-me-with-my-macro branch 4 times, most recently from 5e8600a to a9d7d01 Compare October 27, 2022 20:16

bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Nov 14, 2022

rustbot added the S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. label Nov 14, 2022

bors removed the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Nov 14, 2022

Show a note where a macro failed to match

7e7c11c

This shows a small note on what the macro matcher was currently processing to aid with "no rules expected the token X" errors.

Noratrieb force-pushed the help-me-with-my-macro branch from a34d1cf to 7e7c11c Compare November 14, 2022 19:02

rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Nov 14, 2022

bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Nov 14, 2022

matthiaskrgr mentioned this pull request Nov 15, 2022

Rollup of 9 pull requests #104437

Merged

bors merged commit 1a6ed30 into rust-lang:master Nov 15, 2022

rustbot added this to the 1.67.0 milestone Nov 15, 2022

Noratrieb deleted the help-me-with-my-macro branch November 15, 2022 16:20

Anders429 mentioned this pull request Nov 17, 2022

Overhaul schedule module. Anders429/brood#142

Merged

Noratrieb restored the help-me-with-my-macro branch December 3, 2022 19:44

Noratrieb deleted the help-me-with-my-macro branch December 23, 2022 21:04

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Show note where the macro failed to match #103439

Show note where the macro failed to match #103439

Noratrieb commented Oct 23, 2022 •

edited

Loading

rust-highfive commented Oct 23, 2022

Dylan-DPC commented Oct 23, 2022

rust-timer commented Oct 23, 2022

bors commented Oct 23, 2022

bors commented Oct 23, 2022

rust-timer commented Oct 23, 2022

rust-timer commented Oct 23, 2022

Noratrieb commented Oct 23, 2022

lcnr commented Oct 24, 2022

Noratrieb commented Oct 24, 2022 •

edited

Loading

This comment has been minimized.

compiler-errors commented Oct 27, 2022

bors commented Nov 14, 2022

Noratrieb commented Nov 14, 2022

compiler-errors commented Nov 14, 2022

Noratrieb commented Nov 14, 2022

compiler-errors commented Nov 14, 2022

bors commented Nov 14, 2022

compiler-errors commented Nov 14, 2022

C0RR1T commented Nov 15, 2022

Show note where the macro failed to match #103439

Show note where the macro failed to match #103439

Conversation

Noratrieb commented Oct 23, 2022 • edited Loading

rust-highfive commented Oct 23, 2022

Dylan-DPC commented Oct 23, 2022

rust-timer commented Oct 23, 2022

bors commented Oct 23, 2022

bors commented Oct 23, 2022

rust-timer commented Oct 23, 2022

rust-timer commented Oct 23, 2022

Overall result: ❌ regressions - ACTION NEEDED

Instruction count

Max RSS (memory usage)

Cycles

Footnotes

Noratrieb commented Oct 23, 2022

lcnr commented Oct 24, 2022

Noratrieb commented Oct 24, 2022 • edited Loading

This comment has been minimized.

compiler-errors commented Oct 27, 2022

bors commented Nov 14, 2022

Noratrieb commented Nov 14, 2022

compiler-errors commented Nov 14, 2022

Noratrieb commented Nov 14, 2022

compiler-errors commented Nov 14, 2022

bors commented Nov 14, 2022

compiler-errors commented Nov 14, 2022

C0RR1T commented Nov 15, 2022

Noratrieb commented Oct 23, 2022 •

edited

Loading

Noratrieb commented Oct 24, 2022 •

edited

Loading