Skip to content

Commit e2af785

Browse files
committed
Make the new world order normative. Closes #2908.
1 parent 92743dc commit e2af785

File tree

2 files changed

+1
-10
lines changed

2 files changed

+1
-10
lines changed

src/libsyntax/parse/parser.rs

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -654,21 +654,12 @@ class parser {
654654
if self.token == token::BINOP(token::SLASH) {
655655
self.bump();
656656
alt copy self.token {
657-
token::AT {
658-
self.bump(); some(vstore_box)
659-
}
660-
token::TILDE {
661-
self.bump(); some(vstore_uniq)
662-
}
663657
token::UNDERSCORE {
664658
self.bump(); some(vstore_fixed(none))
665659
}
666660
token::LIT_INT_UNSUFFIXED(i) if i >= 0i64 {
667661
self.bump(); some(vstore_fixed(some(i as uint)))
668662
}
669-
token::BINOP(token::AND) {
670-
some(vstore_slice(self.parse_region()))
671-
}
672663
_ {
673664
none
674665
}

src/rustc/middle/lint.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ fn get_lint_dict() -> lint_dict {
112112
(~"old_strs",
113113
@{lint: old_strs,
114114
desc: ~"old (deprecated) strings",
115-
default: warn}),
115+
default: error}),
116116

117117
(~"unrecognized_warning",
118118
@{lint: unrecognized_warning,

0 commit comments

Comments
 (0)