2014-05-26 00:27:36 +01:00
|
|
|
// Copyright 2012-2014 The Rust Project Developers. See the COPYRIGHT
|
2012-12-03 16:48:01 -08:00
|
|
|
// 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.
|
|
|
|
|
2014-11-25 21:17:11 -05:00
|
|
|
//! Support for parsing unsupported, old syntaxes, for the purpose of reporting errors. Parsing of
|
|
|
|
//! these syntaxes is tested by compile-test/obsolete-syntax.rs.
|
|
|
|
//!
|
|
|
|
//! Obsolete syntax that becomes too hard to parse can be removed.
|
2012-09-08 15:50:29 -07:00
|
|
|
|
2014-11-06 00:05:53 -08:00
|
|
|
pub use self::ObsoleteSyntax::*;
|
|
|
|
|
2014-11-09 16:14:15 +01:00
|
|
|
use ast::{Expr, ExprTup};
|
|
|
|
use codemap::Span;
|
2014-05-26 00:27:36 +01:00
|
|
|
use parse::parser;
|
2012-12-23 17:41:37 -05:00
|
|
|
use parse::token;
|
2014-09-13 19:06:01 +03:00
|
|
|
use ptr::P;
|
2014-05-16 00:16:13 -07:00
|
|
|
|
2012-09-08 15:50:29 -07:00
|
|
|
/// The specific types of unsupported syntax
|
2014-05-31 10:43:52 -07:00
|
|
|
#[deriving(PartialEq, Eq, Hash)]
|
2012-09-08 15:50:29 -07:00
|
|
|
pub enum ObsoleteSyntax {
|
2014-05-05 18:56:44 -07:00
|
|
|
ObsoleteOwnedType,
|
|
|
|
ObsoleteOwnedExpr,
|
|
|
|
ObsoleteOwnedPattern,
|
2014-06-06 10:27:49 -07:00
|
|
|
ObsoleteOwnedVector,
|
2014-07-23 10:21:50 -07:00
|
|
|
ObsoleteOwnedSelf,
|
2014-08-18 08:29:44 -07:00
|
|
|
ObsoleteImportRenaming,
|
2014-09-06 15:23:55 -07:00
|
|
|
ObsoleteSubsliceMatch,
|
2014-09-06 11:54:11 -07:00
|
|
|
ObsoleteExternCrateRenaming,
|
2014-11-26 10:07:22 -05:00
|
|
|
ObsoleteProcType,
|
|
|
|
ObsoleteProcExpr,
|
2012-09-19 18:00:26 -07:00
|
|
|
}
|
2012-09-08 15:50:29 -07:00
|
|
|
|
librustc: Make `Copy` opt-in.
This change makes the compiler no longer infer whether types (structures
and enumerations) implement the `Copy` trait (and thus are implicitly
copyable). Rather, you must implement `Copy` yourself via `impl Copy for
MyType {}`.
A new warning has been added, `missing_copy_implementations`, to warn
you if a non-generic public type has been added that could have
implemented `Copy` but didn't.
For convenience, you may *temporarily* opt out of this behavior by using
`#![feature(opt_out_copy)]`. Note though that this feature gate will never be
accepted and will be removed by the time that 1.0 is released, so you should
transition your code away from using it.
This breaks code like:
#[deriving(Show)]
struct Point2D {
x: int,
y: int,
}
fn main() {
let mypoint = Point2D {
x: 1,
y: 1,
};
let otherpoint = mypoint;
println!("{}{}", mypoint, otherpoint);
}
Change this code to:
#[deriving(Show)]
struct Point2D {
x: int,
y: int,
}
impl Copy for Point2D {}
fn main() {
let mypoint = Point2D {
x: 1,
y: 1,
};
let otherpoint = mypoint;
println!("{}{}", mypoint, otherpoint);
}
This is the backwards-incompatible part of #13231.
Part of RFC #3.
[breaking-change]
2014-12-05 17:01:33 -08:00
|
|
|
impl Copy for ObsoleteSyntax {}
|
|
|
|
|
2013-06-14 18:21:47 -07:00
|
|
|
pub trait ParserObsoleteMethods {
|
|
|
|
/// Reports an obsolete syntax non-fatal error.
|
2013-12-30 14:04:00 -08:00
|
|
|
fn obsolete(&mut self, sp: Span, kind: ObsoleteSyntax);
|
2014-06-09 13:12:30 -07:00
|
|
|
/// Reports an obsolete syntax non-fatal error, and returns
|
|
|
|
/// a placeholder expression
|
2014-09-13 19:06:01 +03:00
|
|
|
fn obsolete_expr(&mut self, sp: Span, kind: ObsoleteSyntax) -> P<Expr>;
|
2013-12-30 14:04:00 -08:00
|
|
|
fn report(&mut self,
|
2013-08-31 18:13:04 +02:00
|
|
|
sp: Span,
|
2013-06-14 18:21:47 -07:00
|
|
|
kind: ObsoleteSyntax,
|
|
|
|
kind_str: &str,
|
|
|
|
desc: &str);
|
2013-12-30 14:04:00 -08:00
|
|
|
fn is_obsolete_ident(&mut self, ident: &str) -> bool;
|
|
|
|
fn eat_obsolete_ident(&mut self, ident: &str) -> bool;
|
2013-06-14 18:21:47 -07:00
|
|
|
}
|
|
|
|
|
2014-05-26 00:27:36 +01:00
|
|
|
impl<'a> ParserObsoleteMethods for parser::Parser<'a> {
|
2012-09-08 15:50:29 -07:00
|
|
|
/// Reports an obsolete syntax non-fatal error.
|
2013-12-30 14:04:00 -08:00
|
|
|
fn obsolete(&mut self, sp: Span, kind: ObsoleteSyntax) {
|
2012-09-08 15:50:29 -07:00
|
|
|
let (kind_str, desc) = match kind {
|
2014-11-26 10:07:22 -05:00
|
|
|
ObsoleteProcType => (
|
|
|
|
"the `proc` type",
|
|
|
|
"use unboxed closures instead",
|
|
|
|
),
|
|
|
|
ObsoleteProcExpr => (
|
|
|
|
"`proc` expression",
|
|
|
|
"use a `move ||` expression instead",
|
|
|
|
),
|
2014-05-05 18:56:44 -07:00
|
|
|
ObsoleteOwnedType => (
|
|
|
|
"`~` notation for owned pointers",
|
|
|
|
"use `Box<T>` in `std::owned` instead"
|
|
|
|
),
|
|
|
|
ObsoleteOwnedExpr => (
|
|
|
|
"`~` notation for owned pointer allocation",
|
|
|
|
"use the `box` operator instead of `~`"
|
|
|
|
),
|
|
|
|
ObsoleteOwnedPattern => (
|
|
|
|
"`~` notation for owned pointer patterns",
|
|
|
|
"use the `box` operator instead of `~`"
|
|
|
|
),
|
2014-06-06 10:27:49 -07:00
|
|
|
ObsoleteOwnedVector => (
|
|
|
|
"`~[T]` is no longer a type",
|
|
|
|
"use the `Vec` type instead"
|
|
|
|
),
|
2014-07-23 10:21:50 -07:00
|
|
|
ObsoleteOwnedSelf => (
|
|
|
|
"`~self` is no longer supported",
|
|
|
|
"write `self: Box<Self>` instead"
|
|
|
|
),
|
2014-08-18 08:29:44 -07:00
|
|
|
ObsoleteImportRenaming => (
|
|
|
|
"`use foo = bar` syntax",
|
|
|
|
"write `use bar as foo` instead"
|
2014-09-06 15:23:55 -07:00
|
|
|
),
|
|
|
|
ObsoleteSubsliceMatch => (
|
|
|
|
"subslice match syntax",
|
|
|
|
"instead of `..xs`, write `xs..` in a pattern"
|
2014-09-06 11:54:11 -07:00
|
|
|
),
|
|
|
|
ObsoleteExternCrateRenaming => (
|
|
|
|
"`extern crate foo = bar` syntax",
|
|
|
|
"write `extern crate bar as foo` instead"
|
2014-08-18 08:29:44 -07:00
|
|
|
)
|
2012-09-08 15:50:29 -07:00
|
|
|
};
|
|
|
|
|
|
|
|
self.report(sp, kind, kind_str, desc);
|
|
|
|
}
|
|
|
|
|
2014-06-09 13:12:30 -07:00
|
|
|
/// Reports an obsolete syntax non-fatal error, and returns
|
|
|
|
/// a placeholder expression
|
2014-09-13 19:06:01 +03:00
|
|
|
fn obsolete_expr(&mut self, sp: Span, kind: ObsoleteSyntax) -> P<Expr> {
|
2012-09-08 15:50:29 -07:00
|
|
|
self.obsolete(sp, kind);
|
2014-11-09 16:14:15 +01:00
|
|
|
self.mk_expr(sp.lo, sp.hi, ExprTup(vec![]))
|
2012-09-08 15:50:29 -07:00
|
|
|
}
|
|
|
|
|
2013-12-30 14:04:00 -08:00
|
|
|
fn report(&mut self,
|
2013-08-31 18:13:04 +02:00
|
|
|
sp: Span,
|
2013-05-31 15:17:22 -07:00
|
|
|
kind: ObsoleteSyntax,
|
|
|
|
kind_str: &str,
|
|
|
|
desc: &str) {
|
2014-05-16 10:45:16 -07:00
|
|
|
self.span_err(sp,
|
|
|
|
format!("obsolete syntax: {}", kind_str).as_slice());
|
2012-09-08 15:50:29 -07:00
|
|
|
|
2013-03-21 15:41:37 -04:00
|
|
|
if !self.obsolete_set.contains(&kind) {
|
2014-05-16 10:45:16 -07:00
|
|
|
self.sess
|
|
|
|
.span_diagnostic
|
|
|
|
.handler()
|
|
|
|
.note(format!("{}", desc).as_slice());
|
2013-03-21 15:41:37 -04:00
|
|
|
self.obsolete_set.insert(kind);
|
2012-09-08 15:50:29 -07:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2013-12-30 15:09:41 -08:00
|
|
|
fn is_obsolete_ident(&mut self, ident: &str) -> bool {
|
|
|
|
match self.token {
|
2014-10-27 19:22:52 +11:00
|
|
|
token::Ident(sid, _) => {
|
2014-11-20 20:25:27 -05:00
|
|
|
token::get_ident(sid) == ident
|
2012-09-08 15:50:29 -07:00
|
|
|
}
|
|
|
|
_ => false
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2013-12-30 14:04:00 -08:00
|
|
|
fn eat_obsolete_ident(&mut self, ident: &str) -> bool {
|
2012-09-08 15:50:29 -07:00
|
|
|
if self.is_obsolete_ident(ident) {
|
|
|
|
self.bump();
|
|
|
|
true
|
|
|
|
} else {
|
|
|
|
false
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|