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

Use structured suggestion when requiring Copy constraint in type param #66567

Merged
merged 3 commits into from
Nov 29, 2019
Merged

Use structured suggestion when requiring Copy constraint in type param #66567

merged 3 commits into from
Nov 29, 2019

Conversation

estebank
Copy link
Contributor

No description provided.

@rust-highfive
Copy link
Collaborator

r? @eddyb

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

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Nov 20, 2019
@estebank
Copy link
Contributor Author

r? @Centril

@rust-highfive rust-highfive assigned Centril and unassigned eddyb Nov 20, 2019
Centril
Centril reviewed Nov 20, 2019
View reviewed changes
src/librustc/hir/mod.rs Outdated Show resolved Hide resolved
@Centril Centril 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 Nov 20, 2019
@JohnCSimon
Copy link
Member

Ping from triage:
@estebank Can you please address the comment above?

@estebank estebank added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Nov 24, 2019
@rust-highfive

This comment has been minimized.

Sign in to view
@Centril
Copy link
Contributor

Centril commented Nov 26, 2019

@bors r+

@bors
Copy link
Contributor

bors commented Nov 26, 2019

📌 Commit 5dd5dea943bec65e19067e3ee85d0cbb9a0d9968 has been approved by Centril

@bors 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 Nov 26, 2019
@estebank estebank mentioned this pull request Nov 26, 2019
Open
estebank
estebank commented Nov 26, 2019
View reviewed changes
src/test/ui/hrtb/hrtb-higher-ranker-supertraits.stderr
@@ -2,7 +2,7 @@ error[E0277]: the trait bound `for<'tcx> F: Foo<'tcx>` is not satisfied
--> $DIR/hrtb-higher-ranker-supertraits.rs:18:26
|
LL | where F : Foo<'x>
| - help: consider further restricting type parameter `F`: `, for<'tcx> F: Foo<'tcx>`
| - help: consider further restricting type parameter `F`: `, F: for<'tcx> Foo<'tcx>`
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Filed #66762 to account for these.

@bors
Copy link
Contributor

bors commented Nov 26, 2019

🔒 Merge conflict

This pull request and the master branch diverged in a way that cannot be automatically merged. Please rebase on top of the latest master branch, and let the reviewer approve again.

How do I rebase?

Assuming self is your fork and upstream is this repository, you can resolve the conflict following these steps:

  1. git checkout suggest-copy (switch to your branch)
  2. git fetch upstream master (retrieve the latest master)
  3. git rebase upstream/master -p (rebase on top of it)
  4. Follow the on-screen instruction to resolve conflicts (check git status if you got lost).
  5. git push self suggest-copy --force-with-lease (update this PR)

You may also read Git Rebasing to Resolve Conflicts by Drew Blessing for a short tutorial.

Please avoid the "Resolve conflicts" button on GitHub. It uses git merge instead of git rebase which makes the PR commit history more difficult to read.

Sometimes step 4 will complete without asking for resolution. This is usually due to difference between how Cargo.lock conflict is handled during merge and rebase. This is normal, and you should still perform step 5 to update this PR.

Error message 
Auto-merging src/librustc_mir/borrow_check/conflict_errors.rs
Auto-merging src/librustc/traits/error_reporting.rs
CONFLICT (content): Merge conflict in src/librustc/traits/error_reporting.rs
Automatic merge failed; fix conflicts and then commit the result.

@bors 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 Nov 26, 2019
@bors
Copy link
Contributor

bors commented Nov 26, 2019

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

@Centril
Copy link
Contributor

Centril commented Nov 28, 2019

@Dylan-DPC Please avoid merge commits as we do not allow them. @estebank could you squash and r=me ?

@Dylan-DPC-zz
Copy link

Sorry 😆 resolved the conflict on GH and then realised gh does a merge instead of rebase.

@estebank
Copy link
Contributor Author

@bors r=Centril

@Centril @Dylan-DPC done

@bors
Copy link
Contributor

bors commented Nov 28, 2019

📌 Commit 0f530ec has been approved by Centril

@bors 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 Nov 28, 2019
@bors
Copy link
Contributor

bors commented Nov 29, 2019

⌛ Testing commit 0f530ec with merge 861e96f...

bors added a commit that referenced this pull request Nov 29, 2019
@bors
Auto merge of #66567 - estebank:suggest-copy, r=Centril
861e96f 
Use structured suggestion when requiring `Copy` constraint in type param
@bors
Copy link
Contributor

bors commented Nov 29, 2019

☀️ Test successful - checks-azure
Approved by: Centril
Pushing 861e96f to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Nov 29, 2019
@bors bors merged commit 0f530ec into rust-lang:master Nov 29, 2019
@rust-highfive
Copy link
Collaborator

📣 Toolstate changed by #66567!

Tested on commit 861e96f.
Direct link to PR: #66567

💔 rustc-guide on linux: test-pass → test-fail (cc @JohnTitor @amanjeev @spastorino @mark-i-m, @rust-lang/infra).

rust-highfive added a commit to rust-lang-nursery/rust-toolstate that referenced this pull request Nov 29, 2019
@rust-highfive
📣 Toolstate changed by rust-lang/rust#66567!
505228a 
Tested on commit rust-lang/rust@861e96f.
Direct link to PR: <rust-lang/rust#66567>

💔 rustc-guide on linux: test-pass → test-fail (cc @JohnTitor @amanjeev @spastorino @mark-i-m, @rust-lang/infra).
@bors bors mentioned this pull request Nov 29, 2019
Merged
@hellow554 hellow554 mentioned this pull request Dec 3, 2019
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Centril Centril Centril left review comments

Assignees

@Centril Centril

Labels
merged-by-bors This PR was explicitly merged by bors. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
7 participants
@estebank @rust-highfive @JohnCSimon @Centril @bors @Dylan-DPC-zz @eddyb