Simplify `hir::PathSegment` by nnethercote · Pull Request #101228 · rust-lang/rust

nnethercote · 2022-08-31T09:12:25Z

r? @petrochenkov

rustbot · 2022-08-31T09:12:29Z

Some changes occurred in need_type_info.rs

cc @lcnr

Some changes occurred in src/tools/clippy

cc @rust-lang/clippy

nnethercote · 2022-08-31T09:13:32Z

Best reviewed one commit at a time.

I'm not sure if removing the Options is a good idea or not. But I did measurements and found that over 90% of PathSegments had both the hir_id and the res, so it seems like they might as well be mandatory. Let me know what you think.

petrochenkov · 2022-08-31T16:38:50Z

I think it's a good idea, since these IDs and resolutions are already actively used by lints and similar, it's better to make sure that they are always set.

nnethercote · 2022-08-31T22:46:59Z

I have addressed the review comments.

petrochenkov · 2022-08-31T22:47:26Z

@bors r+

bors · 2022-08-31T22:47:28Z

📌 Commit 11020f1 has been approved by petrochenkov

It is now in the queue for this repository.

…nt, r=petrochenkov Simplify `hir::PathSegment` r? `@petrochenkov`

Dylan-DPC · 2022-09-02T09:02:32Z

failed in rollup

@bors r-

To make the spacing consistent. Also shorten an overly long comment line.

nnethercote · 2022-09-05T04:27:03Z

I fixed the rollup failure.

nnethercote · 2022-09-05T04:27:15Z

@bors r=petrochenkov

bors · 2022-09-05T04:27:17Z

📌 Commit 08a00eb has been approved by petrochenkov

It is now in the queue for this repository.

bors · 2022-09-05T13:36:57Z

⌛ Testing commit 08a00eb with merge 2dc703f...

bors · 2022-09-05T16:18:02Z

☀️ Test successful - checks-actions
Approved by: petrochenkov
Pushing 2dc703f to master...

rust-timer · 2022-09-06T03:09:44Z

Finished benchmarking commit (2dc703f): 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.7%	[0.3%, 1.3%]	16
Regressions ❌ (secondary)	1.3%	[0.9%, 1.8%]	14
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	0.7%	[0.3%, 1.3%]	16

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

Cycles

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

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

nnethercote · 2022-09-06T03:56:02Z

Weird regressions here. I did some downloads and diffs with Cachegrind. The tt-muncher and html5ever-0.26.0 ones are due to changes in parse_tt, which this PR didn't touch, but which is hot and I think somewhat prone to perturbations due to minor changes. The keccak one is due to process_obligations, which is also hot and prone to perturbations. And I didn't expect the changes in this PR to have much effect, it really wasn't changing things much.

nnethercote · 2022-09-06T12:13:33Z

Some evidence here that these apparent regressions weren't real.

nnethercote · 2022-09-06T12:15:32Z

@rustbot label: +perf-regression-triaged

…, r=petrochenkov Simplify `hir::PathSegment` r? `@petrochenkov`

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 Aug 31, 2022

rust-highfive assigned petrochenkov Aug 31, 2022

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

petrochenkov reviewed Aug 31, 2022
View reviewed changes

Comment threadcompiler/rustc_hir/src/hir.rs
Comment threadcompiler/rustc_hir/src/hir.rs Outdated

petrochenkov 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 Aug 31, 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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Aug 31, 2022

Dylan-DPC added a commit to Dylan-DPC/rust that referenced this pull request Sep 2, 2022
Rollup merge ofrust-lang#101228- nnethercote:simplify-hir-PathSegme…
a246df3
…nt, r=petrochenkov Simplify `hir::PathSegment` r? `@petrochenkov`

Dylan-DPC mentioned this pull request Sep 2, 2022
Rollup of 9 pull requests #101314
Closed

bors 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-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Sep 2, 2022

nnethercote added 5 commits September 5, 2022 14:20

Add some blank lines to the definition of Res.
49b9057
To make the spacing consistent. Also shorten an overly long comment line.

Remove dead code from print_generic_args.
ee244bf

Make hir::PathSegment::res non-optional.
6d850d9

Make hir::PathSegment::hir_id non-optional.
bb0ae3c

Address review comments.
08a00eb

nnethercote force-pushed the simplify-hir-PathSegment branch from 11020f1 to 08a00ebCompare September 5, 2022 04:25

bors removed the S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. label Sep 5, 2022

bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Sep 5, 2022

bors added the merged-by-bors This PR was explicitly merged by bors. label Sep 5, 2022

bors merged commit 2dc703f into rust-lang:masterSep 5, 2022

rustbot added this to the 1.65.0 milestone Sep 5, 2022

nnethercote deleted the simplify-hir-PathSegment branch September 5, 2022 23:00

rustbot added the perf-regression Performance regression. label Sep 6, 2022

nnethercote mentioned this pull request Sep 6, 2022
Rollup of 7 pull requests #101464
Merged

rustbot added the perf-regression-triaged The performance regression has been triaged. label Sep 6, 2022

matthiaskrgr mentioned this pull request Sep 6, 2022
regression: hang with -Zsave-analysis #101505
Closed

flip1995 pushed a commit to flip1995/rust that referenced this pull request Sep 9, 2022
Auto merge ofrust-lang#101228- nnethercote:simplify-hir-PathSegment…
5ea9977
…, r=petrochenkov Simplify `hir::PathSegment` r? `@petrochenkov`

petrochenkov mentioned this pull request Sep 11, 2022
Avoid infinite recursion on error case in get_path_res. #101513
Closed

Uh oh!

Uh oh!

Conversation

nnethercote commented Aug 31, 2022

Uh oh!

rustbot commented Aug 31, 2022

Uh oh!

nnethercote commented Aug 31, 2022

Uh oh!

petrochenkov commented Aug 31, 2022

Uh oh!

Uh oh!

Uh oh!

nnethercote commented Aug 31, 2022

Uh oh!

petrochenkov commented Aug 31, 2022

Uh oh!

bors commented Aug 31, 2022

Uh oh!

Dylan-DPC commented Sep 2, 2022

Uh oh!

nnethercote commented Sep 5, 2022

Uh oh!

nnethercote commented Sep 5, 2022

Uh oh!

bors commented Sep 5, 2022

Uh oh!

bors commented Sep 5, 2022

Uh oh!

bors commented Sep 5, 2022

Uh oh!

rust-timer commented Sep 6, 2022

Overall result: ❌ regressions - ACTION NEEDED

Instruction count

Max RSS (memory usage)

Cycles

Footnotes

Uh oh!

nnethercote commented Sep 6, 2022

Uh oh!

nnethercote commented Sep 6, 2022

Uh oh!

nnethercote commented Sep 6, 2022

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

7 participants