From 539237372a81c377ace29519381a8e09bfa6c451 Mon Sep 17 00:00:00 2001 From: Nick Cameron Date: Thu, 28 Aug 2014 15:30:41 +1200 Subject: Forbid ~str and ~[] This corrects a rebasing error. Also adds a test so it won't happen again. --- src/libsyntax/parse/parser.rs | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) (limited to 'src/libsyntax') diff --git a/src/libsyntax/parse/parser.rs b/src/libsyntax/parse/parser.rs index 816700681cf..fca7a628892 100644 --- a/src/libsyntax/parse/parser.rs +++ b/src/libsyntax/parse/parser.rs @@ -1427,14 +1427,10 @@ impl<'a> Parser<'a> { } else if self.token == token::TILDE { // OWNED POINTER self.bump(); - let span = self.last_span; + let last_span = self.last_span; match self.token { - token::IDENT(ref ident, _) - if "str" == token::get_ident(*ident).get() => { - // This is OK (for now). - } - token::LBRACKET => {} // Also OK. - _ => self.obsolete(span, ObsoleteOwnedType) + token::LBRACKET => self.obsolete(last_span, ObsoleteOwnedVector), + _ => self.obsolete(last_span, ObsoleteOwnedType) } TyUniq(self.parse_ty(false)) } else if self.token == token::BINOP(token::STAR) { @@ -2563,13 +2559,10 @@ impl<'a> Parser<'a> { } token::TILDE => { self.bump(); - let span = self.last_span; + let last_span = self.last_span; match self.token { - token::LIT_STR(_) => { - // This is OK (for now). - } - token::LBRACKET => {} // Also OK. - _ => self.obsolete(span, ObsoleteOwnedExpr) + token::LBRACKET => self.obsolete(last_span, ObsoleteOwnedVector), + _ => self.obsolete(last_span, ObsoleteOwnedExpr) } let e = self.parse_prefix_expr(); -- cgit 1.4.1-3-g733a5