Improve error message: missing ; in macro_rules

[mu001999]

Fixes #124968

[rustbot]

r? @fee1-dead

rustbot has assigned @fee1-dead.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

[Nilstrieb]

this code is very perf sensitive, so let's check
@bors try @rust-timer queue
If perf is OK I'd like you to refactor the code a bit to make this Option<Token> clearer, but let's check it first.

[bors]

⌛ Trying commit 26f0246 with merge 7af9416...

[bors]

☀️ Try build successful - checks-actions
Build commit: 7af9416 (7af9416f7e94983731941e40d1c092347b074419)

[rust-timer]

Finished benchmarking commit (7af9416): 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-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)	1.7%	[0.2%, 4.4%]	21
Regressions ❌ (secondary)	1.0%	[0.4%, 1.8%]	13
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	1.7%	[0.2%, 4.4%]	21

Max RSS (memory usage)

Results (primary 2.3%)

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)	2.3%	[2.3%, 2.3%]	1
Regressions ❌ (secondary)	-	-	0
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	2.3%	[2.3%, 2.3%]	1

Cycles

Results (primary 3.6%, secondary 3.3%)

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)	3.6%	[0.8%, 7.6%]	13
Regressions ❌ (secondary)	3.3%	[2.0%, 4.7%]	9
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	3.6%	[0.8%, 7.6%]	13

Binary size

This benchmark run did not return any relevant results for this metric.

Bootstrap: 679.603s -> 680.293s (0.10%)
Artifact size: 316.12 MiB -> 316.16 MiB (0.01%)

[mu001999]

@Nilstrieb How about the result? Looks like this change slows down Rustc a bit.

[Nilstrieb]

yeah, that's too much. i very much like the improvement, but you need to try to figure out a faster way. maybe you can make use of the trait abstraction, where you try to avoid all work for the no-op tracker

[Nilstrieb]

I've written that abstraction and logic myself, so if you have questions feel free to ask

[mu001999]

@Nilstrieb thanks! I will try it ;)

[mu001999]

I don't know if I have access but
@bors try @rust-timer queue

[bors]

@mu001999: 🔑 Insufficient privileges: not in try users

[Nilstrieb]

@bors try @rust-timer queue

[bors]

⌛ Trying commit 9081a66 with merge 7308417...

[bors]

☀️ Try build successful - checks-actions
Build commit: 7308417 (7308417b77b10ac9dcee77ce6b5174c7284cabe4)

[rust-timer]

Finished benchmarking commit (7308417): comparison URL.

Overall result: ✅ improvements - no 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.

@bors rollup=never
@rustbot label: -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)	-	-	0
Regressions ❌ (secondary)	-	-	0
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-0.3%	[-0.3%, -0.3%]	2
All ❌✅ (primary)	-	-	0

Max RSS (memory usage)

Results (primary 2.5%)

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.1%	[1.2%, 6.9%]	2
Regressions ❌ (secondary)	-	-	0
Improvements ✅ (primary)	-0.6%	[-0.6%, -0.6%]	1
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	2.5%	[-0.6%, 6.9%]	3

Cycles

Results (primary 0.7%, secondary 1.4%)

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)	2.4%	[2.2%, 2.7%]	2
Regressions ❌ (secondary)	3.6%	[2.2%, 5.0%]	6
Improvements ✅ (primary)	-1.1%	[-1.1%, -1.1%]	2
Improvements ✅ (secondary)	-2.0%	[-2.4%, -1.7%]	4
All ❌✅ (primary)	0.7%	[-1.1%, 2.7%]	4

Binary size

This benchmark run did not return any relevant results for this metric.

Bootstrap: 670.875s -> 671.044s (0.03%)
Artifact size: 315.99 MiB -> 316.20 MiB (0.07%)

[mu001999]

@Nilstrieb The new result looks good! How do you think of this new change? Should I refactor the code?

[Nilstrieb]

very cool. I skimmed the code and it looks okay, I will review it later.

[fee1-dead]

LGTM, thanks!

[fee1-dead]

@bors r+

[bors]

📌 Commit c2be134 has been approved by fee1-dead

It is now in the queue for this repository.

[bors]

⌛ Testing commit c2be134 with merge 685a80f...

[bors]

☀️ Test successful - checks-actions
Approved by: fee1-dead
Pushing 685a80f to master...

[rust-timer]

Finished benchmarking commit (685a80f): comparison URL.

Overall result: no relevant changes - no action needed

@rustbot label: -perf-regression

Instruction count

This benchmark run did not return any relevant results for this metric.

Max RSS (memory usage)

This benchmark run did not return any relevant results for this metric.

Cycles

Results (primary 4.6%)

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.6%	[4.6%, 4.6%]	1
Regressions ❌ (secondary)	-	-	0
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	4.6%	[4.6%, 4.6%]	1

Binary size

This benchmark run did not return any relevant results for this metric.

Bootstrap: 668.952s -> 669.005s (0.01%)
Artifact size: 316.33 MiB -> 316.23 MiB (-0.03%)