1
Fork 0

Merge remote-tracking branch 'remotes/origin/incoming' into incoming

This commit is contained in:
Erick Tryzelaar 2013-02-27 11:03:21 -08:00
commit 7d0ec86c4a
224 changed files with 2220 additions and 2144 deletions

View file

@ -46,7 +46,7 @@ pub trait gen_init {
fn gen_init_bounded(&self, ext_cx: ext_ctxt) -> @ast::expr;
}
pub impl gen_send for message {
impl gen_send for message {
fn gen_send(&mut self, cx: ext_ctxt, try: bool) -> @ast::item {
debug!("pipec: gen_send");
let name = self.name();
@ -195,7 +195,7 @@ pub impl gen_send for message {
}
}
pub impl to_type_decls for state {
impl to_type_decls for state {
fn to_type_decls(&self, cx: ext_ctxt) -> ~[@ast::item] {
debug!("pipec: to_type_decls");
// This compiles into two different type declarations. Say the
@ -306,7 +306,7 @@ pub impl to_type_decls for state {
}
}
pub impl gen_init for protocol {
impl gen_init for protocol {
fn gen_init(&self, cx: ext_ctxt) -> @ast::item {
let ext_cx = cx;