summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJyun-Yan You <jyyou.tw@gmail.com>2014-11-17 23:25:41 +0800
committerJyun-Yan You <jyyou.tw@gmail.com>2014-11-17 23:25:41 +0800
commite98a168d49541f934b19d61a981617ca658b9b2f (patch)
tree1e3a930d03adca76d454164796a1dfd649ae08a1
parent9d8f532a67521e9b67a3b27f5b90bf60f0d71a45 (diff)
Fix build
-rw-r--r--src/gen.rs8
1 files changed, 3 insertions, 5 deletions
diff --git a/src/gen.rs b/src/gen.rs
index 04fe3a40..a0eb9842 100644
--- a/src/gen.rs
+++ b/src/gen.rs
@@ -605,8 +605,7 @@ fn cunion_to_rs(ctx: &mut GenCtx, name: String, layout: Layout, fields: Vec<Fiel
ast::MutImmutable,
ctx.ext_cx.ident_of("self")
)),
- output: ret_ty,
- cf: ast::Return,
+ output: ast::Return(ret_ty),
variadic: false
}),
body,
@@ -729,7 +728,7 @@ fn cfuncty_to_rs(ctx: &mut GenCtx,
let ret = P(match *rty {
TVoid => ast::Ty {
id: ast::DUMMY_NODE_ID,
- node: ast::TyNil,
+ node: ast::TyTup(vec![]),
span: ctx.span
},
_ => cty_to_rs(ctx, rty)
@@ -766,8 +765,7 @@ fn cfuncty_to_rs(ctx: &mut GenCtx,
let var = !args.is_empty() && var;
return ast::FnDecl {
inputs: args,
- output: ret,
- cf: ast::Return,
+ output: ast::Return(ret),
variadic: var
};
}