Skip to content

Account for bounds and asociated items when denying _ - #69148

Merged
bors merged 3 commits into
rust-lang:masterfrom
estebank:cold-as-ice
Feb 28, 2020
Merged

Account for bounds and asociated items when denying _#69148
bors merged 3 commits into
rust-lang:masterfrom
estebank:cold-as-ice

Conversation

@estebank

@estebankestebank commented Feb 13, 2020

Copy link
Copy Markdown
Contributor

Fix#68801, #69204. Follow up to #67597 and #68071.

Output for the original ICE report:

 Checking vinoteca v5.0.0 (/Users/ekuber/workspace/vinoteca)
error[E0121]: the type placeholder `_` is not allowed within types on item signatures
--> src/producers.rs:43:70
|
43 | pub fn top<Table: diesel::Table + diesel::query_dsl::InternalJoinDsl<_, diesel::query_source::joins::Inner, _>>(table: Table, limit: usize, connection: DbConn) -> RestResult<Vec<TopWineType>> {
| ^ not allowed in type signatures ^ not allowed in type signatures
error: aborting due to previous error

@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. labels Feb 13, 2020
@rust-highfive

Copy link
Copy Markdown
Contributor

r? @cramertj

(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 Feb 13, 2020
@Centril

Copy link
Copy Markdown
Contributor

r? @oli-obk

@estebankestebank changed the title Account for bounds when denying _ in type parametersAccount for bounds and asociated items when denying _ in type parametersFeb 17, 2020
@estebankestebank changed the title Account for bounds and asociated items when denying _ in type parametersAccount for bounds and asociated items when denying _Feb 17, 2020
@estebank

Copy link
Copy Markdown
ContributorAuthor

ping

@pnkfelix

Copy link
Copy Markdown
Contributor

discussed at T-compiler meeting. declined for beta backport.

"current decision: no backport because too big, but let us know if you want us to revisit the question"

@pnkfelixpnkfelix removed the beta-nominated Nominated for backporting to the compiler in the beta channel. label Feb 20, 2020
@estebank

Copy link
Copy Markdown
ContributorAuthor

@pnkfelix saw the discussion, sounds fair. There's a very small fix that would cause duplicated output but would never ICE at the cost of the extra verbosity. Should I go ahead and do that?

@estebank

Copy link
Copy Markdown
ContributorAuthor

@Centril@oli-obk is on vacation, could you take a look at this?

estebank added a commit to estebank/rust that referenced this pull request Feb 20, 2020
rust-lang#69148 has a proper fix, but it is too big to backport.
This change avoids the ICE by actually emitting an appropriate error. The
output will be duplicated in some cases, but that's better than the
avoidable ICE.
@estebankestebank removed the T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. label Feb 20, 2020
@Centril

Copy link
Copy Markdown
Contributor

@estebank Sorry, I don't think I have the time to invest into understanding this as well as I would want to to get to r+. :(

@oli-obk

Copy link
Copy Markdown
Contributor

@bors r+

@bors

bors commented Feb 26, 2020

Copy link
Copy Markdown
Collaborator

📌 Commit d3ad814a276964dfcf293904f76f16494e54d4eb has been approved by oli-obk

@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 Feb 26, 2020
@estebank

Copy link
Copy Markdown
ContributorAuthor

@bors r-

@oli-obk I'll rebase and r+ this after the backportable PR #69324 lands.

@borsbors 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 Feb 26, 2020
JohnTitor added a commit to JohnTitor/rust that referenced this pull request Feb 27, 2020
…ceholder-type, r=Centril
Backport only: avoid ICE on bad placeholder type
rust-lang#69148 has a proper fix, but it is too big to backport.
This change avoids the ICE by actually emitting an appropriate error. The
output will be duplicated in some cases, but that's better than the
avoidable ICE.
r? @Centril
@bors

bors commented Feb 27, 2020

Copy link
Copy Markdown
Collaborator

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

@estebank

Copy link
Copy Markdown
ContributorAuthor

@bors r=oli-obk rebased on top of master with the other PR reverted

@bors

bors commented Feb 28, 2020

Copy link
Copy Markdown
Collaborator

📌 Commit c6cfcf9 has been approved by oli-obk

@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 Feb 28, 2020
Dylan-DPC-zz pushed a commit to Dylan-DPC-zz/rust that referenced this pull request Feb 28, 2020
Account for bounds and asociated items when denying `_`
Fixrust-lang#68801, rust-lang#69204. Follow up to rust-lang#67597 and rust-lang#68071.
Output for the original ICE report:
```
Checking vinoteca v5.0.0 (/Users/ekuber/workspace/vinoteca)
error[E0121]: the type placeholder `_` is not allowed within types on item signatures
--> src/producers.rs:43:70
|
43 | pub fn top<Table: diesel::Table + diesel::query_dsl::InternalJoinDsl<_, diesel::query_source::joins::Inner, _>>(table: Table, limit: usize, connection: DbConn) -> RestResult<Vec<TopWineType>> {
| ^ not allowed in type signatures ^ not allowed in type signatures
error: aborting due to previous error
```
@bors

bors commented Feb 28, 2020

Copy link
Copy Markdown
Collaborator

⌛ Testing commit c6cfcf9 with merge eaa02f5...

@bors

bors commented Feb 28, 2020

Copy link
Copy Markdown
Collaborator

☀️ Test successful - checks-azure
Approved by: oli-obk
Pushing eaa02f5 to master...

@borsbors added the merged-by-bors This PR was explicitly merged by bors. label Feb 28, 2020
@bors
bors merged commit eaa02f5 into rust-lang:masterFeb 28, 2020
Centril added a commit to Centril/rust that referenced this pull request Mar 23, 2020
…r=Centril
Account for bad placeholder types in where clauses
Fixrust-lang#70291. Follow up to rust-lang#69148.
Centril added a commit to Centril/rust that referenced this pull request Mar 23, 2020
…r=Centril
Account for bad placeholder types in where clauses
Fixrust-lang#70291. Follow up to rust-lang#69148.
Centril added a commit to Centril/rust that referenced this pull request Mar 23, 2020
…r=Centril
Account for bad placeholder types in where clauses
Fixrust-lang#70291. Follow up to rust-lang#69148.
@estebank
estebank deleted the cold-as-ice branch November 9, 2023 05:17
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

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

Development

Successfully merging this pull request may close these issues.

'index out of bounds: the len is 1 but the index is 1': libcore/slice/mod.rs

7 participants

@estebank@rust-highfive@Centril@pnkfelix@oli-obk@bors@cramertj