Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Clean up hir::lowering #33532

Merged
merged 7 commits into from
May 14, 2016
Merged

Clean up hir::lowering #33532

merged 7 commits into from
May 14, 2016

Conversation

jseyfried
Copy link
Contributor

@jseyfried jseyfried commented May 10, 2016 •
edited
Loading

Clean up hir::lowering:

  • give lowering functions mutable access to the lowering context
  • refactor the lower_* functions and other functions that take a lowering context into methods
  • simplify the API that hir::lowering exposes to driver
  • other miscellaneous cleanups

r? @nrc

@nrc
Copy link
Member

nrc commented May 10, 2016

@bors: r+

@bors
Copy link
Contributor

bors commented May 10, 2016

📌 Commit 33978b0 has been approved by nrc

@Manishearth Manishearth mentioned this pull request May 12, 2016
Closed
@eddyb eddyb mentioned this pull request May 12, 2016
Closed
Manishearth added a commit to Manishearth/rust that referenced this pull request May 12, 2016
@Manishearth
Rollup merge of rust-lang#33532 - jseyfried:mutable_lowering_context,…
b2b1516 
… r=nrc

Clean up `hir::lowering`

Clean up `hir::lowering`:
 - give lowering functions mutable access to the lowering context
 - refactor the `lower_*` functions and other functions that take a lowering context into methods
 - simplify the API that `hir::lowering` exposes to `driver`
 - other miscellaneous cleanups

r? @nrc
@eddyb eddyb mentioned this pull request May 12, 2016
Closed
eddyb added a commit to eddyb/rust that referenced this pull request May 12, 2016
@eddyb
Rollup merge of rust-lang#33532 - jseyfried:mutable_lowering_context,…
8f547f0 
… r=nrc

Clean up `hir::lowering`

Clean up `hir::lowering`:
 - give lowering functions mutable access to the lowering context
 - refactor the `lower_*` functions and other functions that take a lowering context into methods
 - simplify the API that `hir::lowering` exposes to `driver`
 - other miscellaneous cleanups

r? @nrc
@eddyb eddyb mentioned this pull request May 12, 2016
Closed
bors added a commit that referenced this pull request May 12, 2016
@bors
Auto merge of #33597 - eddyb:rollup, r=eddyb
2c5ce8c 
Rollup of 23 pull requests

- Successful merges: #33282, #33342, #33393, #33450, #33513, #33517, #33531, #33532, #33533, #33534, #33538, #33541, #33544, #33552, #33555, #33560, #33563, #33565, #33566, #33572, #33580, #33590, #33596
- Failed merges: #33578
@eddyb eddyb mentioned this pull request May 13, 2016
Closed
eddyb added a commit to eddyb/rust that referenced this pull request May 13, 2016
@eddyb
Rollup merge of rust-lang#33532 - jseyfried:mutable_lowering_context,…
76794b6 
… r=nrc

Clean up `hir::lowering`

Clean up `hir::lowering`:
 - give lowering functions mutable access to the lowering context
 - refactor the `lower_*` functions and other functions that take a lowering context into methods
 - simplify the API that `hir::lowering` exposes to `driver`
 - other miscellaneous cleanups

r? @nrc
@bors
Copy link
Contributor

bors commented May 14, 2016

⌛ Testing commit 33978b0 with merge dee865a...

bors added a commit that referenced this pull request May 14, 2016
@bors
Auto merge of #33532 - jseyfried:mutable_lowering_context, r=nrc
dee865a 
Clean up `hir::lowering`

Clean up `hir::lowering`:
 - give lowering functions mutable access to the lowering context
 - refactor the `lower_*` functions and other functions that take a lowering context into methods
 - simplify the API that `hir::lowering` exposes to `driver`
 - other miscellaneous cleanups

r? @nrc
@bors
Copy link
Contributor

bors commented May 14, 2016

☀️ Test successful - auto-linux-32-nopt-t, auto-linux-32-opt, auto-linux-32cross-opt, auto-linux-64-cargotest, auto-linux-64-cross-armhf, auto-linux-64-cross-armsf, auto-linux-64-cross-freebsd, auto-linux-64-cross-netbsd, auto-linux-64-debug-opt, auto-linux-64-nopt-t, auto-linux-64-opt, auto-linux-64-opt-mir, auto-linux-64-opt-rustbuild, auto-linux-64-x-android-t, auto-linux-cross-opt, auto-linux-musl-64-opt, auto-mac-32-opt, auto-mac-64-nopt-t, auto-mac-64-opt, auto-mac-64-opt-rustbuild, auto-mac-cross-ios-opt, auto-win-gnu-32-nopt-t, auto-win-gnu-32-opt, auto-win-gnu-32-opt-rustbuild, auto-win-gnu-64-nopt-t, auto-win-gnu-64-opt, auto-win-msvc-32-cross-opt, auto-win-msvc-32-opt, auto-win-msvc-64-cargotest, auto-win-msvc-64-opt, auto-win-msvc-64-opt-mir, auto-win-msvc-64-opt-rustbuild

@bors bors merged commit 33978b0 into rust-lang:master May 14, 2016
This was referenced May 14, 2016
Merged
Merged
Closed
Merged
@joelself
Copy link

joelself commented May 24, 2016 •
edited
Loading

What gives? I checked the merge request and apparently it has been merged into master. But the current file doesn't show the changes. I even cloned the repo and checked the file myself and it is unchanged. Even the history of the file doesn't show any changes 10 days ago which is when the merge supposedly happened.

I cloned jseyfried's rust fork, checked out the mutable_lowering_context branch then did a pull against rust-lang:master and ended up with the same old file. The git log then shows this pull request's changes several commits back, but it looks like subsequent commits undid them. Was that intentional? Especially given that the change to lowering.rs was so big?

Should I base my work on the refactored lowering.hir or the current lowering.hir in the master branch of the rust-lang repo?

Edit: After looking at it some more it seems it was refactored again and it just happens to make the code I want to change look a lot like the original code from before the merge. So I guess never mind.

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

@nrc nrc

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@jseyfried @nrc @bors @joelself