More naming cleanup of syntax::ast types. #7903

Closed
wants to merge 2 commits into
from

Projects

None yet

5 participants

@michaelwoerister
Contributor

Continuation of #7826.

AST spanned refactoring, AST type renamings:

crate => Crate
local => Local
blk => Block
crate_num => CrateNum
crate_cfg => CrateConfig
field => Field

Also, Crate, Field and Local are not wrapped in spanned anymore.

@thestinger
Contributor

@michaelwoerister: looks like this needs to be rebased already

michaelwoerister added some commits Jul 19, 2013
@michaelwoerister michaelwoerister Ast spanned<T> refactoring, renaming: crate, local, blk, crate_num, c…
…rate_cfg.

`crate => Crate`
`local => Local`
`blk => Block`
`crate_num => CrateNum`
`crate_cfg => CrateConfig`

Also, Crate and Local are not wrapped in spanned<T> anymore.
4bd1424
@michaelwoerister michaelwoerister De-spanned<T> and renamed ast::field (now ast::Field)
5aee3e0
@michaelwoerister
Contributor

Rebased :)

@jdm
jdm commented on 5aee3e0 Jul 22, 2013

r+

Contributor
bors replied Jul 22, 2013

saw approval from jdm
at michaelwoerister@5aee3e0

Contributor
bors replied Jul 22, 2013

merging michaelwoerister/rust/end_of_spanned = 5aee3e0 into auto

Contributor
bors replied Jul 22, 2013

michaelwoerister/rust/end_of_spanned = 5aee3e0 merged ok, testing candidate = 52b7fc1

Contributor
bors replied Jul 22, 2013

fast-forwarding master to auto = 52b7fc1

@bors bors added a commit that referenced this pull request Jul 22, 2013
@bors bors auto merge of #7903 : michaelwoerister/rust/end_of_spanned, r=jdm
Continuation of #7826.

AST spanned<T> refactoring, AST type renamings:

`crate => Crate`
`local => Local`
`blk => Block`
`crate_num => CrateNum`
`crate_cfg => CrateConfig`
`field => Field`

Also, Crate, Field and Local are not wrapped in spanned<T> anymore.
52b7fc1
@pcwalton pcwalton commented on the diff Jul 22, 2013
src/test/run-pass-fulldeps/qquote.rs
@@ -33,7 +33,7 @@ trait fake_ext_ctxt {
type fake_session = parse::parse_sess;
impl fake_ext_ctxt for fake_session {
- fn cfg() -> ast::crate_cfg { ~[] }
+ fn cfg() -> ast::Crate_cfg { ~[] }
@pcwalton
pcwalton Jul 22, 2013 Contributor

Shouldn't this be CrateConfig as above?

@michaelwoerister
michaelwoerister Jul 22, 2013 Contributor

Yes, it should :/
I always run make check before a PR or after a rebase, but I guess this does not run the full-deps tests, does it?

Thanks for pointing this out!

@michaelwoerister
michaelwoerister Jul 22, 2013 Contributor

Oh, and I just saw some of the above tests are x-failed, so they slip through the compiler checks too.

@bors bors closed this Jul 22, 2013
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment