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.

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

Update and organize the Keywords table #24742

Merged
merged 1 commit into from
Apr 24, 2015
Merged

Conversation

mbrubeck
Copy link
Contributor

  • Add two missing keywords, Self and proc
  • Fix some mis-alphabetized keywords

r? @steveklabnik

* Add two missing keywords, `Self` and `proc`
* Fix some mis-alphabetized keywords
@mbrubeck
Copy link
Contributor Author

For reference, my updated table exactly matches the keywords module from token.rs.

@steveklabnik
Copy link
Member

proc should have been removed as a keyword by now, I thought? And is Self actually a keyword?

@mbrubeck
Copy link
Contributor Author

proc is still a reserved keyword. Self is a keyword:

fn main() {
    let Self = 1;
    let proc = 2;
}
<anon>:2:9: 2:13 error: expected identifier, found keyword `Self`
<anon>:2     let Self = 1;
                 ^~~~
<anon>:3:9: 3:13 error: `proc` is a reserved keyword
<anon>:3     let proc = 2;
                 ^~~~

@steveklabnik
Copy link
Member

I swear that we removed proc. Guess not.

@steveklabnik
Copy link
Member

@bors: r+ rollup

@bors
Copy link
Contributor

bors commented Apr 23, 2015

📌 Commit 17390a1 has been approved by steveklabnik

Manishearth added a commit to Manishearth/rust that referenced this pull request Apr 24, 2015
 * Add two missing keywords, `Self` and `proc`
* Fix some mis-alphabetized keywords

r? @steveklabnik
@bors bors merged commit 17390a1 into rust-lang:master Apr 24, 2015
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