Skip to content

Rename HAIR to THIR (Typed HIR). - #74582

Merged
bors merged 1 commit into
rust-lang:masterfrom
Lezzz:rename-hair
Aug 1, 2020
Merged

Rename HAIR to THIR (Typed HIR).#74582
bors merged 1 commit into
rust-lang:masterfrom
Lezzz:rename-hair

Conversation

@Lezzz

@LezzzLezzz commented Jul 21, 2020•
edited
Loading

Copy link
Copy Markdown
Contributor

r? @nikomatsakis

Originally suggested by @eddyb

@rust-highfiverust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jul 21, 2020
@nikomatsakis

nikomatsakis commented Jul 21, 2020

Copy link
Copy Markdown
Contributor

Probably a better name, I admit.

We probably will want to update the rustc-dev-guide too (cc @rust-lang/wg-rustc-dev-guide). I'm not sure whether this ought to merit an MCP (cc @rust-lang/compiler, thoughts?).

@mark-i-m

mark-i-m commented Jul 21, 2020

Copy link
Copy Markdown
Contributor

I still regret the HAIR loss...

@nagisa

nagisa commented Jul 21, 2020

Copy link
Copy Markdown
Member

I'm not sure whether this ought to merit an MCP

IMHO we can do without one here. HAIR is a comparatively obscure internal representation not many interact with or will have an opinion about.

@JohnTitorJohnTitor mentioned this pull request Jul 21, 2020
Closed
@bors

bors commented Jul 24, 2020

Copy link
Copy Markdown
Collaborator

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

@wesleywiser

wesleywiser commented Jul 24, 2020

Copy link
Copy Markdown
Member

Judging by the reactions to @nagisa's comment, it seems like most of the compiler team is in favor of this change. I think this can be r+'d after a rebase.

@JohnTitorJohnTitor 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-review Status: Awaiting review from the assignee but also interested parties. labels Jul 28, 2020
@bors

bors commented Jul 30, 2020

Copy link
Copy Markdown
Collaborator

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

@JohnTitorJohnTitor added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Jul 31, 2020
@JohnTitor

JohnTitor commented Jul 31, 2020

Copy link
Copy Markdown
Member

r? @wesleywiser

@nikomatsakis

nikomatsakis commented Jul 31, 2020

Copy link
Copy Markdown
Contributor

@bors r+

@bors

bors commented Jul 31, 2020

Copy link
Copy Markdown
Collaborator

📌 Commit b9ac3f3 has been approved by nikomatsakis

@borsbors 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 Jul 31, 2020
Manishearth added a commit to Manishearth/rust that referenced this pull request Jul 31, 2020
@Manishearth
Rollup merge ofrust-lang#74582- Lezzz:rename-hair, r=nikomatsakis
0795348
Rename HAIR to THIR (Typed HIR).
r? @nikomatsakis
Originally suggested by @eddyb
@ManishearthManishearth mentioned this pull request Jul 31, 2020
Closed
@bors

bors commented Jul 31, 2020

Copy link
Copy Markdown
Collaborator

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

@borsbors 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 Jul 31, 2020
@eddyb

eddyb commented Aug 1, 2020

Copy link
Copy Markdown
Contributor

@bors r=nikomatsakis rollup=never p=1 (somewhat prone to conflict)

@bors

bors commented Aug 1, 2020

Copy link
Copy Markdown
Collaborator

📌 Commit 40e6dcc has been approved by nikomatsakis

@borsbors 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 Aug 1, 2020
@bors

bors commented Aug 1, 2020

Copy link
Copy Markdown
Collaborator

⌛ Testing commit 40e6dcc with merge dfe1e3b...

@bors

bors commented Aug 1, 2020

Copy link
Copy Markdown
Collaborator

☀️ Test successful - checks-actions, checks-azure
Approved by: nikomatsakis
Pushing dfe1e3b to master...

@borsbors added the merged-by-bors This PR was explicitly merged by bors. label Aug 1, 2020
@bors
bors merged commit dfe1e3b into rust-lang:masterAug 1, 2020
@JohnTitorJohnTitor mentioned this pull request Aug 1, 2020
Merged
@Lezzz
Lezzz deleted the rename-hair branch August 3, 2020 07:56
@cuvipercuviper added this to the 1.47.0 milestone May 2, 2024
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

@wesleywiserwesleywiser

Labels

merged-by-borsThis PR was explicitly merged by bors.S-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.

Projects

None yet

Milestone

1.47.0

Development

Successfully merging this pull request may close these issues.

10 participants

@Lezzz@nikomatsakis@mark-i-m@nagisa@bors@wesleywiser@JohnTitor@eddyb@cuviper@rust-highfive