HirIdification: almost there #58915

ljedrz · 2019-03-04T14:46:14Z

The next iteration of HirIdification (#57578).

Replaces a bunch of NodeId method calls (mostly as_local_node_id) with HirId ones.

Removes NodeId from:

PathSegment
PatKind
Destination (replaces it with HirId)

In addition this PR also removes Visitor::visit_def_mention, which doesn't seem to be doing anything.

rust-highfive · 2019-03-04T14:46:18Z

r? @cramertj

(rust_highfive has picked a reviewer for you, use r? to override)

ljedrz · 2019-03-04T14:46:29Z

r? @Zoxc

Zoxc · 2019-03-04T16:18:05Z

src/librustc/hir/map/mod.rs

-            span_bug!(self.span(id), "body_owned_by: {} has no associated body",
-                      self.node_to_string(id));
+    pub fn body_owned_by(&self, id: HirId) -> BodyId {
+        self.maybe_body_owned_by_by_hir_id(id).unwrap_or_else(|| {


Maybe rename maybe_body_owned_by_by_hir_id to maybe_body_owned_by_hir_id? =P

Yeah, that one does sound silly ^^. I'm hoping to soon be able to just remove it in favor of just maybe_body_owned_by.

Zoxc · 2019-03-04T16:48:50Z

@bors r+

bors · 2019-03-04T16:48:51Z

📌 Commit 296eaa520d1d1e1f2e582b05e2dfe06ee2cbe87f has been approved by Zoxc

bors · 2019-03-07T03:41:50Z

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

ljedrz · 2019-03-07T08:23:51Z

Rebased.

Zoxc · 2019-03-07T18:54:10Z

@bors delegate+ r+

bors · 2019-03-07T18:54:11Z

📌 Commit cd06038 has been approved by Zoxc

bors · 2019-03-07T18:54:12Z

🌲 The tree is currently closed for pull requests below priority 500, this pull request will be tested once the tree is reopened

bors · 2019-03-07T18:54:13Z

✌️ @ljedrz can now approve this pull request

felix91gr · 2019-03-08T01:38:16Z

I don't know where to ask this otherwise, so please forgive me if the question is out of band.

Question:

I'm seeing HirIdification all over rustc and clippy. Is HirId intended to replace all uses of NodeId eventually? I'm asking because I'm working on a Clippy lint that tries to evaluate some values in order to detect a null -> reference tranmute call. When implementing evaluation of local variables (the one case we're missing), I saw that I needed to evaluate a Def::Local value, which as you can see in the link still uses NodeId.

Therefore, should I wait until the full HirIdification, or will this usage of NodeId keep being at the syntax-level?

Thank you so much, and sorry for disrupting your work 🙇‍♂️

Zoxc · 2019-03-08T02:02:47Z

@felix91gr Eventually all NodeId uses after lowering to HIR will be replaced with HirId. NodeIds will still be used before that.

You can freely convert between NodeId and HirId though with tcx.hir().hir_to_node_id and tcx.hir().node_to_hir_id, so I don't see good reason to wait for anything here. You may just have to remove these calls and update your types later on.

felix91gr · 2019-03-08T02:17:08Z

Eventually all NodeId uses after lowering to HIR will be replaced with HirId. NodeIds will still be used before that.

Ah, cool, that makes perfect sense :) thanks!

You can freely convert between NodeId and HirId though.

Ohhhhh! That's great, I didn't know that! Thank you 😊

ljedrz · 2019-03-08T09:47:38Z

@bors r=Zoxc

bors · 2019-03-08T09:47:39Z

📌 Commit d7120e4 has been approved by Zoxc

ljedrz · 2019-03-08T11:32:12Z

Added a clippy update that supersedes #58966. Bumping priority to 1.

@bors r=Zoxc p=1

bors · 2019-03-08T11:32:13Z

📌 Commit 24fad4c has been approved by Zoxc

bors · 2019-03-08T13:49:17Z

⌛ Testing commit 24fad4c with merge 2a65cbe...

HirIdification: almost there The next iteration of HirIdification (#57578). Replaces a bunch of `NodeId` method calls (mostly `as_local_node_id`) with `HirId` ones. Removes `NodeId` from: - [x] `PathSegment` - [x] `PatKind` - [x] `Destination` (replaces it with `HirId`) In addition this PR also removes `Visitor::visit_def_mention`, which doesn't seem to be doing anything.

bors · 2019-03-08T17:03:34Z

☀️ Test successful - checks-travis, status-appveyor
Approved by: Zoxc
Pushing 2a65cbe to master...

rust-highfive assigned cramertj Mar 4, 2019

rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Mar 4, 2019

rust-highfive assigned Zoxc and unassigned cramertj Mar 4, 2019

Zoxc reviewed Mar 4, 2019

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 Mar 4, 2019

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-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Mar 7, 2019

HirIdification: replace NodeId method calls

cd06038

ljedrz force-pushed the deprecate_nodeid_methods branch from 296eaa5 to cd06038 Compare March 7, 2019 08:23

ljedrz added 4 commits March 7, 2019 09:25

hir: remove NodeId from PathSegment

78f91e3

hir: remove NodeId from PatKind

558a07b

hir: replace NodeId with HirId in Destination

42fbcb5

hir: remove Visitor::visit_def_mention

e780daf

ljedrz mentioned this pull request Mar 7, 2019

HirIdification: almost there #58992

Closed

3 tasks

hir: remove some obsolete NodeId methods

d7120e4

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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Mar 7, 2019

ljedrz changed the title ~~HirIdification: replace NodeId method calls~~ HirIdification: almost there Mar 8, 2019

update clippy

24fad4c

ljedrz mentioned this pull request Mar 8, 2019

Update Clippy #58966

Closed

bors added the merged-by-bors This PR was explicitly merged by bors. label Mar 8, 2019

bors merged commit 24fad4c into rust-lang:master Mar 8, 2019

bors mentioned this pull request Mar 8, 2019

Make the rustc driver and interface demand driven #56732

Merged

ljedrz deleted the deprecate_nodeid_methods branch March 8, 2019 17:06

bors mentioned this pull request Mar 8, 2019

overhaul intra-doc-link ambiguity warning #58824

Merged

HirIdification: almost there #58915

HirIdification: almost there #58915

Uh oh!

Conversation

ljedrz commented Mar 4, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

rust-highfive commented Mar 4, 2019

Uh oh!

ljedrz commented Mar 4, 2019

Uh oh!

Zoxc Mar 4, 2019

Choose a reason for hiding this comment

Uh oh!

ljedrz Mar 4, 2019

Choose a reason for hiding this comment

Uh oh!

Zoxc commented Mar 4, 2019

Uh oh!

bors commented Mar 4, 2019

Uh oh!

bors commented Mar 7, 2019

Uh oh!

ljedrz commented Mar 7, 2019

Uh oh!

Zoxc commented Mar 7, 2019

Uh oh!

bors commented Mar 7, 2019

Uh oh!

bors commented Mar 7, 2019

Uh oh!

bors commented Mar 7, 2019

Uh oh!

felix91gr commented Mar 8, 2019

Uh oh!

Zoxc commented Mar 8, 2019

Uh oh!

felix91gr commented Mar 8, 2019

Uh oh!

ljedrz commented Mar 8, 2019

Uh oh!

bors commented Mar 8, 2019

Uh oh!

ljedrz commented Mar 8, 2019

Uh oh!

bors commented Mar 8, 2019

Uh oh!

bors commented Mar 8, 2019

Uh oh!

bors commented Mar 8, 2019

Uh oh!

Uh oh!

ljedrz commented Mar 4, 2019 •

edited

Loading