---

yaml
---
r: 139218
b: refs/heads/try2
c: 68cb536
h: refs/heads/master
v: v3

Author: pcwalton

[refs]

@@ -5,7 +5,7 @@ refs/heads/snap-stage3: 78a7676898d9f80ab540c6df5d4c9ce35bb50463
 refs/heads/try: 519addf6277dbafccbb4159db4b710c37eaa2ec5
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
-refs/heads/try2: 85c9fc6f8f59c146c44aacb4b9abfb2c35e16089
+refs/heads/try2: 68cb53672b74e8b4352453e181667848cd63a183
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try2/src/libsyntax/parse/obsolete.rs

@@ -60,6 +60,7 @@ pub enum ObsoleteSyntax {
     ObsoleteConstManagedPointer,
     ObsoletePurity,
     ObsoleteStaticMethod,
+    ObsoleteConstItem,
 }
 
 impl to_bytes::IterBytes for ObsoleteSyntax {
@@ -203,6 +204,11 @@ pub impl Parser {
                 "`static` notation",
                 "`static` is superfluous; remove it"
             ),
+            ObsoleteConstItem => (
+                "`const` item",
+                "`const` items are now `static` items; replace `const` with \
+                 `static`"
+            ),
         };
 
         self.report(sp, kind, kind_str, desc);

branches/try2/src/libsyntax/parse/parser.rs

@@ -81,6 +81,7 @@ use parse::obsolete::{ObsoleteBareFnType, ObsoleteNewtypeEnum};
 use parse::obsolete::{ObsoleteMode, ObsoleteImplicitSelf};
 use parse::obsolete::{ObsoleteLifetimeNotation, ObsoleteConstManagedPointer};
 use parse::obsolete::{ObsoletePurity, ObsoleteStaticMethod};
+use parse::obsolete::{ObsoleteConstItem};
 use parse::prec::{as_prec, token_to_binop};
 use parse::token::{can_begin_expr, is_ident, is_ident_or_path};
 use parse::token::{is_plain_ident, INTERPOLATED, special_idents};
@@ -3563,7 +3564,9 @@ pub impl Parser {
         let lo = self.span.lo;
 
         // XXX: Obsolete; remove after snap.
-        if !self.eat_keyword(&~"const") {
+        if self.eat_keyword(&~"const") {
+            self.obsolete(*self.last_span, ObsoleteConstItem);
+        } else {
             self.expect_keyword(&~"static");
         }
 
@@ -3959,6 +3962,9 @@ pub impl Parser {
                 (self.is_keyword(&~"static") &&
                     !self.token_is_keyword(&~"fn", &self.look_ahead(1)))) {
             // CONST ITEM
+            if self.is_keyword(&~"const") {
+                self.obsolete(*self.span, ObsoleteConstItem);
+            }
             self.bump();
             let (ident, item_, extra_attrs) = self.parse_item_const();
             return iovi_item(self.mk_item(lo, self.last_span.hi, ident, item_,