-
Notifications
You must be signed in to change notification settings - Fork 12.9k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
auto merge of #13868 : FlaPer87/rust/opt-in-phase1, r=alexcrichton
This is a first patch towards an opt-in built-in trait world. This patch removes the restriction on built-in traits and allows such traits to be derived. [RFC#3] cc #13231 @nikomatsakis r?
- Loading branch information
Showing
6 changed files
with
85 additions
and
27 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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) | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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() {} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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() {} |