Shorten def_span of closures to just their header #98482

cjgillot · 2022-06-25T09:26:36Z

Continuation of #93967.

rust-highfive · 2022-06-25T09:26:39Z

Some changes occurred in src/tools/clippy.

cc @rust-lang/clippy

rust-highfive · 2022-06-25T09:26:41Z

r? @estebank

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

estebank · 2022-06-26T23:53:10Z

src/test/ui/associated-types/impl-wf-cycle-1.stderr

-LL | / impl<T: Grault> Grault for (T,)
-LL | | where
-LL | |     Self::A: Baz,
-LL | |     Self::B: Fiz,
-...  |
-LL | |
-LL | | }
-   | |_^


Interestingly, we should probably point at the first where clause in this error as the primary span, but that's out of scope.

estebank · 2022-06-26T23:54:34Z

compiler/rustc_middle/src/hir/map/mod.rs

+                span: outer_span,
+                ..
+            }) => {
+                let end = if let Some(b) = bounds.last() { b.span() } else { generics.span };


Whould we also account for the where clause here when appropriate? (I think that type is the only case where you wouldn't want to due to syntactical ordering.)

src/test/ui/borrowck/mutability-errors.stderr

estebank

r=me after rebasing and optionally addressing the regression in E0596 (or filing a follow up ticket). Make it rollup=never.

bors · 2022-06-28T07:09:59Z

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

rustbot · 2022-06-28T19:55:48Z

Some changes occurred in src/tools/clippy

cc @rust-lang/clippy

estebank · 2022-06-28T21:20:58Z

@bors r+ rollup=never

bors · 2022-06-28T21:21:01Z

📌 Commit 6be9f059cbb3a8ed350ba66b5392c028f875acef has been approved by estebank

bors · 2022-06-29T03:01:54Z

⌛ Testing commit 6be9f059cbb3a8ed350ba66b5392c028f875acef with merge bd86f533a02ad2bd48343719b946f7dd70a56f28...

bors · 2022-06-29T03:22:41Z

💔 Test failed - checks-actions

cjgillot · 2022-07-07T13:57:57Z

@bors r=estebank

bors · 2022-07-07T13:58:02Z

📌 Commit d43fa93 has been approved by estebank

It is now in the queue for this repository.

bors · 2022-07-08T03:05:18Z

⌛ Testing commit d43fa93 with merge eba361a...

bors · 2022-07-08T05:46:03Z

☀️ Test successful - checks-actions
Approved by: estebank
Pushing eba361a to master...

rust-timer · 2022-07-08T10:51:03Z

Finished benchmarking commit (eba361a): comparison url.

Instruction count

Primary benchmarks: 😿 relevant regression found
Secondary benchmarks: 😿 relevant regressions found

	mean¹	max	count²
Regressions 😿 (primary)	0.7%	0.7%	1
Regressions 😿 (secondary)	1.6%	2.4%	9
Improvements 🎉 (primary)	N/A	N/A	0
Improvements 🎉 (secondary)	N/A	N/A	0
All 😿🎉 (primary)	0.7%	0.7%	1

Max RSS (memory usage)

Results

Primary benchmarks: 😿 relevant regressions found
Secondary benchmarks: 🎉 relevant improvement found

	mean¹	max	count²
Regressions 😿 (primary)	1.3%	2.4%	2
Regressions 😿 (secondary)	N/A	N/A	0
Improvements 🎉 (primary)	N/A	N/A	0
Improvements 🎉 (secondary)	-1.0%	-1.0%	1
All 😿🎉 (primary)	1.3%	2.4%	2

Cycles

Results

Primary benchmarks: 😿 relevant regression found
Secondary benchmarks: 😿 relevant regressions found

	mean¹	max	count²
Regressions 😿 (primary)	2.9%	2.9%	1
Regressions 😿 (secondary)	3.2%	3.7%	5
Improvements 🎉 (primary)	N/A	N/A	0
Improvements 🎉 (secondary)	N/A	N/A	0
All 😿🎉 (primary)	2.9%	2.9%	1

If you disagree with this performance assessment, please file an issue in rust-lang/rustc-perf.

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

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

cjgillot · 2022-07-11T09:36:20Z

The regression is mostly in tt-muncher case. From the detailed view, it would be in expand_crate. I don't see how a change in error-reporting span can cause such a performance change.

Mark-Simulacrum · 2022-07-12T13:03:20Z

tt-muncher has been noisy lately, so dropping the regression label; this delta is within that noise bound.

…=estebank Shorten def_span of closures to just their header Continuation of rust-lang#93967.

rust-highfive assigned estebank Jun 25, 2022

rustbot added T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. labels Jun 25, 2022

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

This comment has been minimized.

Sign in to view

This comment was marked as outdated.

Sign in to view

cjgillot force-pushed the short-struct-span-closure branch from dc11e8f to 4fab055 Compare June 26, 2022 11:14

This comment has been minimized.

Sign in to view

cjgillot force-pushed the short-struct-span-closure branch from 4fab055 to 985c8a8 Compare June 26, 2022 11:34

This comment has been minimized.

Sign in to view

This comment was marked as outdated.

Sign in to view

estebank reviewed Jun 26, 2022

View reviewed changes

src/test/ui/borrowck/mutability-errors.stderr Outdated Show resolved Hide resolved

estebank approved these changes Jun 26, 2022

View reviewed changes

cjgillot force-pushed the short-struct-span-closure branch from 55a498f to 4dd3d6d Compare June 27, 2022 19:02

This comment has been minimized.

Sign in to view

cjgillot force-pushed the short-struct-span-closure branch from 4dd3d6d to 6784137 Compare June 28, 2022 19:55

cjgillot force-pushed the short-struct-span-closure branch from 6784137 to 6be9f05 Compare June 28, 2022 19:59

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 Jun 28, 2022

cjgillot added 3 commits July 7, 2022 09:27

Bless aarch64 test.

d64b976

Bless MSVC debuginfo.

40530ca

Bless coverage reports.

d43fa93

cjgillot force-pushed the short-struct-span-closure branch from de0339e to d43fa93 Compare July 7, 2022 07:28

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 Jul 7, 2022

bors added the merged-by-bors This PR was explicitly merged by bors. label Jul 8, 2022

bors merged commit eba361a into rust-lang:master Jul 8, 2022

rustbot added this to the 1.64.0 milestone Jul 8, 2022

rustbot added the perf-regression Performance regression. label Jul 8, 2022

cjgillot deleted the short-struct-span-closure branch July 11, 2022 09:36

Mark-Simulacrum removed the perf-regression Performance regression. label Jul 12, 2022

flip1995 pushed a commit to flip1995/rust that referenced this pull request Jul 18, 2022

Auto merge of rust-lang#98482 - cjgillot:short-struct-span-closure, r…

bee9da1

…=estebank Shorten def_span of closures to just their header Continuation of rust-lang#93967.

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Shorten def_span of closures to just their header #98482

Shorten def_span of closures to just their header #98482

cjgillot commented Jun 25, 2022

rust-highfive commented Jun 25, 2022

rust-highfive commented Jun 25, 2022

This comment has been minimized.

This comment was marked as outdated.

This comment has been minimized.

This comment has been minimized.

This comment was marked as outdated.

estebank Jun 26, 2022

estebank Jun 26, 2022

estebank left a comment

This comment has been minimized.

bors commented Jun 28, 2022

rustbot commented Jun 28, 2022

estebank commented Jun 28, 2022

bors commented Jun 28, 2022

bors commented Jun 29, 2022

bors commented Jun 29, 2022

cjgillot commented Jul 7, 2022

bors commented Jul 7, 2022

bors commented Jul 8, 2022

bors commented Jul 8, 2022

rust-timer commented Jul 8, 2022

cjgillot commented Jul 11, 2022

Mark-Simulacrum commented Jul 12, 2022

Shorten def_span of closures to just their header #98482

Shorten def_span of closures to just their header #98482

Conversation

cjgillot commented Jun 25, 2022

rust-highfive commented Jun 25, 2022

rust-highfive commented Jun 25, 2022

This comment has been minimized.

This comment was marked as outdated.

This comment has been minimized.

This comment has been minimized.

This comment was marked as outdated.

estebank Jun 26, 2022

Choose a reason for hiding this comment

estebank Jun 26, 2022

Choose a reason for hiding this comment

estebank left a comment

Choose a reason for hiding this comment

This comment has been minimized.

bors commented Jun 28, 2022

rustbot commented Jun 28, 2022

estebank commented Jun 28, 2022

bors commented Jun 28, 2022

bors commented Jun 29, 2022

bors commented Jun 29, 2022

cjgillot commented Jul 7, 2022

bors commented Jul 7, 2022

bors commented Jul 8, 2022

bors commented Jul 8, 2022

rust-timer commented Jul 8, 2022

Instruction count

Max RSS (memory usage)

Cycles

Footnotes

cjgillot commented Jul 11, 2022

Mark-Simulacrum commented Jul 12, 2022