Skip to content

Rename HAIR to THIR (Typed HIR).#74582

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

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

Conversation

@Lezzz
Copy link
Contributor

@Lezzz Lezzz commented Jul 21, 2020 •
edited
Loading

r? @nikomatsakis

Originally suggested by @eddyb

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

nikomatsakis commented Jul 21, 2020

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
Copy link
Contributor

mark-i-m commented Jul 21, 2020

I still regret the HAIR loss...

@nagisa
Copy link
Member

nagisa commented Jul 21, 2020

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.

@JohnTitor JohnTitor mentioned this pull request Jul 21, 2020
Closed
@bors
Copy link
Collaborator

bors commented Jul 24, 2020

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

@wesleywiser
Copy link
Member

wesleywiser commented Jul 24, 2020

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.

@JohnTitor JohnTitor 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
Copy link
Collaborator

bors commented Jul 30, 2020

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

@JohnTitor JohnTitor 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
Copy link
Member

JohnTitor commented Jul 31, 2020

r? @wesleywiser

@nikomatsakis
Copy link
Contributor

nikomatsakis commented Jul 31, 2020

@bors r+

@bors
Copy link
Collaborator

bors commented Jul 31, 2020

📌 Commit b9ac3f3 has been approved by nikomatsakis

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

r? @nikomatsakis

Originally suggested by @eddyb
@Manishearth Manishearth mentioned this pull request Jul 31, 2020
Closed
@bors
Copy link
Collaborator

bors commented Jul 31, 2020

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

@bors 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 Jul 31, 2020
@eddyb
Copy link
Member

eddyb commented Aug 1, 2020

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

@bors
Copy link
Collaborator

bors commented Aug 1, 2020

📌 Commit 40e6dcc has been approved by nikomatsakis

@bors 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 Aug 1, 2020
@bors
Copy link
Collaborator

bors commented Aug 1, 2020

⌛ Testing commit 40e6dcc with merge dfe1e3b...

@bors
Copy link
Collaborator

bors commented Aug 1, 2020

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

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

Reviewers

No reviews

Assignees

@wesleywiser wesleywiser

Labels

merged-by-bors This PR was explicitly merged by bors. S-waiting-on-bors Status: 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