---

yaml
---
r: 22543
b: refs/heads/master
c: e2af785
h: refs/heads/master
i:
  22541: 855c1cc
  22539: ed10313
  22535: f62c6da
  22527: 8f84e2e
v: v3

Author: msullivan

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 92743dc2a6a14d042d4b278e4a4dde5ca198c886
+refs/heads/master: e2af78560696384d169040d3e94d6d50f572f318
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: cd6f24f9d14ac90d167386a56e7a6ac1f0318195
 refs/heads/try: ffbe0e0e00374358b789b0037bcb3a577cd218be

trunk/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
               }

trunk/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,