parent
a51be8ecd8
commit
c39271e99c
4 changed files with 84 additions and 0 deletions
46
src/libsyntax/ext/deriving/bounds.rs
Normal file
46
src/libsyntax/ext/deriving/bounds.rs
Normal file
|
@ -0,0 +1,46 @@
|
||||||
|
// Copyright 2014 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.
|
||||||
|
|
||||||
|
use ast::{MetaItem, MetaWord, Item};
|
||||||
|
use codemap::Span;
|
||||||
|
use ext::base::ExtCtxt;
|
||||||
|
use ext::deriving::generic::*;
|
||||||
|
|
||||||
|
pub fn expand_deriving_bound(cx: &mut ExtCtxt,
|
||||||
|
span: Span,
|
||||||
|
mitem: @MetaItem,
|
||||||
|
item: @Item,
|
||||||
|
push: |@Item|) {
|
||||||
|
|
||||||
|
let name = match mitem.node {
|
||||||
|
MetaWord(ref tname) => {
|
||||||
|
match tname.get() {
|
||||||
|
"Copy" => "Copy",
|
||||||
|
"Send" => "Send",
|
||||||
|
"Share" => "Share",
|
||||||
|
ref tname => cx.span_bug(span,
|
||||||
|
format!("expected built-in trait name but found {}",
|
||||||
|
*tname))
|
||||||
|
}
|
||||||
|
},
|
||||||
|
_ => return cx.span_err(span, "unexpected value in deriving, expected a trait")
|
||||||
|
};
|
||||||
|
|
||||||
|
let trait_def = TraitDef {
|
||||||
|
span: span,
|
||||||
|
attributes: Vec::new(),
|
||||||
|
path: Path::new(vec!("std", "kinds", name)),
|
||||||
|
additional_bounds: Vec::new(),
|
||||||
|
generics: LifetimeBounds::empty(),
|
||||||
|
methods: vec!()
|
||||||
|
};
|
||||||
|
|
||||||
|
trait_def.expand(cx, mitem, item, push)
|
||||||
|
}
|
|
@ -22,6 +22,7 @@ use ast::{Item, MetaItem, MetaList, MetaNameValue, MetaWord};
|
||||||
use ext::base::ExtCtxt;
|
use ext::base::ExtCtxt;
|
||||||
use codemap::Span;
|
use codemap::Span;
|
||||||
|
|
||||||
|
pub mod bounds;
|
||||||
pub mod clone;
|
pub mod clone;
|
||||||
pub mod encodable;
|
pub mod encodable;
|
||||||
pub mod decodable;
|
pub mod decodable;
|
||||||
|
@ -90,6 +91,10 @@ pub fn expand_meta_deriving(cx: &mut ExtCtxt,
|
||||||
|
|
||||||
"FromPrimitive" => expand!(primitive::expand_deriving_from_primitive),
|
"FromPrimitive" => expand!(primitive::expand_deriving_from_primitive),
|
||||||
|
|
||||||
|
"Send" => expand!(bounds::expand_deriving_bound),
|
||||||
|
"Share" => expand!(bounds::expand_deriving_bound),
|
||||||
|
"Copy" => expand!(bounds::expand_deriving_bound),
|
||||||
|
|
||||||
ref tname => {
|
ref tname => {
|
||||||
cx.span_err(titem.span, format!("unknown \
|
cx.span_err(titem.span, format!("unknown \
|
||||||
`deriving` trait: `{}`", *tname));
|
`deriving` trait: `{}`", *tname));
|
||||||
|
|
17
src/test/compile-fail/deriving-bounds.rs
Normal file
17
src/test/compile-fail/deriving-bounds.rs
Normal file
|
@ -0,0 +1,17 @@
|
||||||
|
// Copyright 2014 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.
|
||||||
|
|
||||||
|
//NOTE: Remove in the next snapshot
|
||||||
|
#[cfg(not(stage0))]
|
||||||
|
#[deriving(Share(Bad),Send,Copy)]
|
||||||
|
//~^ ERROR unexpected value in deriving, expected a trait
|
||||||
|
struct Test;
|
||||||
|
|
||||||
|
pub fn main() {}
|
16
src/test/run-pass/deriving-bounds.rs
Normal file
16
src/test/run-pass/deriving-bounds.rs
Normal file
|
@ -0,0 +1,16 @@
|
||||||
|
// Copyright 2014 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.
|
||||||
|
|
||||||
|
//NOTE: Remove in the next snapshot
|
||||||
|
#[cfg(not(stage0))]
|
||||||
|
#[deriving(Share,Send,Copy)]
|
||||||
|
struct Test;
|
||||||
|
|
||||||
|
pub fn main() {}
|
Loading…
Add table
Add a link
Reference in a new issue