Skip to content

syntax::token module modernization #18365

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

Merged
merged 4 commits into from
Oct 29, 2014
Merged

syntax::token module modernization #18365

merged 4 commits into from
Oct 29, 2014

Conversation

brendanzab
Copy link
Member

[breaking-change]

(for syntax-extensions)

  • Token variant identifiers have been converted to PascalCase for consistency with Rust coding standards
  • Some free-functions in syntax::token have been converted to methods on syntax::token::Token:
    • can_begin_expr -> Token::can_begin_expr
    • close_delimiter_for -> Token::get_close_delimiter
    • is_lit -> Token::is_lit
    • is_ident -> Token::is_ident
    • is_path -> Token::is_path
    • is_plain_ident -> Token::is_plain_ident
    • is_lifetime -> Token::is_lifetime
    • is_mutability -> Token::is_mutability
    • to_binop -> Token::to_binop
    • is_keyword -> Token::is_keyword
    • is_any_keyword -> Token:is_any_keyword
    • is_strict_keyword -> Token::is_strict_keyword
    • is_reserved_keyword -> Token::is_reserved_keyword
    • mtwt_token_eq -> Token::mtwt_eq
  • token::Ident now takes an enum instead of a boolean for clarity
  • token::{to_string, binop_to_string} were moved to pprust::{token_to_string, binop_to_string}

@brendanzab
Copy link
Member Author

@alexcrichton r?

Will need a rebase once some pending PRs land.

@brendanzab brendanzab force-pushed the token branch 2 times, most recently from aaea492 to 28c1752 Compare October 28, 2014 01:38
@brendanzab
Copy link
Member Author

There are some mistakes with my rebase.... fixing...

@alexcrichton
Copy link
Member

Fantastic cleanup @bjz, nice work!

@brendanzab
Copy link
Member Author

rebased

bors added a commit that referenced this pull request Oct 29, 2014
[breaking-change]

(for syntax-extensions)

- Token variant identifiers have been converted to PascalCase for consistency with Rust coding standards
- Some free-functions in `syntax::token` have been converted to methods on `syntax::token::Token`:
    - `can_begin_expr`         -> `Token::can_begin_expr`
    - `close_delimiter_for`    -> `Token::get_close_delimiter`
    - `is_lit`                 -> `Token::is_lit`
    - `is_ident`               -> `Token::is_ident`
    - `is_path`                -> `Token::is_path`
    - `is_plain_ident`         -> `Token::is_plain_ident`
    - `is_lifetime`            -> `Token::is_lifetime`
    - `is_mutability`          -> `Token::is_mutability`
    - `to_binop`               -> `Token::to_binop`
    - `is_keyword`             -> `Token::is_keyword`
    - `is_any_keyword`         -> `Token:is_any_keyword`
    - `is_strict_keyword`      -> `Token::is_strict_keyword`
    - `is_reserved_keyword`    -> `Token::is_reserved_keyword`
    - `mtwt_token_eq`          -> `Token::mtwt_eq`
- `token::Ident` now takes an enum instead of a boolean for clarity
- `token::{to_string, binop_to_string}` were moved to `pprust::{token_to_string, binop_to_string}`
@brendanzab
Copy link
Member Author

Hmm task '<unknown>' has overflowed its stack on the bsd builder

@brendanzab
Copy link
Member Author

I have a change incoming anyway. I would prefer to bundle it in with this one to reduce disruption downstream.

@brendanzab
Copy link
Member Author

Ok, @eddyb informs me that BSD is buggy, and ignored, so I'll let this one just go through.

@bors bors closed this Oct 29, 2014
@bors bors merged commit 665ad9c into rust-lang:master Oct 29, 2014
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants