Navigation Menu

Skip to content

Commit

Permalink
Fix impl A .. {}
Browse files Browse the repository at this point in the history
  • Loading branch information
sanxiyn committed Jul 31, 2015
1 parent 5fcaf95 commit b5139c5
Show file tree
Hide file tree
Showing 5 changed files with 19 additions and 4 deletions.
2 changes: 1 addition & 1 deletion src/libsyntax/parse/parser.rs
Expand Up @@ -4610,7 +4610,7 @@ impl<'a> Parser<'a> {
None
};

if try!(self.eat(&token::DotDot) ){
if opt_trait.is_some() && try!(self.eat(&token::DotDot) ){
if generics.is_parameterized() {
self.span_err(impl_span, "default trait implementations are not \
allowed to have generics");
Expand Down
2 changes: 1 addition & 1 deletion src/test/parse-fail/empty-impl-semicolon.rs
Expand Up @@ -10,4 +10,4 @@

// compile-flags: -Z parse-only

impl Foo; //~ ERROR expected one of `(`, `+`, `..`, `::`, `<`, `for`, `where`, or `{`, found `;`
impl Foo; //~ ERROR expected one of `(`, `+`, `::`, `<`, `for`, `where`, or `{`, found `;`
15 changes: 15 additions & 0 deletions src/test/parse-fail/issue-27255.rs
@@ -0,0 +1,15 @@
// Copyright 2015 The Rust Project Developers. See the COPYRIGHT
// file at the top-level directory of this distribution and at
// http://rust-lang.org/COPYRIGHT.
//
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
// option. This file may not be copied, modified, or distributed
// except according to those terms.

// compile-flags: -Z parse-only

impl A .. {} //~ ERROR

fn main() {}
2 changes: 1 addition & 1 deletion src/test/parse-fail/multitrait.rs
Expand Up @@ -15,7 +15,7 @@ struct S {
}

impl Cmp, ToString for S {
//~^ ERROR: expected one of `(`, `+`, `..`, `::`, `<`, `for`, `where`, or `{`, found `,`
//~^ ERROR: expected one of `(`, `+`, `::`, `<`, `for`, `where`, or `{`, found `,`
fn eq(&&other: S) { false }
fn to_string(&self) -> String { "hi".to_string() }
}
2 changes: 1 addition & 1 deletion src/test/parse-fail/trait-bounds-not-on-impl.rs
Expand Up @@ -17,7 +17,7 @@ struct Bar;

impl Foo + Owned for Bar {
//~^ ERROR not a trait
//~^^ ERROR expected one of `..`, `where`, or `{`, found `Bar`
//~^^ ERROR expected one of `where` or `{`, found `Bar`
}

fn main() { }

0 comments on commit b5139c5

Please sign in to comment.