query for describe_def #41534

hackeryarn · 2017-04-25T13:31:50Z

Resolves fn describe_def(&self, def: DefId) -> Option<Def>; of #41417.

r? @nikomatsakis I would greatly appreciate a review. I hope I covered everything described in the pr.

rust-highfive · 2017-04-25T13:32:04Z

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.

hackeryarn · 2017-04-25T13:59:00Z

I apologize, looks like my check didn't fully finish before the push. There was a runtime error at the end of compilation. I am working to try and resolve it now.

nikomatsakis

This looks good, modulo the question of naming. I'd bet that @eddyb has an opinion on that. :)

nikomatsakis · 2017-04-25T14:32:16Z

src/librustc/middle/stability.rs

@@ -432,7 +432,7 @@ impl<'a, 'gcx, 'tcx> TyCtxt<'a, 'gcx, 'tcx> {
    // (See issue #38412)
    fn skip_stability_check_due_to_privacy(self, mut def_id: DefId) -> bool {
        // Check if `def_id` is a trait method.
-        match self.sess.cstore.describe_def(def_id) {
+        match ty::queries::describe_def::get(self, DUMMY_SP, def_id) {


Ah, I guess that since @eddyb's #41504 has not landed yet, this is still the correct form. Perhaps though we want to name the query def_of, in anticipation of that PR's new conventions? (And this would then become self.def_of(def_id).)

hackeryarn · 2017-04-25T14:47:30Z

@nikomatsakis I am actually a bit stuck. I would greatly appreciate any assistance here. I seem to be getting a fairly cryptic error which I am not sure how to fix. All the basic check pass fine, but then it fails further down the compilation path.

Compiling std_unicode v0.0.0 (file:///Users/achernyak/dev/rust/src/libstd_unicode)
error: internal compiler error: src/librustc/ty/maps.rs:388: tcx.maps.describe_def(DefId { krate: CrateNum(1), node: DefIndex(25) => core/6436b
dfbb8ae081f8c267683c0924cd8::isize[0] }) unsupported by its crate

Similar error in a few other places.

error: Could not compile `alloc`.
Build failed, waiting for other jobs to finish...
error: internal compiler error: src/librustc/ty/maps.rs:388: tcx.maps.describe_def(DefId { krate: CrateNum(1), node: DefIndex(3068) => core/643
6bdfbb8ae081f8c267683c0924cd8::fmt[0] }) unsupported by its crate

eddyb · 2017-04-25T14:49:49Z

src/librustc_metadata/cstore_impl.rs

@@ -120,11 +120,6 @@ impl CrateStore for cstore::CStore {
        self.get_crate_data(krate)
    }

-    fn describe_def(&self, def: DefId) -> Option<Def> {


You didn't move this to the macro invocation at the top of this file so there's no way for it to actually do anything right now.

eddyb · 2017-04-25T14:50:51Z

Also, it'd be nice if the current crate supported the query, but this PR doesn't have to do it.

nikomatsakis · 2017-04-25T14:57:10Z

@achernyak

I am actually a bit stuck. I would greatly appreciate any assistance here. I seem to be getting a fairly cryptic error which I am not sure how to fix. All the basic check pass fine, but then it fails further down the compilation path.

As @eddyb's comment indicated, you have to add the provider code into the provide! macro located a few lines above. Something like this should suffice:

describe_def => { cdata.get_def(def_id.index) }

hackeryarn · 2017-04-25T15:13:05Z

@eddyb I think this would be a great place for the current crate to support the query. This is part of a PR that would result in a lot of queries being added. I think it would be nice to not backtrack on all of them to add support.

If we go that direction, I might need a little bit of assistance on how to support the query since I am new to the code base.

eddyb · 2017-04-25T15:19:59Z

@achernyak You could take at look in src/librustc/ty/mod.rs to see the providers there.
The only tricky part is turning a hir::map::Node into a Def, which we don't do anywhere directly (librustc_resolve creates Def from the AST but it's nothing like this).

hackeryarn · 2017-04-25T17:50:31Z

This should have fixed all the issue on the basic implementation I will have to dig into the providers tomorrow.

hackeryarn · 2017-04-26T12:28:05Z

src/librustc_const_eval/eval.rs

@@ -68,7 +68,7 @@ pub fn lookup_const_by_id<'a, 'tcx>(tcx: TyCtxt<'a, 'tcx, 'tcx>,
            _ => Some((def_id, substs))
        }
    } else {
-        match tcx.sess.cstore.describe_def(def_id) {
+        match ty::queries::describe_def::get(tcx, DUMMY_SP, def_id) {


@eddyb this might be a dumb question but, when implementing a provider in src/librustc/ty/mod.rs, why don't we just call the query in this manner and passing it tcx?

It seems to provide the same type and perform a similar function.

A provider provides... the query implementation 😆

haha everything makes a lot more sense now 😊

@achernyak Hmm, any chance you can squash all of those commits into one and rebase on top of master? At this point I believe your branch doesn't conflict in the diff, but #41504 changed how queries are involved (i.e. it'd be just tcx.describe_def(def_id) now, here and in the two other places).

eddyb · 2017-04-26T13:50:53Z

src/librustc/ty/mod.rs

+fn describe_def<'a, 'tcx>(tcx: TyCtxt<'a, 'tcx, 'tcx>,
+                          def_id: DefId)
+                          -> Option<Def> {
+    ty::queries::describe_def::get(tcx, DUMMY_SP, def_id)


This is just an infinite loop though. You're providing the describe_def query for the local crate as querying describe_def again with the same key.

eddyb · 2017-04-27T00:40:00Z

src/librustc/ty/mod.rs

+   let id = tcx.hir.as_local_node_id(def_id).unwrap();
+   let item = tcx.hir.expect_item(id);
+   match item.node{
+       hir::ItemTrait(..) => Some(Def::Trait(def_id)),


This appears to be correct, although expect_item above is too restrictive and there's a dozen or so cases left to handle, of course.

However, I'd like to merge the original PR, without this change, as we're not using this right now.

hackeryarn · 2017-04-27T00:41:24Z

src/librustc/ty/mod.rs

+   let item = tcx.hir.expect_item(id);
+   match item.node{
+       hir::ItemTrait(..) => Some(Def::Trait(def_id)),
+       _ => None


@eddyb I hope this is the implementation you had in mind. It's the only way I could see of turning the hir::map::Node into a Def.

I also wasn't sure what would be the appropriate Def type to use for an hir::ItemImpl therefore I left it as None, but I would be happy to change it to any type you would suggest.

There are way more Def variants than that ;). Anyway, see #41534 (comment)

You are right that was only the traits node I was looking at. There has to be a better way to handle this matching than to hand roll all these matchers... I will just have to leave that to someone more familiar than me.

hackeryarn · 2017-04-27T01:06:29Z

Everything has been squashed and query calls updated.

@eddyb @nikomatsakis Thank you both so much for all the help on this PR. I learned a lot and look forward making my way through the other conversions.

eddyb · 2017-04-27T01:08:02Z

src/librustc/middle/stability.rs

@@ -432,7 +432,7 @@ impl<'a, 'gcx, 'tcx> TyCtxt<'a, 'gcx, 'tcx> {
    // (See issue #38412)
    fn skip_stability_check_due_to_privacy(self, mut def_id: DefId) -> bool {
        // Check if `def_id` is a trait method.
-        match self.sess.cstore.describe_def(def_id) {
+        match self.describe_def::get(def_id) {


You can just remove the ::get.

eddyb · 2017-04-27T01:15:05Z

@bors r+ Thanks!

bors · 2017-04-27T01:15:06Z

📌 Commit 73c25b2 has been approved by eddyb

bors · 2017-04-27T07:55:50Z

⌛ Testing commit 73c25b2 with merge d23ef77...

bors · 2017-04-27T07:57:02Z

💔 Test failed - status-appveyor

aidanhs · 2017-04-27T09:00:02Z

@bors retry

Appveyor network issues https://appveyor.statuspage.io/incidents/06gzq846jl9x

@nikomatsakis

query for describe_def Resolves `fn describe_def(&self, def: DefId) -> Option<Def>;` of rust-lang#41417. r? @nikomatsakis I would greatly appreciate a review. I hope I covered everything described in the pr.

bors · 2017-04-27T16:40:46Z

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

eddyb · 2017-04-27T18:28:43Z

@bors r+

bors · 2017-04-27T18:28:44Z

📌 Commit e24003f has been approved by eddyb

@nikomatsakis

query for describe_def Resolves `fn describe_def(&self, def: DefId) -> Option<Def>;` of rust-lang#41417. r? @nikomatsakis I would greatly appreciate a review. I hope I covered everything described in the pr.

bors · 2017-04-28T03:33:09Z

⌛ Testing commit e24003f with merge 1229b46...

frewsxcv · 2017-04-28T03:42:59Z

@bors retry - prioritizing rollup

@nikomatsakis

query for describe_def Resolves `fn describe_def(&self, def: DefId) -> Option<Def>;` of rust-lang#41417. r? @nikomatsakis I would greatly appreciate a review. I hope I covered everything described in the pr.

Rollup of 4 pull requests - Successful merges: #41534, #41546, #41571, #41583 - Failed merges:

@eddyb

query for def_span Resolves `fn def_span(&self, sess: &Session, def: DefId) -> Span;` of #41417. I had to change the query name to `def_sess_span` since `ty::TyCtxt` already has a method `def_span` implemented. This also will probably have merge conflicts with #41534 but I will resolves those once it's merged and wanted to start a code review on this one now. r? @eddyb

rust-highfive assigned nikomatsakis Apr 25, 2017

nikomatsakis approved these changes Apr 25, 2017

View reviewed changes

eddyb reviewed Apr 25, 2017

View reviewed changes

hackeryarn commented Apr 26, 2017

View reviewed changes

eddyb reviewed Apr 26, 2017

View reviewed changes

aidanhs added the S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. label Apr 26, 2017

eddyb reviewed Apr 27, 2017

View reviewed changes

hackeryarn commented Apr 27, 2017

View reviewed changes

hackeryarn force-pushed the master branch from a5cb283 to 96c9a9d Compare April 27, 2017 01:05

eddyb reviewed Apr 27, 2017

View reviewed changes

hackeryarn force-pushed the master branch from 96c9a9d to 73c25b2 Compare April 27, 2017 01:10

eddyb approved these changes Apr 27, 2017

View reviewed changes

frewsxcv mentioned this pull request Apr 27, 2017

Rollup of 4 pull requests #41573

Closed

arielb1 mentioned this pull request Apr 27, 2017

Rollup of 10 pull requests #41579

Closed

query for describe_def

e24003f

hackeryarn force-pushed the master branch from ebd5641 to e24003f Compare April 27, 2017 18:27

frewsxcv mentioned this pull request Apr 27, 2017

Rollup of 8 pull requests #41585

Closed

hackeryarn mentioned this pull request Apr 28, 2017

query for def_span #41593

Merged

frewsxcv mentioned this pull request Apr 28, 2017

Rollup of 5 pull requests #41594

Closed

frewsxcv mentioned this pull request Apr 28, 2017

Rollup of 4 pull requests #41595

Closed

frewsxcv mentioned this pull request Apr 28, 2017

Rollup of 4 pull requests #41596

Closed

frewsxcv mentioned this pull request Apr 28, 2017

Rollup of 4 pull requests #41598

Merged

bors added a commit that referenced this pull request Apr 28, 2017

Auto merge of #41598 - frewsxcv:rollup, r=frewsxcv

ace517d

Rollup of 4 pull requests - Successful merges: #41534, #41546, #41571, #41583 - Failed merges:

bors merged commit e24003f into rust-lang:master Apr 28, 2017

nikomatsakis mentioned this pull request May 5, 2017

incr.comp.: Crate Metadata not corresponding to a DefId is untracked. #41417

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

query for describe_def #41534

query for describe_def #41534

hackeryarn commented Apr 25, 2017

rust-highfive commented Apr 25, 2017

hackeryarn commented Apr 25, 2017

nikomatsakis left a comment

nikomatsakis Apr 25, 2017

hackeryarn commented Apr 25, 2017 •

edited

Loading

eddyb Apr 25, 2017

eddyb commented Apr 25, 2017

nikomatsakis commented Apr 25, 2017

hackeryarn commented Apr 25, 2017

eddyb commented Apr 25, 2017

hackeryarn commented Apr 25, 2017

hackeryarn Apr 26, 2017 •

edited

Loading

eddyb Apr 26, 2017

hackeryarn Apr 26, 2017

eddyb Apr 27, 2017

eddyb Apr 26, 2017

eddyb Apr 27, 2017

hackeryarn Apr 27, 2017 •

edited

Loading

eddyb Apr 27, 2017

hackeryarn Apr 27, 2017

hackeryarn commented Apr 27, 2017

eddyb Apr 27, 2017

eddyb commented Apr 27, 2017

bors commented Apr 27, 2017

bors commented Apr 27, 2017

bors commented Apr 27, 2017

aidanhs commented Apr 27, 2017

bors commented Apr 27, 2017

eddyb commented Apr 27, 2017

bors commented Apr 27, 2017

bors commented Apr 28, 2017

frewsxcv commented Apr 28, 2017

query for describe_def #41534

query for describe_def #41534

Conversation

hackeryarn commented Apr 25, 2017

rust-highfive commented Apr 25, 2017

hackeryarn commented Apr 25, 2017

nikomatsakis left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

hackeryarn commented Apr 25, 2017 • edited Loading

Choose a reason for hiding this comment

eddyb commented Apr 25, 2017

nikomatsakis commented Apr 25, 2017

hackeryarn commented Apr 25, 2017

eddyb commented Apr 25, 2017

hackeryarn commented Apr 25, 2017

hackeryarn Apr 26, 2017 • edited Loading

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

hackeryarn Apr 27, 2017 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

hackeryarn commented Apr 27, 2017

Choose a reason for hiding this comment

eddyb commented Apr 27, 2017

bors commented Apr 27, 2017

bors commented Apr 27, 2017

bors commented Apr 27, 2017

aidanhs commented Apr 27, 2017

bors commented Apr 27, 2017

eddyb commented Apr 27, 2017

bors commented Apr 27, 2017

bors commented Apr 28, 2017

frewsxcv commented Apr 28, 2017

hackeryarn commented Apr 25, 2017 •

edited

Loading

hackeryarn Apr 26, 2017 •

edited

Loading

hackeryarn Apr 27, 2017 •

edited

Loading