Queryify Vtable methods

[theotherjimmy]

This query might come with a downside: It converts an iterator to a Vec, which may increase the working set of rustc on programs that use many many traits (I think that's where this is used).

[rust-highfive]

Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @nikomatsakis (or someone else) soon.

If any changes to this PR are deemed necessary, please add them as extra commits. This ensures that the reviewer can see what has changed since they last reviewed the code. Due to the way GitHub handles out-of-date commits, this should also make it reasonably obvious what issues have or haven't been addressed. Large or tricky changes may require several passes of review and changes.

Please see the contribution instructions for more information.

[nikomatsakis]

Looks good! Left a few minor suggestions.

[nikomatsakis]

Returning Rc<Vec<Option<..>>> would be better.

[theotherjimmy]

Right! I had that change before, I should re-apply that patch.

[nikomatsakis]

This need not be public anymore.

[theotherjimmy]

🤦‍ Yep, Another one that I'll do real quick.

[theotherjimmy]

@nikomatsakis Thanks for the review. I corrected all of the minor suggestions.

[nikomatsakis]

@bors r+

[bors]

📌 Commit cb7e101 has been approved by nikomatsakis

[bors]

⌛ Testing commit cb7e1016e48ca77277d82d427971c0988ccda497 with merge e66fd14c879d45c57f5c293e922a72de6b666a0d...

[bors]

💔 Test failed - status-travis

[theotherjimmy]

I don't think this is my fault:

Failed to fetch URL https://dl.google.com/android/repository/addons_list-2.xml, reason: peer not authenticated

[kennytm]

@bors retry

• Android SDK HTTPS issue (fixed in ci: Fix installing the Android SDK #45193)

[bors]

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

[aidanhs]

@bors r=nikomatsakis

[bors]

📌 Commit 09258e7 has been approved by nikomatsakis

[aidanhs]

Wait @bors r-

[00:08:12] �[1m�[31merror�(B�[m�[1m: recursion limit reached while expanding the macro `stringify`�(B�[m
[00:08:12] �(B�[m�[1m�[34m--> �(B�[m/checkout/src/librustc/ty/maps/plumbing.rs:563:26�(B�[m
[00:08:12] �(B�[m�[1m�[34m|�(B�[m
[00:08:12] �[1m�[34m563�(B�[m �(B�[m�[1m�[34m| �(B�[m �(B�[m stringify!($name), key);�(B�[m
[00:08:12] �(B�[m�[1m�[34m| �(B�[m �(B�[m�[1m�[31m^^^^^^^^^^^^^^^^^�(B�[m
[00:08:12] �(B�[m�[1m�[34m| �(B�[m
[00:08:12] �(B�[m�[1m�[34m::: �(B�[m/checkout/src/librustc/ty/maps/mod.rs�(B�[m
[00:08:12] �(B�[m�[1m�[34m|�(B�[m
[00:08:12] �[1m�[34m78�(B�[m �(B�[m�[1m�[34m| �(B�[m�[1m�[34m/�(B�[m �(B�[mdefine_maps! { <'tcx>�(B�[m
[00:08:12] �[1m�[34m79�(B�[m �(B�[m�[1m�[34m| �(B�[m�[1m�[34m|�(B�[m �(B�[m /// Records the type of every item.�(B�[m
[00:08:12] �[1m�[34m80�(B�[m �(B�[m�[1m�[34m| �(B�[m�[1m�[34m|�(B�[m �(B�[m [] fn type_of: TypeOfItem(DefId) -> Ty<'tcx>,�(B�[m
[00:08:12] �[1m�[34m81�(B�[m �(B�[m�[1m�[34m| �(B�[m�[1m�[34m|�(B�[m
[00:08:12] �[1m�[34m...�(B�[m �(B�[m�[1m�[34m|�(B�[m
[00:08:12] �[1m�[34m341�(B�[m �(B�[m�[1m�[34m| �(B�[m�[1m�[34m|�(B�[m �(B�[m [] fn has_clone_closures: HasCloneClosures(CrateNum) -> bool,�(B�[m
[00:08:12] �[1m�[34m342�(B�[m �(B�[m�[1m�[34m| �(B�[m�[1m�[34m|�(B�[m �(B�[m}�(B�[m
[00:08:12] �(B�[m�[1m�[34m| �(B�[m�[1m�[34m|_-�(B�[m �(B�[m�[1m�[34min this macro invocation�(B�[m
[00:08:12] �(B�[m�[1m�[34m|�(B�[m
[00:08:12] �(B�[m�[1m�[34m= �(B�[m�[1mhelp�(B�[m: consider adding a `#![recursion_limit="512"]` attribute to your crate�(B�[m
[00:08:12] [00:08:12] �[m�[m�[31m�[1merror:�[m Could not compile `rustc`.

[theotherjimmy]

Well, the good is that I can reproduce the problem. The bad is that I have no idea why it's happening.

[theotherjimmy]

It seems like the macro that implements the provider structure, define_provider_struct!, was using some pretty heavy recursion to move data around. I'm working on a direct version of that macro now.

[theotherjimmy]

@nikomatsakis@michaelwoerister This change set now includes a big change to plumbing.rs, which should be scrutinized.

[nikomatsakis]

This change looks fine. It does mean we lose the ability to have modifiers that adjust the type of a query's field. At present, we are not using this capability (we used to be...), so that's probably ok, but we could also just lift the recursion-limit, right?

I'm ok either way, but let's also rebase and remove the merge commit.

[theotherjimmy]

Rebasing. Just a moment.

[theotherjimmy]

@nikomatsakis rebase complete. Merge commit removed.

[nikomatsakis]

@bors r+

[bors]

📌 Commit fcb8bc9 has been approved by nikomatsakis

[bors]

⌛ Testing commit fcb8bc9 with merge 3037965...

[bors]

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

[michaelwoerister]

🎉