on-demand-ify `custom_coerce_unsized_kind` and `inherent-impls` #40683

nikomatsakis · 2017-03-20T20:31:03Z

This "on-demand" task both checks for errors and computes the custom unsized kind, if any. This task is only defined on impls of CoerceUnsized; invoking it on any other kind of impl results in a bug. This is just to avoid having an Option, could easily be changed.

r? @eddyb

eddyb · 2017-03-20T20:34:16Z

@bors r+

bors · 2017-03-20T20:34:17Z

📌 Commit 8effa01 has been approved by eddyb

bors · 2017-03-20T21:04:05Z

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

nikomatsakis · 2017-03-20T22:58:20Z

@eddyb -- I added another commit, converting inherent-impl things.

r? on those commits.

eddyb · 2017-03-20T23:18:50Z

src/librustc_typeck/coherence/inherent.rs

+    let mut collect = InherentCollect { tcx };
+    krate.visit_all_item_likes(&mut collect);
+
+    herent


What's this?

yeah, what is that? weird.

oh, that file never got removed...it was supposed to be.

eddyb · 2017-03-20T23:20:35Z

src/librustc_typeck/coherence/inherent_impls.rs

+        match self_ty.sty {
+            ty::TyAdt(def, _) => {
+                self.check_def_id(item, def.did);
+            }


This isn't moved from anywhere else?!

it is, not sure why git didn't figure it out. I split up inherent.rs into two files, since it was doing two things.

I guess I could keep it together. Might be cleaner diff.

What I mean is, you don't have a negative diff on inherent.rs matching the positive diff.

yeah, it's because inherent.rs is all dead now. just pushed a revised version which deleted it.

nikomatsakis · 2017-03-22T15:10:27Z

@eddyb r? on the new changes

eddyb · 2017-03-22T15:12:15Z

@bors r+

bors · 2017-03-22T15:12:15Z

📌 Commit ba85dc7 has been approved by eddyb

bors · 2017-03-23T17:09:11Z

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

This "on-demand" task both checks for errors and computes the custom unsized kind, if any. This task is only defined on impls of `CoerceUnsized`; invoking it on any other kind of impl results in a bug. This is just to avoid having an `Option`, could easily be changed.

Top-down, top-down!

There are now 3 queries: - inherent_impls(def-id): for a given type, get a `Rc<Vec<DefId>>` with all its inherent impls. This internally uses `crate_inherent_impls`, doing some hacks to keep the current deps (which, btw, are not clearly correct). - crate_inherent_impls(crate): gathers up a map from types to `Rc<Vec<DefId>>`, touching the entire krate, possibly generating errors. - crate_inherent_impls_overlap_check(crate): performs overlap checks between the inherent impls for a given type, generating errors.

nikomatsakis · 2017-03-23T17:27:41Z

@bors r=eddyb

bors · 2017-03-23T17:27:42Z

📌 Commit a29ae30 has been approved by eddyb

@eddyb

…ed-info, r=eddyb on-demand-ify `custom_coerce_unsized_kind` and `inherent-impls` This "on-demand" task both checks for errors and computes the custom unsized kind, if any. This task is only defined on impls of `CoerceUnsized`; invoking it on any other kind of impl results in a bug. This is just to avoid having an `Option`, could easily be changed. r? @eddyb

Rollup of 11 pull requests - Successful merges: #40347, #40501, #40516, #40524, #40540, #40642, #40683, #40764, #40778, #40807, #40809 - Failed merges: #40771

bors · 2017-03-25T12:00:16Z

⌛ Testing commit a29ae30 with merge 774298f...

bors · 2017-03-25T12:10:11Z

💔 Test failed - status-travis

arielb1 · 2017-03-25T12:30:19Z

try to fix the build on emscripten #40821
@bors retry

bors · 2017-03-25T14:04:13Z

⌛ Testing commit a29ae30 with merge a7890df...

bors · 2017-03-25T14:10:07Z

💔 Test failed - status-travis

arielb1 · 2017-03-25T14:39:37Z

try to fix the build on emscripten #40821
@bors retry

bors · 2017-03-25T16:24:16Z

⌛ Testing commit a29ae30 with merge 63c826f...

bors · 2017-03-25T16:30:06Z

💔 Test failed - status-travis

arielb1 · 2017-03-25T19:36:49Z

try to fix the build on emscripten #40821
@bors retry

bors · 2017-03-26T21:18:14Z

⌛ Testing commit a29ae30 with merge 68c387c...

bors · 2017-03-26T22:19:39Z

💔 Test failed - status-appveyor

nikomatsakis · 2017-03-27T13:37:10Z

Error in gdb. Seems unlikely to be related to this PR, but not impossible.

nikomatsakis · 2017-03-27T17:32:26Z

@bors retry

Debuginfo tests spurious failures on MinGW #40835

@eddyb

…ed-info, r=eddyb on-demand-ify `custom_coerce_unsized_kind` and `inherent-impls` This "on-demand" task both checks for errors and computes the custom unsized kind, if any. This task is only defined on impls of `CoerceUnsized`; invoking it on any other kind of impl results in a bug. This is just to avoid having an `Option`, could easily be changed. r? @eddyb

Rollup of 19 pull requests - Successful merges: #40317, #40516, #40524, #40606, #40683, #40751, #40778, #40813, #40818, #40819, #40824, #40828, #40832, #40833, #40837, #40849, #40852, #40853, #40865 - Failed merges:

rust-highfive assigned eddyb Mar 20, 2017

nikomatsakis mentioned this pull request Mar 20, 2017

[incremental] remove unwanted DepTrackingMap methods #40614

Closed

6 tasks

nikomatsakis force-pushed the incr-comp-coerce-unsized-info branch from 8effa01 to 245d491 Compare March 20, 2017 22:57

nikomatsakis changed the title ~~convert custom_coerce_unsized_kind into a coerce_unsized_info~~ on-demand-ify custom_coerce_unsized_kind and inherent-impls Mar 20, 2017

eddyb reviewed Mar 20, 2017

View reviewed changes

nikomatsakis force-pushed the incr-comp-coerce-unsized-info branch from 245d491 to ba85dc7 Compare March 21, 2017 00:56

nikomatsakis added 3 commits March 23, 2017 13:25

move check to the top of the file, where I would expect to find it

8e6b10a

Top-down, top-down!

nikomatsakis force-pushed the incr-comp-coerce-unsized-info branch from ba85dc7 to a29ae30 Compare March 23, 2017 17:27

alexcrichton mentioned this pull request Mar 25, 2017

Rollup of 11 pull requests #40810

Closed

bors added a commit that referenced this pull request Mar 25, 2017

Auto merge of #40810 - alexcrichton:rollup, r=alexcrichton

40ae49a

Rollup of 11 pull requests - Successful merges: #40347, #40501, #40516, #40524, #40540, #40642, #40683, #40764, #40778, #40807, #40809 - Failed merges: #40771

bors added a commit that referenced this pull request Mar 25, 2017

Auto merge of #40810 - alexcrichton:rollup, r=alexcrichton

ed9108d

Rollup of 11 pull requests - Successful merges: #40347, #40501, #40516, #40524, #40540, #40642, #40683, #40764, #40778, #40807, #40809 - Failed merges: #40771

alexcrichton mentioned this pull request Mar 27, 2017

Rollup of 19 pull requests #40867

Merged

bors merged commit a29ae30 into rust-lang:master Mar 29, 2017

topecongiro mentioned this pull request Apr 4, 2017

Make overlapping_inherent_impls lint a hard error #40728

Merged

nikomatsakis deleted the incr-comp-coerce-unsized-info branch April 14, 2017 10:12

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

on-demand-ify `custom_coerce_unsized_kind` and `inherent-impls` #40683

on-demand-ify `custom_coerce_unsized_kind` and `inherent-impls` #40683

nikomatsakis commented Mar 20, 2017

eddyb commented Mar 20, 2017

bors commented Mar 20, 2017

bors commented Mar 20, 2017

nikomatsakis commented Mar 20, 2017

eddyb Mar 20, 2017

nikomatsakis Mar 21, 2017

nikomatsakis Mar 21, 2017

eddyb Mar 20, 2017

nikomatsakis Mar 21, 2017

nikomatsakis Mar 21, 2017

eddyb Mar 21, 2017

nikomatsakis Mar 21, 2017

nikomatsakis commented Mar 22, 2017

eddyb commented Mar 22, 2017

bors commented Mar 22, 2017

bors commented Mar 23, 2017

nikomatsakis commented Mar 23, 2017

bors commented Mar 23, 2017

bors commented Mar 25, 2017

bors commented Mar 25, 2017

arielb1 commented Mar 25, 2017

bors commented Mar 25, 2017

bors commented Mar 25, 2017

arielb1 commented Mar 25, 2017

bors commented Mar 25, 2017

bors commented Mar 25, 2017

arielb1 commented Mar 25, 2017

bors commented Mar 26, 2017

bors commented Mar 26, 2017

nikomatsakis commented Mar 27, 2017

nikomatsakis commented Mar 27, 2017

on-demand-ify custom_coerce_unsized_kind and inherent-impls #40683

on-demand-ify custom_coerce_unsized_kind and inherent-impls #40683

Conversation

nikomatsakis commented Mar 20, 2017

eddyb commented Mar 20, 2017

bors commented Mar 20, 2017

bors commented Mar 20, 2017

nikomatsakis commented Mar 20, 2017

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

nikomatsakis commented Mar 22, 2017

eddyb commented Mar 22, 2017

bors commented Mar 22, 2017

bors commented Mar 23, 2017

nikomatsakis commented Mar 23, 2017

bors commented Mar 23, 2017

bors commented Mar 25, 2017

bors commented Mar 25, 2017

arielb1 commented Mar 25, 2017

bors commented Mar 25, 2017

bors commented Mar 25, 2017

arielb1 commented Mar 25, 2017

bors commented Mar 25, 2017

bors commented Mar 25, 2017

arielb1 commented Mar 25, 2017

bors commented Mar 26, 2017

bors commented Mar 26, 2017

nikomatsakis commented Mar 27, 2017

nikomatsakis commented Mar 27, 2017

on-demand-ify `custom_coerce_unsized_kind` and `inherent-impls` #40683

on-demand-ify `custom_coerce_unsized_kind` and `inherent-impls` #40683