check where-clause for explicit `Sized` before suggesting `?Sized` by tlyu · Pull Request #86455 · rust-lang/rust

tlyu · 2021-06-19T00:52:45Z

Fixes #85945.

Based on #86454.

@rustbot label +A-diagnostics +A-traits +A-typesystem +D-papercut +T-compiler

rust-highfive · 2021-06-19T00:52:48Z

r? @estebank

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

estebank · 2021-09-16T15:19:34Z

src/test/ui/suggestions/issue-85945-check-where-clause-before-suggesting-unsized.stderr

Ideally this should point at the T: Sized span instead of where it was introduced, but it's ok either way.

estebank · 2021-09-16T15:20:08Z

@bors r+

bors · 2021-09-16T15:20:10Z

📌 Commit 6beef88654189ae68026f3ba30f7edee95dc6562 has been approved by estebank

bors · 2021-09-20T06:34:13Z

⌛ Testing commit 6beef88654189ae68026f3ba30f7edee95dc6562 with merge d508daa3f0dc774459a4045fe18b4502d3a63015...

bors · 2021-09-20T06:54:49Z

💔 Test failed - checks-actions

estebank · 2021-09-20T15:20:35Z

You will need to git rebase master on a recent master and re-run ./x.py test src/test/ui --bless.

bors · 2021-10-02T13:48:25Z

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

tlyu · 2021-10-08T03:48:21Z

Looks like there is also a recently introduced invariant that I'm breaking somehow. I haven't worked out the details yet.

bors · 2021-10-26T07:53:38Z

🔒 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:

git checkout check-where-before-suggesting-unsized (switch to your branch)
git fetch upstream master (retrieve the latest master)
git rebase upstream/master -p (rebase on top of it)
Follow the on-screen instruction to resolve conflicts (check git status if you got lost).
git push self check-where-before-suggesting-unsized --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 compiler/rustc_typeck/src/collect.rs
CONFLICT (content): Merge conflict in compiler/rustc_typeck/src/collect.rs
Auto-merging compiler/rustc_trait_selection/src/traits/error_reporting/mod.rs
Auto-merging compiler/rustc_hir/src/hir.rs
warning: inexact rename detection was skipped due to too many files.
warning: you may want to set your merge.renamelimit variable to at least 2542 and retry the command.
Automatic merge failed; fix conflicts and then commit the result.

JohnCSimon · 2021-11-13T23:49:01Z

Ping from triage:
@tlyu - Can you post your status on this PR?

tlyu · 2021-11-16T04:46:45Z

Rebased, and also reblessed UI tests due to upstream changes.

@rustbot label -S-waiting-on-author +S-waiting-on-review

estebank · 2021-11-16T05:04:32Z

src/test/ui/suggestions/issue-85945-check-where-clause-before-suggesting-unsized.stderr

+note: required by a bound in `foo`
+  --> $DIR/issue-85945-check-where-clause-before-suggesting-unsized.rs:3:8
+   |
+LL | fn foo<T>(_: &T) where T: Sized {}
+   |        ^ required by this bound in `foo`


Ideally this should point at the where clause.

estebank · 2021-11-16T05:04:43Z

@bors r+

bors · 2021-11-16T05:04:45Z

📌 Commit 1a50725 has been approved by estebank

…unsized, r=estebank check where-clause for explicit `Sized` before suggesting `?Sized` Fixes rust-lang#85945. Based on rust-lang#86454. `@rustbot` label +A-diagnostics +A-traits +A-typesystem +D-papercut +T-compiler

Rollup of 8 pull requests Successful merges: - rust-lang#86455 (check where-clause for explicit `Sized` before suggesting `?Sized`) - rust-lang#90801 (Normalize both arguments of `equate_normalized_input_or_output`) - rust-lang#90803 (Suggest `&str.chars()` on attempt to `&str.iter()`) - rust-lang#90819 (Fixes incorrect handling of TraitRefs when emitting suggestions.) - rust-lang#90910 (fix getting the discriminant of a zero-variant enum) - rust-lang#90925 (rustc_mir_build: reorder bindings) - rust-lang#90928 (Use a different server for checking clock drift) - rust-lang#90936 (Add a regression test for rust-lang#80772) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup

rust-highfive assigned estebank Jun 19, 2021

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

JohnCSimon added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jul 6, 2021

camelid added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jul 23, 2021

JohnCSimon added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Aug 15, 2021

camelid added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Sep 2, 2021

estebank reviewed Sep 16, 2021

View reviewed changes

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 Sep 16, 2021

This comment has been minimized.

Sign in to view

bors 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 Sep 20, 2021

apiraino 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 Oct 21, 2021

tlyu added 2 commits November 15, 2021 22:31

check where clause before suggesting unsized

c9fcbda

refactor is_param_bound

1a50725

tlyu force-pushed the check-where-before-suggesting-unsized branch from 6beef88 to 1a50725 Compare November 16, 2021 04:32

rustbot 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 16, 2021

estebank reviewed Nov 16, 2021

View reviewed changes

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 16, 2021

This was referenced Nov 16, 2021

Rollup of 9 pull requests #90944

Closed

Rollup of 8 pull requests #90945

Merged

bors merged commit ebef3ce into rust-lang:master Nov 16, 2021

rustbot added this to the 1.58.0 milestone Nov 16, 2021

Uh oh!

Conversation

tlyu commented Jun 19, 2021

Uh oh!

rust-highfive commented Jun 19, 2021

Uh oh!

estebank Sep 16, 2021

Choose a reason for hiding this comment

Uh oh!

estebank commented Sep 16, 2021

Uh oh!

bors commented Sep 16, 2021

Uh oh!

bors commented Sep 20, 2021

Uh oh!

This comment has been minimized.

bors commented Sep 20, 2021

Uh oh!

estebank commented Sep 20, 2021

Uh oh!

bors commented Oct 2, 2021

Uh oh!

tlyu commented Oct 8, 2021

Uh oh!

bors commented Oct 26, 2021

Uh oh!

JohnCSimon commented Nov 13, 2021

Uh oh!

tlyu commented Nov 16, 2021

Uh oh!

estebank Nov 16, 2021

Choose a reason for hiding this comment

Uh oh!

estebank commented Nov 16, 2021

Uh oh!

bors commented Nov 16, 2021

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

9 participants