about summary refs log tree commit diff
path: root/src/libsyntax/parse
diff options
context:
space:
mode:
authorPatrick Walton <pcwalton@mimiga.net>2013-06-25 18:25:27 -0700
committerCorey Richardson <corey@octayn.net>2013-06-28 10:44:17 -0400
commitbb830558d13a8090988141c90ed49b16895c944a (patch)
treea9a23d43d368465695ca2e107905e1ef6872970c /src/libsyntax/parse
parente015bee2866a802f17c84bd6d3a06212945a9d17 (diff)
downloadrust-bb830558d13a8090988141c90ed49b16895c944a.tar.gz
rust-bb830558d13a8090988141c90ed49b16895c944a.zip
librustc: Fix merge fallout and test cases.
Diffstat (limited to 'src/libsyntax/parse')
-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 18e6c181799..793626f0e18 100644
--- a/src/libsyntax/parse/token.rs
+++ b/src/libsyntax/parse/token.rs
@@ -563,7 +563,7 @@ pub mod keywords {
         // Strict keywords
         As,
         Break,
-        Freeze,
+        Const,
         Copy,
         Do,
         Else,