Eat close paren if capture_cfg to avoid unbalanced parens

[mu001999]

Fixes #116781

[rustbot]

r? @b-naber

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

[b-naber]

I'm not familiar enough with the code to review this.

r? @petrochenkov

[petrochenkov]

Ok, looks like eat_to_tokens does the right thing with regards to nested token trees (treats them as whole and doesn't search for , and ) in them), so this should be good to go if the snapshotting doesn't slow the parser down.

@bors try @rust-timer queue

[bors]

⌛ Trying commit fe00cfe with merge 1299bd1...

[bors]

☀️ Try build successful - checks-actions
Build commit: 1299bd1 (1299bd1f8d76657112d92bb1f57768a5df86dfba)

[rust-timer]

Finished benchmarking commit (1299bd1): 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)	0.2%	[0.2%, 0.2%]	5
Regressions ❌ (secondary)	0.7%	[0.4%, 1.0%]	9
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	0.2%	[0.2%, 0.2%]	5

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.7%	[-0.7%, -0.7%]	1
Improvements ✅ (secondary)	-2.2%	[-3.5%, -1.1%]	3
All ❌✅ (primary)	-0.7%	[-0.7%, -0.7%]	1

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

Binary size

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

Bootstrap: 637.324s -> 639.747s (0.38%)
Artifact size: 304.41 MiB -> 304.41 MiB (-0.00%)

[petrochenkov]

This is indeed a slight perf regression for benchmarks with large number of function parameters, like externs with 3000 function definitions.

[petrochenkov]

I think it's fine to merge it.
@bors r+

@mu001999
It would be good to provide a faster version of the "eat tokens until all delimiters are balanced" operation, if you are interested.
For that I think it would be enough to save some parts of token_cursor instead of the whole parser like in create_snapshot_for_diagnostic.

[bors]

📌 Commit fe00cfe has been approved by petrochenkov

It is now in the queue for this repository.

[mu001999]

It would be good to provide a faster version of the "eat tokens until all delimiters are balanced" operation, if you are interested.

For that I think it would be enough to save some parts of token_cursor instead of the whole parser like in create_snapshot_for_diagnostic.

Sure! I'd like to try this.

[bors]

⌛ Testing commit fe00cfe with merge 88ae8c9...

[bors]

☀️ Test successful - checks-actions
Approved by: petrochenkov
Pushing 88ae8c9 to master...

[rust-timer]

Finished benchmarking commit (88ae8c9): comparison URL.

Overall result: ❌ regressions - ACTION NEEDED

Next Steps: If you can justify the regressions found in this perf run, please indicate this with @rustbot label: +perf-regression-triaged along with sufficient written justification. If you cannot justify the regressions please open an issue or create a new PR that fixes the regressions, add a comment linking to the newly created issue or PR, and then add the perf-regression-triaged label to this PR.

@rustbot label: +perf-regression
cc @rust-lang/wg-compiler-performance

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.2%	[0.1%, 0.2%]	6
Regressions ❌ (secondary)	0.6%	[0.4%, 0.9%]	9
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	0.2%	[0.1%, 0.2%]	6

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)	3.3%	[3.3%, 3.3%]	1
Regressions ❌ (secondary)	-	-	0
Improvements ✅ (primary)	-1.8%	[-1.8%, -1.8%]	1
Improvements ✅ (secondary)	-3.1%	[-4.6%, -1.6%]	2
All ❌✅ (primary)	0.8%	[-1.8%, 3.3%]	2

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

Binary size

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

Bootstrap: 633.735s -> 636.145s (0.38%)
Artifact size: 304.43 MiB -> 304.44 MiB (0.00%)