The Great Generics Generalisation: Ty Edition by varkor · Pull Request #48523 · rust-lang/rust

varkor · 2018-02-25T01:08:05Z

Part of the generic parameter refactoring effort, split off from #48149. Contains the ty-relative refactoring.

bors · 2018-02-25T05:02:57Z

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

shepmaster · 2018-03-02T19:32:59Z

Ping from triage, @varkor ! You have some merge conflicts you need to address, will you be able to get to those soon?

varkor · 2018-03-02T23:59:12Z

@shepmaster: the merge conflicts should all be fairly routine (this code has a reasonably high bitrot rate) — I should be able to fix them without issue after a review, so I'll wait for now to avoid repeatedly fixing new conflicts as they arise.

shepmaster · 2018-03-03T00:43:30Z

Ping from triage, @eddyb !

eddyb · 2018-03-06T13:19:46Z

This method can be inlined everywhere it's used.

eddyb · 2018-03-06T13:21:10Z

This should ideally not allocate for "lifetimes" / "types".

eddyb · 2018-03-06T13:24:45Z

Self should come before lifetimes, such that indexing is trivial.

eddyb · 2018-03-06T13:27:18Z

Please do not call pack outside of the From impls.

bors · 2018-03-06T15:05:50Z

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

bors · 2018-03-08T11:36:24Z

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

emilyalbini · 2018-03-12T10:36:11Z

@eddyb ping from triage! This PR has new commits that needs to be reviewed.

nikomatsakis · 2018-05-15T18:36:56Z

@bors r+

bors · 2018-05-15T18:36:57Z

📌 Commit 5be2bdb has been approved by nikomatsakis

kennytm · 2018-05-15T20:03:16Z

@bors p=1

Unblocks #48149.

bors · 2018-05-15T23:03:11Z

⌛ Testing commit 5be2bdb with merge e44fc6c...

bors · 2018-05-16T01:43:22Z

☀️ Test successful - status-appveyor, status-travis
Approved by: nikomatsakis
Pushing e44fc6c to master...

rust-highfive · 2018-05-16T01:44:32Z

📣 Toolstate changed by #48523!

Tested on commit e44fc6c.
Direct link to PR: #48523

💔 clippy-driver on windows: test-pass → build-fail (cc @Manishearth @llogiq @mcarton @oli-obk, @rust-lang/infra).
💔 clippy-driver on linux: test-pass → build-fail (cc @Manishearth @llogiq @mcarton @oli-obk, @rust-lang/infra).

rust-highfive assigned eddyb Feb 25, 2018

rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Feb 25, 2018

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-review Status: Awaiting review from the assignee but also interested parties. labels Feb 25, 2018

varkor force-pushed the generics-ty-generalisations branch 5 times, most recently from 2a0b89e to b4dbc02Compare February 25, 2018 16:04

varkor mentioned this pull request Mar 2, 2018
The Great Generics Generalisation: HIR Edition #48149
Merged

shepmaster 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 Mar 3, 2018

eddyb reviewed Mar 6, 2018
View reviewed changes

Comment threadsrc/librustc/ty/mod.rs Outdated
eddybMar 6, 2018
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.
This method can be inlined everywhere it's used.

eddyb reviewed Mar 6, 2018
View reviewed changes

Comment threadsrc/librustc_typeck/collect.rs Outdated
eddybMar 6, 2018
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.
This should ideally not allocate for "lifetimes" / "types".

eddyb reviewed Mar 6, 2018
View reviewed changes

Comment threadsrc/librustc/ty/mod.rs Outdated
eddybMar 6, 2018
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.
Self should come before lifetimes, such that indexing is trivial.

eddyb reviewed Mar 6, 2018
View reviewed changes

Comment threadsrc/librustc/ty/subst.rs Outdated
eddybMar 6, 2018
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.
Please do not call pack outside of the From impls.

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-review Status: Awaiting review from the assignee but also interested parties. labels Mar 6, 2018

varkor force-pushed the generics-ty-generalisations branch from b4dbc02 to d0b0eb7Compare March 8, 2018 10:34

varkor force-pushed the generics-ty-generalisations branch 2 times, most recently from 937afe9 to 689b927Compare March 8, 2018 12:12

emilyalbini 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 Mar 12, 2018

varkor added 14 commits May 15, 2018 14:21

Refactor generic params loops
9200bde

Lift pure_wrt_drop to GenericParamDef
007de2f

Remove GenericParamDef::to_type
365c8c3

Rename param_counts to own_counts
fd8e284

Review refactoring
fe1f651

Refactoring generic counting loops
b575c18

Update bad-annotation error message
25bf73d

Clean up generic param handling
030f10f

Refactor Substs methods on generic parameters
d9190da

Clean up shared subst code
3ae2468

Use Kind instead of UnpackedKind in Substs methods
e9c28b2

Add mk_param_from_def
0a9371a

Clean up dropck_outlives PhantomData handling
39a68e9

Collapse Substs::identity_for_item in collect
5ea91ac

This comment has been minimized.
Sign in to view

One must always remember to clean up after themselves
5be2bdb

nikomatsakis approved these changes May 15, 2018
View reviewed changes

phansch mentioned this pull request May 16, 2018
Incoming clippy breakage rust-lang/rust-clippy#2766
Closed

mati865 mentioned this pull request May 17, 2018
Rustup to 2018-05-16 rust-lang/rust-clippy#2770
Merged

Uh oh!

Uh oh!

Conversation

varkor commented Feb 25, 2018

Uh oh!

bors commented Feb 25, 2018

Uh oh!

shepmaster commented Mar 2, 2018

Uh oh!

varkor commented Mar 2, 2018

Uh oh!

shepmaster commented Mar 3, 2018

Uh oh!

eddybMar 6, 2018

Choose a reason for hiding this comment

Uh oh!

eddybMar 6, 2018

Choose a reason for hiding this comment

Uh oh!

eddybMar 6, 2018

Choose a reason for hiding this comment

Uh oh!

eddybMar 6, 2018

Choose a reason for hiding this comment

Uh oh!

bors commented Mar 6, 2018

Uh oh!

bors commented Mar 8, 2018

Uh oh!

emilyalbini commented Mar 12, 2018

Uh oh!

This comment has been minimized.

nikomatsakis commented May 15, 2018

Uh oh!

bors commented May 15, 2018

Uh oh!

kennytm commented May 15, 2018

Uh oh!

bors commented May 15, 2018

Uh oh!

bors commented May 16, 2018

Uh oh!

rust-highfive commented May 16, 2018

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

9 participants