From e2af78560696384d169040d3e94d6d50f572f318 Mon Sep 17 00:00:00 2001
From: Michael Sullivan <sully@msully.net>
Date: Sat, 14 Jul 2012 00:31:15 -0700
Subject: [PATCH] Make the new world order normative. Closes #2908.

---
 src/libsyntax/parse/parser.rs | 9 ---------
 src/rustc/middle/lint.rs      | 2 +-
 2 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/src/libsyntax/parse/parser.rs b/src/libsyntax/parse/parser.rs
index 1c34894eb98..a19ea2d25e9 100644
--- a/src/libsyntax/parse/parser.rs
+++ b/src/libsyntax/parse/parser.rs
@@ -654,21 +654,12 @@ class parser {
         if self.token == token::BINOP(token::SLASH) {
             self.bump();
             alt copy self.token {
-              token::AT {
-                self.bump(); some(vstore_box)
-              }
-              token::TILDE {
-                self.bump(); some(vstore_uniq)
-              }
               token::UNDERSCORE {
                 self.bump(); some(vstore_fixed(none))
               }
               token::LIT_INT_UNSUFFIXED(i) if i >= 0i64 {
                 self.bump(); some(vstore_fixed(some(i as uint)))
               }
-              token::BINOP(token::AND) {
-                some(vstore_slice(self.parse_region()))
-              }
               _ {
                 none
               }
diff --git a/src/rustc/middle/lint.rs b/src/rustc/middle/lint.rs
index adb333def8d..0d2de5e8899 100644
--- a/src/rustc/middle/lint.rs
+++ b/src/rustc/middle/lint.rs
@@ -112,7 +112,7 @@ fn get_lint_dict() -> lint_dict {
         (~"old_strs",
          @{lint: old_strs,
            desc: ~"old (deprecated) strings",
-           default: warn}),
+           default: error}),
 
         (~"unrecognized_warning",
          @{lint: unrecognized_warning,