about summary refs log tree commit diff
path: root/src/libsyntax
diff options
context:
space:
mode:
authorTim Chevalier <chevalier@alum.wellesley.edu>2013-01-24 11:17:52 -0800
committerTim Chevalier <chevalier@alum.wellesley.edu>2013-01-24 11:17:52 -0800
commitf3ec278e46e595a62a10e348db7077ed2dfc45df (patch)
treeff6aa5122e9dbc92d8e937e7862f4b8d824dfadd /src/libsyntax
parent25f9fa0359e35e6e55b841049598a6aff87fd668 (diff)
parent4b2aa286d8448168e9077565ff17b7a6df4db105 (diff)
downloadrust-f3ec278e46e595a62a10e348db7077ed2dfc45df.tar.gz
rust-f3ec278e46e595a62a10e348db7077ed2dfc45df.zip
Merge pull request #4609 from sonwow/keyword-super
Make `super` a keyword
Diffstat (limited to 'src/libsyntax')
-rw-r--r--src/libsyntax/parse/token.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libsyntax/parse/token.rs b/src/libsyntax/parse/token.rs
index 2136499f8f0..a8c0c074588 100644
--- a/src/libsyntax/parse/token.rs
+++ b/src/libsyntax/parse/token.rs
@@ -493,7 +493,7 @@ fn strict_keyword_table() -> HashMap<~str, ()> {
         ~"once",
         ~"priv", ~"pub", ~"pure",
         ~"ref", ~"return",
-        ~"struct",
+        ~"struct", ~"super",
         ~"true", ~"trait", ~"type",
         ~"unsafe", ~"use",
         ~"while"