Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Make TypeFolder::fold_* return Result #85469

Closed
wants to merge 5 commits into from
Closed

Make TypeFolder::fold_* return Result #85469

wants to merge 5 commits into from

Conversation

LeSeulArtichaut
Copy link
Contributor

Implements rust-lang/compiler-team#432.
This should be easier to review commit by commit.

r? @jackh726 cc @nikomatsakis

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label May 19, 2021
@LeSeulArtichaut LeSeulArtichaut mentioned this pull request May 19, 2021
Closed
3 tasks
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@lqd
Copy link
Member

lqd commented May 19, 2021

@bors try @rust-timer queue

@rust-timer
Copy link
Collaborator

Awaiting bors try build completion.

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

@rustbot rustbot added the S-waiting-on-perf Status: Waiting on a perf run to be completed. label May 19, 2021
@bors
Copy link
Contributor

bors commented May 19, 2021

⌛ Trying commit f2f2eba77b143e5cdee623c25ecc75b3e2739ecf with merge dd302a4b134912d6af2e70defbb3418a9a4f08a7...

@bors
Copy link
Contributor

bors commented May 19, 2021

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

@rust-timer
Copy link
Collaborator

Queued dd302a4b134912d6af2e70defbb3418a9a4f08a7 with parent 3e827cc, future comparison URL.

@rust-log-analyzer

This comment has been minimized.

Sign in to view
@LeSeulArtichaut LeSeulArtichaut mentioned this pull request May 19, 2021
Merged
@rust-timer
Copy link
Collaborator

Finished benchmarking try commit (dd302a4b134912d6af2e70defbb3418a9a4f08a7): comparison url.

Benchmarking this pull request likely means that it is perf-sensitive, so we're automatically marking it as not fit for rolling up. Please note that if the perf results are neutral, you should likely undo the rollup=never given below by specifying rollup- to bors.

Importantly, though, if the results of this run are non-neutral do not roll this PR up -- it will mask other regressions or improvements in the roll up.

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

@rustbot rustbot removed the S-waiting-on-perf Status: Waiting on a perf run to be completed. label May 19, 2021
@LeSeulArtichaut
Copy link
Contributor Author

Interestingly, the results are not neutral. There are a few regressions up to 6.9%, but for most tests this looks like a slight improvement up to -2.5%.

@LeSeulArtichaut LeSeulArtichaut mentioned this pull request May 19, 2021
Closed
@jackh726
Copy link
Member

I think overall I'm 👍 on this. I'm not sure perf is something we can "fix"; it's kind of mixed anyways. Either way, we should wait for the FCP on the MCP should finish.

@nikomatsakis
Copy link
Contributor

It is a slight performance hit. I wonder if we can dig a bit more into why -- feels like an opportunity for us to improve our mir optimizations or something.

@jackh726
Copy link
Member

@bors try @rust-timer queue

@rust-timer
Copy link
Collaborator

Awaiting bors try build completion.

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

@rustbot rustbot added the S-waiting-on-perf Status: Waiting on a perf run to be completed. label May 24, 2021
@bors
Copy link
Contributor

bors commented May 24, 2021

⌛ Trying commit f603ea5bcd5e6ff212609a730f909114de7b2fdd with merge ca44a2dcfa1442a89f4ec1ded3ebef42a4440877...

@bors
Copy link
Contributor

bors commented May 24, 2021

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

@rust-timer
Copy link
Collaborator

Queued ca44a2dcfa1442a89f4ec1ded3ebef42a4440877 with parent 6f69192, future comparison URL.

@rust-timer
Copy link
Collaborator

Finished benchmarking try commit (ca44a2dcfa1442a89f4ec1ded3ebef42a4440877): comparison url.

Benchmarking this pull request likely means that it is perf-sensitive, so we're automatically marking it as not fit for rolling up. Please note that if the perf results are neutral, you should likely undo the rollup=never given below by specifying rollup- to bors.

Importantly, though, if the results of this run are non-neutral do not roll this PR up -- it will mask other regressions or improvements in the roll up.

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

@rustbot rustbot removed the S-waiting-on-perf Status: Waiting on a perf run to be completed. label May 24, 2021
@bors
Copy link
Contributor

bors commented Jun 4, 2021

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

@jackh726
Copy link
Member

I'm 👍 on this PR, except for the perf. @LeSeulArtichaut are you still looking into the perf regression here?

@jackh726 jackh726 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 Jun 24, 2021
@JohnCSimon
Copy link
Member

Ping from triage:
@LeSeulArtichaut - can you please address the merge conflicts?

@bstrie bstrie 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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Jul 28, 2021
@crlf0710 crlf0710 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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Aug 14, 2021
@LeSeulArtichaut LeSeulArtichaut added S-inactive Status: Inactive and waiting on the author. This is often applied to closed PRs. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Aug 25, 2021
@LeSeulArtichaut LeSeulArtichaut deleted the fallible-type-fold branch August 25, 2021 21:55
This was referenced Nov 25, 2021
Merged
Open
bors added a commit to rust-lang-ci/rust that referenced this pull request Nov 28, 2021
@bors
Auto merge of rust-lang#91230 - eggyal:fallible-type-fold, r=jackh726
e6d2de9 
Make `TypeFolder::fold_*` return `Result`

Implements rust-lang/compiler-team#432.

Initially this is just a rebase of `@LeSeulArtichaut's` work in rust-lang#85469 (abandoned; see rust-lang#85485 (comment)).  At that time, it caused a regression in performance that required some further exploration... with this rebased PR bors can hopefully report some perf analysis from which we can investigate further (if the regression is indeed still present).

r? `@jackh726` cc `@nikomatsakis`
bors added a commit to rust-lang/chalk that referenced this pull request Nov 28, 2021
@bors
Auto merge of #709 - LeSeulArtichaut:fallible-folder, r=jackh726
514a60a 
Introduce `Folder::Error`

Equivalent to rust-lang/rust#85469, cc rust-lang/compiler-team#432 rust-lang/types-team#16.

This compiles, but there are implementations of `Folder` that still use `Fallible<T>` instead of `Result<T, Self::Error>`. I can make that change if it is deemed beneficial.

r? `@jackh726`
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@jackh726 jackh726

Labels
S-inactive Status: Inactive and waiting on the author. This is often applied to closed PRs.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.