Skip to content

Use multipart_suggestions more - #86754

Merged
bors merged 1 commit into
rust-lang:masterfrom
estebank:use-multispans-more
Jul 31, 2021
Merged

Use multipart_suggestions more#86754
bors merged 1 commit into
rust-lang:masterfrom
estebank:use-multispans-more

Conversation

@estebank

@estebankestebank commented Jun 30, 2021

Copy link
Copy Markdown
Contributor

Built on top of #86532

@rust-highfive

rust-highfive commented Jun 30, 2021

Copy link
Copy Markdown
Contributor

r? @varkor

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

@rust-highfiverust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jun 30, 2021
@varkor

varkor commented Jun 30, 2021

Copy link
Copy Markdown
Contributor

As much as I'd like to, I'm not going to have time to review a PR of this size for a while (I'm not sure how much of that diff is just error output changes, though, which isn't so bad). If anyone else has time, they're welcome to take this over :)

@estebank

estebank commented Jul 1, 2021

Copy link
Copy Markdown
ContributorAuthor

@varkor no problem! Most of the diff is caused by the parent PR, until that is merged I would ignore this one.

@varkorvarkor added S-blocked Status: Blocked on something else such as an RFC or other implementation work. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jul 17, 2021
@estebank
estebankforce-pushed the use-multispans-more branch from 05d08c6 to ed6537fCompareJuly 17, 2021 22:50
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@estebank
estebankforce-pushed the use-multispans-more branch from ed6537f to 0f20ef4CompareJuly 17, 2021 23:04
@estebank

estebank commented Jul 17, 2021

Copy link
Copy Markdown
ContributorAuthor

@varkor I split out the part that is relevant and it should be relatively quick to review now.

@bors

This comment has been minimized.

Sign in to view
varkor
varkor approved these changes Jul 19, 2021
View reviewed changes

@varkorvarkor left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

r=me after fixing the nits and squashing the last (rebase fixup) commit into the previous commit.

Comment threadcompiler/rustc_typeck/src/check/demand.rs Outdated
Comment threadcompiler/rustc_typeck/src/check/demand.rs Outdated
Comment threadcompiler/rustc_typeck/src/check/demand.rs Outdated
@varkorvarkor added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-blocked Status: Blocked on something else such as an RFC or other implementation work. labels Jul 19, 2021
@estebank
estebankforce-pushed the use-multispans-more branch 2 times, most recently from 8aad39c to 890281dCompareJuly 19, 2021 15:35
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@estebank
estebankforce-pushed the use-multispans-more branch from 890281d to abc1880CompareJuly 19, 2021 15:45
@estebank

estebank commented Jul 19, 2021

Copy link
Copy Markdown
ContributorAuthor

@bors r=varkor

@bors

bors commented Jul 19, 2021

Copy link
Copy Markdown
Collaborator

📌 Commit abc1880be2f32643d0ee39f4d04cbd64b5f8b088 has been approved by varkor

@borsbors 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 19, 2021
@bors

bors commented Jul 20, 2021

Copy link
Copy Markdown
Collaborator

⌛ Testing commit abc1880be2f32643d0ee39f4d04cbd64b5f8b088 with merge deb5dcbb01afa031dab5e8ae9a388d235611ce4f...

@rust-log-analyzer

This comment has been minimized.

Sign in to view
@bors

bors commented Jul 20, 2021

Copy link
Copy Markdown
Collaborator

💔 Test failed - checks-actions

@borsbors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Jul 20, 2021
@estebank
estebankforce-pushed the use-multispans-more branch from abc1880 to 13815bfCompareJuly 21, 2021 20:08
@estebank

estebank commented Jul 21, 2021

Copy link
Copy Markdown
ContributorAuthor

@bors r=varkor

@bors

bors commented Jul 21, 2021

Copy link
Copy Markdown
Collaborator

📌 Commit 13815bf25bbe0971c4426be0df72d156b717419b has been approved by varkor

@borsbors 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 Jul 21, 2021
@bors

bors commented Jul 22, 2021

Copy link
Copy Markdown
Collaborator

⌛ Testing commit 13815bf25bbe0971c4426be0df72d156b717419b with merge a67334f083d40f5a739708c06b821695dfded0d3...

@rust-log-analyzer

This comment has been minimized.

Sign in to view
@bors

bors commented Jul 22, 2021

Copy link
Copy Markdown
Collaborator

💔 Test failed - checks-actions

@borsbors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Jul 22, 2021
@petrochenkovpetrochenkov mentioned this pull request Jul 23, 2021
Merged
@estebank
Use multispan suggestions more often
0b8f192
* Use more accurate span for `async move` suggestion
* Use more accurate span for deref suggestion
* Use `multipart_suggestion` more often
@estebank
estebankforce-pushed the use-multispans-more branch from 13815bf to 0b8f192CompareJuly 30, 2021 16:26
@estebank

estebank commented Jul 30, 2021

Copy link
Copy Markdown
ContributorAuthor

@bors r=varkor

@bors

bors commented Jul 30, 2021

Copy link
Copy Markdown
Collaborator

📌 Commit 0b8f192 has been approved by varkor

@borsbors 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 Jul 30, 2021
@bors

bors commented Jul 30, 2021

Copy link
Copy Markdown
Collaborator

⌛ Testing commit 0b8f192 with merge 199d1ae...

@bors

bors commented Jul 31, 2021

Copy link
Copy Markdown
Collaborator

☀️ Test successful - checks-actions
Approved by: varkor
Pushing 199d1ae to master...

@borsbors added the merged-by-bors This PR was explicitly merged by bors. label Jul 31, 2021
@bors
bors merged commit 199d1ae into rust-lang:masterJul 31, 2021
@rustbotrustbot added this to the 1.56.0 milestone Jul 31, 2021
This was referenced Jul 31, 2021
Merged
Closed
Merged
flip1995 pushed a commit to flip1995/rust that referenced this pull request Aug 12, 2021
@bors
Auto merge ofrust-lang#86754- estebank:use-multispans-more, r=varkor
c9e45e4
Use `multipart_suggestions` more
Built on top of rust-lang#86532
@estebank
estebank deleted the use-multispans-more branch November 9, 2023 05:15
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

1 more reviewer
@varkorvarkorvarkor approved these changes
Reviewers whose approvals may not affect merge requirements

Assignees

@varkorvarkor

Labels

merged-by-borsThis PR was explicitly merged by bors.S-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.

Projects

None yet

Milestone

1.56.0

Development

Successfully merging this pull request may close these issues.

6 participants

@estebank@rust-highfive@varkor@rust-log-analyzer@bors@rustbot