From b9a026afba1513ab7847dcb19446463895b6cd3e Mon Sep 17 00:00:00 2001 From: Virgile Andreani Date: Thu, 30 Jan 2014 19:29:35 +0100 Subject: Fix minor doc typos --- src/libsyntax/ast.rs | 4 ++-- src/libsyntax/ext/deriving/generic.rs | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'src/libsyntax') diff --git a/src/libsyntax/ast.rs b/src/libsyntax/ast.rs index 40ae98791ef..1513946e401 100644 --- a/src/libsyntax/ast.rs +++ b/src/libsyntax/ast.rs @@ -1,4 +1,4 @@ -// Copyright 2012 The Rust Project Developers. See the COPYRIGHT +// Copyright 2012-2014 The Rust Project Developers. See the COPYRIGHT // file at the top-level directory of this distribution and at // http://rust-lang.org/COPYRIGHT. // @@ -680,7 +680,7 @@ pub enum TokenTree { // // As a final, horrifying aside, note that macro-by-example's input is // also matched by one of these matchers. Holy self-referential! It is matched -// by an MatchSeq, specifically this one: +// by a MatchSeq, specifically this one: // // $( $lhs:matchers => $rhs:tt );+ // diff --git a/src/libsyntax/ext/deriving/generic.rs b/src/libsyntax/ext/deriving/generic.rs index 9ebb771f5da..6449d0aab5e 100644 --- a/src/libsyntax/ext/deriving/generic.rs +++ b/src/libsyntax/ext/deriving/generic.rs @@ -1,4 +1,4 @@ -// Copyright 2013 The Rust Project Developers. See the COPYRIGHT +// Copyright 2013-2014 The Rust Project Developers. See the COPYRIGHT // file at the top-level directory of this distribution and at // http://rust-lang.org/COPYRIGHT. // @@ -42,7 +42,7 @@ arguments: the same variant (e.g. `None`, `Some(1)` and `None`). If `const_nonmatching` is true, this will contain an empty list. - `StaticEnum` and `StaticStruct` for static methods, where the type - being derived upon is either a enum or struct respectively. (Any + being derived upon is either an enum or struct respectively. (Any argument with type Self is just grouped among the non-self arguments.) -- cgit 1.4.1-3-g733a5 From a9f73b5e3d947c3b8ef8c3a8fbd30823ba099886 Mon Sep 17 00:00:00 2001 From: Huon Wilson Date: Sat, 1 Feb 2014 01:46:30 +1100 Subject: Remove the obsolete handler for `impl A;`. This is has been obsolete for quite a while now (including a release), so removing the special handling seems fine. (The error message is quite good still anyway.) Fixes #9580. --- src/libsyntax/parse/obsolete.rs | 5 ----- src/libsyntax/parse/parser.rs | 22 ++++++++-------------- src/test/compile-fail/empty-impl-semicolon.rs | 11 +++++++++++ 3 files changed, 19 insertions(+), 19 deletions(-) create mode 100644 src/test/compile-fail/empty-impl-semicolon.rs (limited to 'src/libsyntax') diff --git a/src/libsyntax/parse/obsolete.rs b/src/libsyntax/parse/obsolete.rs index 6aa1afee206..c4887d55e2a 100644 --- a/src/libsyntax/parse/obsolete.rs +++ b/src/libsyntax/parse/obsolete.rs @@ -36,7 +36,6 @@ pub enum ObsoleteSyntax { ObsoleteUnsafeExternFn, ObsoleteTraitFuncVisibility, ObsoleteConstPointer, - ObsoleteEmptyImpl, ObsoleteLoopAsContinue, ObsoleteEnumWildcard, ObsoleteStructWildcard, @@ -110,10 +109,6 @@ impl ParserObsoleteMethods for Parser { "instead of `&const Foo` or `@const Foo`, write `&Foo` or \ `@Foo`" ), - ObsoleteEmptyImpl => ( - "empty implementation", - "instead of `impl A;`, write `impl A {}`" - ), ObsoleteLoopAsContinue => ( "`loop` instead of `continue`", "`loop` is now only used for loops and `continue` is used for \ diff --git a/src/libsyntax/parse/parser.rs b/src/libsyntax/parse/parser.rs index 04a984ba95d..642624adfb2 100644 --- a/src/libsyntax/parse/parser.rs +++ b/src/libsyntax/parse/parser.rs @@ -3926,21 +3926,15 @@ impl Parser { }; let mut meths = ~[]; - let inner_attrs = if self.eat(&token::SEMI) { - self.obsolete(self.last_span, ObsoleteEmptyImpl); - None - } else { - self.expect(&token::LBRACE); - let (inner_attrs, next) = self.parse_inner_attrs_and_next(); - let mut method_attrs = Some(next); - while !self.eat(&token::RBRACE) { - meths.push(self.parse_method(method_attrs)); - method_attrs = None; - } - Some(inner_attrs) - }; + self.expect(&token::LBRACE); + let (inner_attrs, next) = self.parse_inner_attrs_and_next(); + let mut method_attrs = Some(next); + while !self.eat(&token::RBRACE) { + meths.push(self.parse_method(method_attrs)); + method_attrs = None; + } - (ident, ItemImpl(generics, opt_trait, ty, meths), inner_attrs) + (ident, ItemImpl(generics, opt_trait, ty, meths), Some(inner_attrs)) } // parse a::B<~str,int> diff --git a/src/test/compile-fail/empty-impl-semicolon.rs b/src/test/compile-fail/empty-impl-semicolon.rs new file mode 100644 index 00000000000..1a8751cb91a --- /dev/null +++ b/src/test/compile-fail/empty-impl-semicolon.rs @@ -0,0 +1,11 @@ +// Copyright 2013 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 or the MIT license +// , at your +// option. This file may not be copied, modified, or distributed +// except according to those terms. + +impl Foo; //~ ERROR expected `{` but found `;` -- cgit 1.4.1-3-g733a5