The Great Generics Generalisation: Ty Edition #48523

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

src/librustc/ty/mod.rs

    pub fn own_count(&self) -> usize {
-        self.regions.len() + self.types.len()
+        self.params.len()
    }


This method can be inlined everywhere it's used.

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

src/librustc_typeck/collect.rs

+        regions.into_iter().map(|lt| ty::GenericParam::Lifetime(lt)).collect();
+    let types: Vec<ty::GenericParam> =
+        types.into_iter().map(|ty| ty::GenericParam::Type(ty)).collect();
+    let params = lifetimes.into_iter().chain(types.into_iter()).collect();


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

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

src/librustc/ty/mod.rs

-        if let Some(index) = param.index.checked_sub(self.parent_count() as u32) {
-            &self.regions[index as usize - self.has_self as usize]
+        if let Some(index) = param.index.checked_sub(self.parent_count as u32) {
+            // We're currently assuming that lifetimes precede other generic parameters.


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

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

src/librustc/ty/subst.rs

+                }
+            };
+            assert_eq!(def.index() as usize, substs.len());
+            substs.push(param.pack());


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.

pietroalbini · 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...

@eddyb

…akis The Great Generics Generalisation: Ty Edition Part of the generic parameter refactoring effort, split off from #48149. Contains the `ty`-relative refactoring. r? @eddyb

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).

@Manishearth

Tested on commit rust-lang/rust@e44fc6c. Direct link to PR: <rust-lang/rust#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 b4dbc02 Compare 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

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 d0b0eb7 Compare March 8, 2018 10:34

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

pietroalbini 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 6 commits May 15, 2018 14:22

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

varkor force-pushed the generics-ty-generalisations branch from 8c72a03 to 5ea91ac Compare May 15, 2018 13:25

This comment has been minimized.

Sign in to view

One must always remember to clean up after themselves

5be2bdb

kennytm 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 May 15, 2018

nikomatsakis approved these changes May 15, 2018

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 May 15, 2018

bors merged commit 5be2bdb into rust-lang:master May 16, 2018

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

The Great Generics Generalisation: Ty Edition #48523

The Great Generics Generalisation: Ty Edition #48523

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!

eddyb Mar 6, 2018

Choose a reason for hiding this comment

Uh oh!

eddyb Mar 6, 2018

Choose a reason for hiding this comment

Uh oh!

eddyb Mar 6, 2018

Choose a reason for hiding this comment

Uh oh!

eddyb Mar 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!

pietroalbini 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!

Uh oh!