syntax: obsolete the for Sized? syntax

This commit is contained in:
Jorge Aparicio 2015-01-05 13:51:29 -05:00
parent bbf7e4e58a
commit 4ed2800701
3 changed files with 29 additions and 2 deletions

View file

@ -24,6 +24,7 @@ use ptr::P;
/// The specific types of unsupported syntax
#[derive(Copy, PartialEq, Eq, Hash)]
pub enum ObsoleteSyntax {
ObsoleteForSized,
ObsoleteOwnedType,
ObsoleteOwnedExpr,
ObsoleteOwnedPattern,
@ -55,6 +56,11 @@ impl<'a> ParserObsoleteMethods for parser::Parser<'a> {
/// Reports an obsolete syntax non-fatal error.
fn obsolete(&mut self, sp: Span, kind: ObsoleteSyntax) {
let (kind_str, desc) = match kind {
ObsoleteForSized => (
"for Sized?",
"no longer required, traits apply to sized and unsized types by default, use \
`: Sized` to opt-out of unsized types",
),
ObsoleteProcType => (
"the `proc` type",
"use unboxed closures instead",

View file

@ -5003,6 +5003,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;
@ -5020,8 +5021,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
}

View file

@ -0,0 +1,17 @@
// 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.
// Test that we generate obsolete syntax errors around usages of `for Sized?`
trait Foo for Sized? {} //~ ERROR obsolete syntax: for Sized?
trait Bar for ?Sized {} //~ ERROR obsolete syntax: for Sized?
fn main() { }