Skip to content

Rename tcx.map to the far more descriptive tcx.hir.#39309

Merged
bors merged 2 commits into
rust-lang:masterfrom
eddyb:map-shmap
Jan 26, 2017
Merged

Rename tcx.map to the far more descriptive tcx.hir.#39309
bors merged 2 commits into
rust-lang:masterfrom
eddyb:map-shmap

Conversation

@eddyb

@eddyb eddyb commented Jan 26, 2017

Copy link
Copy Markdown
Contributor

Also a bit more renaming because ast_map and 'ast were still used with HIR.
Main motivation is to "free up" tcx.map, or rather, tcx.maps, to consolidate ty::maps there.

r? @nikomatsakis

@bors

bors commented Jan 26, 2017

Copy link
Copy Markdown
Collaborator

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

@nikomatsakis

Copy link
Copy Markdown
Contributor

@bors r+ p=1

  • Very likely to bitrot

@bors

bors commented Jan 26, 2017

Copy link
Copy Markdown
Collaborator

📌 Commit 1ff3641 has been approved by nikomatsakis

@bors

bors commented Jan 26, 2017

Copy link
Copy Markdown
Collaborator

⌛ Testing commit 1ff3641 with merge 491b978...

bors added a commit that referenced this pull request Jan 26, 2017
Rename tcx.map to the far more descriptive tcx.hir.

Also a bit more renaming because `ast_map` and `'ast` were still used with HIR.
Main motivation is to "free up" `tcx.map`, or rather, `tcx.maps`, to consolidate `ty::maps` there.

r? @nikomatsakis
@bors

bors commented Jan 26, 2017

Copy link
Copy Markdown
Collaborator

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants