bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

rollup merge of #20556: japaric/no-for-sized

Browse source 
Conflicts:
	src/libcollections/slice.rs
	src/libcollections/str.rs
	src/libcore/borrow.rs
	src/libcore/cmp.rs
	src/libcore/ops.rs
	src/libstd/c_str.rs
	src/test/compile-fail/issue-19009.rs
This commit is contained in:
Alex Crichton 2015-01-05 18:47:45 -08:00
commit afbce050ca
43 changed files with 101 additions and 77 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -5052,6 +5052,7 @@ impl<'a> Parser<'a> {
// re-jigged shortly in any case, so leaving the hacky version for now.
if self.eat_keyword(keywords::For) {
let span = self.span;
let mut ate_question = false;
if self.eat(&token::Question) {
ate_question = true;
@ -5069,8 +5070,11 @@ impl<'a> Parser<'a> {
"expected `?Sized` after `for` in trait item");
return None;
}
let tref = Parser::trait_ref_from_ident(ident, span);
Some(tref)
let _tref = Parser::trait_ref_from_ident(ident, span);
self.obsolete(span, ObsoleteForSized);
None
} else {
None
}