Skip to content

Account for bad placeholder types in where clauses - #70294

Merged
bors merged 1 commit into
rust-lang:masterfrom
estebank:bad-placeholder-in-where
Mar 24, 2020
Merged

Account for bad placeholder types in where clauses#70294
bors merged 1 commit into
rust-lang:masterfrom
estebank:bad-placeholder-in-where

Conversation

@estebank

@estebankestebank commented Mar 23, 2020•
edited
Loading

Copy link
Copy Markdown
Contributor

Fix#70291. Follow up to #69148.

@rust-highfive

rust-highfive commented Mar 23, 2020

Copy link
Copy Markdown
Contributor

r? @ecstatic-morse

(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 Mar 23, 2020
@estebankestebank added beta-nominated Nominated for backporting to the compiler in the beta channel. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Mar 23, 2020
Centril
Centril reviewed Mar 23, 2020
View reviewed changes
Comment threadsrc/librustc_typeck/collect.rs Outdated
Comment threadsrc/librustc_typeck/astconv.rs Outdated
estebank
estebank commented Mar 23, 2020
View reviewed changes
Comment threadsrc/test/ui/did_you_mean/bad-assoc-ty.stderr Outdated
@estebank

estebank commented Mar 23, 2020

Copy link
Copy Markdown
ContributorAuthor

r? @Centril

@estebank
estebankforce-pushed the bad-placeholder-in-where branch from 0410eee to 5af9042CompareMarch 23, 2020 03:29
Centril
Centril reviewed Mar 23, 2020
View reviewed changes
Comment threadsrc/librustc_typeck/astconv.rs Outdated
@estebank
estebankforce-pushed the bad-placeholder-in-where branch from 5af9042 to 7c8fe98CompareMarch 23, 2020 06:18
@Centril

Centril commented Mar 23, 2020

Copy link
Copy Markdown
Contributor

@bors try @rust-timer queue

@rust-timer

rust-timer commented Mar 23, 2020

Copy link
Copy Markdown
Collaborator

Awaiting bors try build completion

@bors

bors commented Mar 23, 2020

Copy link
Copy Markdown
Collaborator

⌛ Trying commit 7c8fe98681ac93740c1c959f0b4951ad090034ee with merge 50962f2a2876523fc8f966266bee06123a5dcd3b...

@CentrilCentril added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Mar 23, 2020
@bors

bors commented Mar 23, 2020

Copy link
Copy Markdown
Collaborator

☀️ Try build successful - checks-azure
Build commit: 50962f2a2876523fc8f966266bee06123a5dcd3b (50962f2a2876523fc8f966266bee06123a5dcd3b)

@rust-timer

rust-timer commented Mar 23, 2020

Copy link
Copy Markdown
Collaborator

Queued 50962f2a2876523fc8f966266bee06123a5dcd3b with parent 37c945d, future comparison URL.

@rust-timer

rust-timer commented Mar 23, 2020

Copy link
Copy Markdown
Collaborator

Finished benchmarking try commit 50962f2a2876523fc8f966266bee06123a5dcd3b, comparison URL.

@estebank

estebank commented Mar 23, 2020

Copy link
Copy Markdown
ContributorAuthor

This as it stands doesn't handle fn foo<F: Fn() -> _>(_: F) {}. I'll fix that.

@Centril

Centril commented Mar 23, 2020

Copy link
Copy Markdown
Contributor

@estebank does it ICE in that case? If not, then let's not fix it in this PR.

@estebank

estebank commented Mar 23, 2020•
edited
Loading

Copy link
Copy Markdown
ContributorAuthor

It does ICE. Changing this to use walk_generics(&mut visitor, generics); makes the ICE go away at the cost of a duplicated error. I'll see if I can get rid of the dupe, but if not I prefer that over an ICE.

@Centril

Centril commented Mar 23, 2020

Copy link
Copy Markdown
Contributor

@estebank Could we do the simple thing in this PR for backportability reasons and follow up with possible de-dup improvements?

@estebank
estebankforce-pushed the bad-placeholder-in-where branch from 7c8fe98 to b8bca24CompareMarch 23, 2020 19:35
@estebank

estebank commented Mar 23, 2020

Copy link
Copy Markdown
ContributorAuthor

I'm comfortable with the current state of the PR.

estebank
estebank commented Mar 23, 2020
View reviewed changes
Comment threadsrc/librustc_typeck/astconv.rs Outdated
Comment on lines 841 to 852

@estebankestebankMar 23, 2020

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

Removing this got rid of the duplicated errors.

@Centril

Centril commented Mar 23, 2020

Copy link
Copy Markdown
Contributor

I am too, let's :shipit:

@bors r+

@bors

bors commented Mar 23, 2020

Copy link
Copy Markdown
Collaborator

📌 Commit b8bca241cb7f372170bdc628ef2cdbc19f7d3f14 has been approved by Centril

@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 Mar 23, 2020
@estebank
estebankforce-pushed the bad-placeholder-in-where branch from b8bca24 to e75158dCompareMarch 23, 2020 19:55
@estebank

estebank commented Mar 23, 2020

Copy link
Copy Markdown
ContributorAuthor

rustfmt an import 🤦‍♂️

@bors r=Centril

@bors

bors commented Mar 23, 2020

Copy link
Copy Markdown
Collaborator

📌 Commit e75158d has been approved by Centril

Centril added a commit to Centril/rust that referenced this pull request Mar 23, 2020
@Centril
Rollup merge ofrust-lang#70294- estebank:bad-placeholder-in-where, …
de1b094
…r=Centril
Account for bad placeholder types in where clauses
Fixrust-lang#70291. Follow up to rust-lang#69148.
@CentrilCentril mentioned this pull request Mar 23, 2020
Closed
Centril added a commit to Centril/rust that referenced this pull request Mar 23, 2020
@Centril
Rollup merge ofrust-lang#70294- estebank:bad-placeholder-in-where, …
b07333c
…r=Centril
Account for bad placeholder types in where clauses
Fixrust-lang#70291. Follow up to rust-lang#69148.
This was referenced Mar 23, 2020
Closed
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Mar 24, 2020
@bors
Auto merge ofrust-lang#70343- Centril:rollup-94egfvs, r=Centril
342c5f3
Rollup of 11 pull requests
Successful merges:
- rust-lang#67761 (Move the dep_graph construction to a dedicated crate.)
- rust-lang#69740 (Replace some desc logic in librustc_lint with article_and_desc)
- rust-lang#69981 (Evaluate repeat expression lengths as late as possible)
- rust-lang#70087 (Remove const eval loop detector)
- rust-lang#70242 (Improve E0308 error message wording)
- rust-lang#70264 (Fix invalid suggestion on `&mut` iterators yielding `&` references)
- rust-lang#70267 (get rid of ConstPropUnsupported; use ZST marker structs instead)
- rust-lang#70277 (Remove `ReClosureBound`)
- rust-lang#70283 (Add regression test for rust-lang#70155.)
- rust-lang#70294 (Account for bad placeholder types in where clauses)
- rust-lang#70309 (Clean up E0452 explanation)
Failed merges:
r? @ghost
@bors
bors merged commit 54db0cf into rust-lang:masterMar 24, 2020
@estebankestebank mentioned this pull request Mar 24, 2020
Merged
Centril added a commit to Centril/rust that referenced this pull request Mar 25, 2020
@Centril
Rollup merge ofrust-lang#70369- estebank:bad-placeholder-in-where, …
1059604
…r=Centril
Fix smaller issues with invalid placeholder type errors
Follow up to rust-lang#70294.
- Fix placement of suggested generic param when bounds are present.
- Reduce error duplication for invalid placeholder types in `fn` types.
r? @Centril
Centril added a commit to Centril/rust that referenced this pull request Mar 25, 2020
@Centril
Rollup merge ofrust-lang#70369- estebank:bad-placeholder-in-where, …
cb17049
…r=Centril
Fix smaller issues with invalid placeholder type errors
Follow up to rust-lang#70294.
- Fix placement of suggested generic param when bounds are present.
- Reduce error duplication for invalid placeholder types in `fn` types.
r? @Centril
@pnkfelix

pnkfelix commented Apr 1, 2020

Copy link
Copy Markdown
Contributor

Discussed in T-compiler meeting. Accepted for beta-backport.

@pnkfelixpnkfelix added the beta-accepted Accepted for backporting to the compiler in the beta channel. label Apr 1, 2020
@Mark-SimulacrumMark-Simulacrum removed the beta-nominated Nominated for backporting to the compiler in the beta channel. label Apr 3, 2020
@Mark-SimulacrumMark-Simulacrum mentioned this pull request Apr 3, 2020
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Apr 3, 2020
@bors
Auto merge ofrust-lang#70742- Mark-Simulacrum:beta-next, r=Mark-Sim…
4331852
…ulacrum
[beta] backport 4 PRs
This backports the following PRs:
* parse_and_disallow_postfix_after_cast: account for `ExprKind::Err`. rust-lang#70556
* Account for bad placeholder types in where clauses rust-lang#70294
* Fix "since" field for `Once::is_complete`'s `#[stable]` attribute rust-lang#70018
* Ensure HAS_FREE_LOCAL_NAMES is set for ReFree rust-lang#69956
All commits cherry picked cleanly.
@estebankestebank mentioned this pull request Oct 3, 2020
Closed
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

1 more reviewer
@CentrilCentrilCentril left review comments
Reviewers whose approvals may not affect merge requirements

Assignees

@CentrilCentril

Labels

beta-acceptedAccepted for backporting to the compiler in the beta channel.S-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.T-compilerRelevant to the compiler team, which will review and decide on the PR/issue.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

"bad placeholder type" ICE regression

8 participants

@estebank@rust-highfive@Centril@rust-timer@bors@pnkfelix@Mark-Simulacrum@ecstatic-morse