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.

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

Adapted `trans::common::{block, fn_ctxt, scope_info}` to new naming convention. #7848

Closed
wants to merge 1 commit into
base: master
from

Conversation

Projects
None yet
4 participants
@michaelwoerister
Contributor

michaelwoerister commented Jul 17, 2013

The following types are renamed:

block_ => Block
block => @mut Block

fn_ctx_ => FunctionContext
fn_ctx => @mut FunctionContext

scope_info => ScopeInfo

I also tried to convert instances of @mut to &mut or & but a lot of them are blocked by issue #6268, so I left it for some time later.

@michaelwoerister

This comment has been minimized.

Contributor

michaelwoerister commented Jul 18, 2013

Rebased and fixed merge conflicts.

@jdm

This comment has been minimized.

Contributor

jdm commented Jul 18, 2013

Looks like this needs a rebase again :P

@michaelwoerister

This comment has been minimized.

Contributor

michaelwoerister commented Jul 18, 2013

Done. Probably not the last time. But the merge conflicts are rather easy to resolve.

@huonw

This comment has been minimized.

Member

huonw commented Jul 21, 2013

@michaelwoerister, needs another rebase!

@michaelwoerister

This comment has been minimized.

Contributor

michaelwoerister commented Jul 21, 2013

Done.

bors added a commit that referenced this pull request Jul 22, 2013

auto merge of #7848 : michaelwoerister/rust/trans_cleanup_1, r=jdm
The following types are renamed:
```rust
block_ => Block
block => @mut Block

fn_ctx_ => FunctionContext
fn_ctx => @mut FunctionContext

scope_info => ScopeInfo
```
I also tried to convert instances of `@mut` to `&mut` or `&` but a lot of them are blocked by issue #6268, so I left it for some time later.
@michaelwoerister

This comment has been minimized.

Contributor

michaelwoerister commented Jul 22, 2013

Is this test failing my fault? It seems to have gone unresponsive.

@jdm

This comment has been minimized.

Contributor

jdm commented Jul 22, 2013

Aaaaaaaaand rebase required again. The downside of big cleanups :P

@michaelwoerister

This comment has been minimized.

Contributor

michaelwoerister commented Jul 22, 2013

Well, that's what I signed up for here :)

@michaelwoerister

This comment has been minimized.

Contributor

michaelwoerister commented Jul 23, 2013

Well, this one is entirely my fault. I forgot to stage the changes before doing the commit --amend.
I did another rebase and am running make check right now. Sorry for the trouble...

@michaelwoerister

This comment has been minimized.

Contributor

michaelwoerister commented Jul 23, 2013

@jdm Please re-approve.

@jdm

This comment has been minimized.

jdm commented on 3315edf Jul 23, 2013

@bors: retry

This comment has been minimized.

jdm replied Jul 23, 2013

r+

@bors

This comment has been minimized.

Contributor

bors commented on 3315edf Jul 23, 2013

saw approval from jdm
at michaelwoerister@3315edf

This comment has been minimized.

Contributor

bors replied Jul 23, 2013

merging michaelwoerister/rust/trans_cleanup_1 = 3315edf into auto

This comment has been minimized.

Contributor

bors replied Jul 23, 2013

michaelwoerister/rust/trans_cleanup_1 = 3315edf merged ok, testing candidate = 3bf66991

This comment has been minimized.

Contributor

bors replied Jul 23, 2013

saw approval from jdm
at michaelwoerister@3315edf

This comment has been minimized.

Contributor

bors replied Jul 23, 2013

merging michaelwoerister/rust/trans_cleanup_1 = 3315edf into auto

This comment has been minimized.

Contributor

bors replied Jul 23, 2013

michaelwoerister/rust/trans_cleanup_1 = 3315edf merged ok, testing candidate = 8990f8b

This comment has been minimized.

Contributor

bors replied Jul 23, 2013

fast-forwarding master to auto = 8990f8b

bors added a commit that referenced this pull request Jul 23, 2013

auto merge of #7848 : michaelwoerister/rust/trans_cleanup_1, r=jdm
The following types are renamed:
```rust
block_ => Block
block => @mut Block

fn_ctx_ => FunctionContext
fn_ctx => @mut FunctionContext

scope_info => ScopeInfo
```
I also tried to convert instances of `@mut` to `&mut` or `&` but a lot of them are blocked by issue #6268, so I left it for some time later.

@bors bors closed this Jul 23, 2013

@jdm

This comment has been minimized.

Contributor

jdm commented Jul 23, 2013

\o/

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