bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

auto merge of #16809 : nick29581/rust/dst-bug-3, r=alexcrichton

Browse source 
This corrects a rebasing error. Also adds a test so it won't happen again.

r?
This commit is contained in:
bors 2014-08-31 19:55:51 +00:00
commit 5dfb7a6ec1
2 changed files with 27 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

19
src/libsyntax/parse/parser.rs
View file

@ -1416,14 +1416,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) {
@ -2561,13 +2557,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();