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

Closed
wants to merge 1 commit into
from

Projects

None yet

4 participants

@michaelwoerister
Contributor

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
Contributor

Rebased and fixed merge conflicts.

@jdm
Contributor
jdm commented Jul 18, 2013

Looks like this needs a rebase again :P

@michaelwoerister
Contributor

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

@huonw
Member
huonw commented Jul 21, 2013

@michaelwoerister, needs another rebase!

@michaelwoerister
Contributor

Done.

@bors bors added a commit that referenced this pull request Jul 22, 2013
@bors bors 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.
2051574
@michaelwoerister
Contributor

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

@jdm
Contributor
jdm commented Jul 22, 2013

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

@michaelwoerister
Contributor

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

@michaelwoerister
Contributor

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
Contributor

@jdm Please re-approve.

@jdm
jdm commented on 3315edf Jul 23, 2013

@bors: retry

jdm replied Jul 23, 2013

r+

Contributor
bors replied Jul 23, 2013

saw approval from jdm
at michaelwoerister@3315edf

Contributor
bors replied Jul 23, 2013

merging michaelwoerister/rust/trans_cleanup_1 = 3315edf into auto

Contributor
bors replied Jul 23, 2013

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

Contributor
bors replied Jul 23, 2013

saw approval from jdm
at michaelwoerister@3315edf

Contributor
bors replied Jul 23, 2013

merging michaelwoerister/rust/trans_cleanup_1 = 3315edf into auto

Contributor
bors replied Jul 23, 2013

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

Contributor
bors replied Jul 23, 2013

fast-forwarding master to auto = 8990f8b

@bors bors added a commit that referenced this pull request Jul 23, 2013
@bors bors 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.
8990f8b
@bors bors closed this Jul 23, 2013
@jdm
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