diff options
| author | Niko Matsakis <niko@alum.mit.edu> | 2012-07-13 18:43:52 -0700 |
|---|---|---|
| committer | Niko Matsakis <niko@alum.mit.edu> | 2012-07-14 17:37:20 -0700 |
| commit | 41a21f053ced3df8fe9acc66cb30fb6005339b3e (patch) | |
| tree | 12cf2e5e9ba0405e31a0a6abd509b6a5d3f477c4 /src/libsyntax/ext | |
| parent | 1fbb9d035ddd0c9ae56a91167fda2f100c3987ad (diff) | |
| download | rust-41a21f053ced3df8fe9acc66cb30fb6005339b3e.tar.gz rust-41a21f053ced3df8fe9acc66cb30fb6005339b3e.zip | |
remove typestate from code, tests, and docs
Diffstat (limited to 'src/libsyntax/ext')
| -rw-r--r-- | src/libsyntax/ext/auto_serialize.rs | 17 | ||||
| -rw-r--r-- | src/libsyntax/ext/pipes/ast_builder.rs | 5 |
2 files changed, 4 insertions, 18 deletions
diff --git a/src/libsyntax/ext/auto_serialize.rs b/src/libsyntax/ext/auto_serialize.rs index 98671234249..a7a6080fb0b 100644 --- a/src/libsyntax/ext/auto_serialize.rs +++ b/src/libsyntax/ext/auto_serialize.rs @@ -162,8 +162,7 @@ impl helpers for ext_ctxt { node: ast::ty_fn(ast::proto_any, {inputs: args, output: output, purity: ast::impure_fn, - cf: ast::return_val, - constraints: ~[]}), + cf: ast::return_val}), span: span} } @@ -466,10 +465,6 @@ fn ser_ty(cx: ext_ctxt, tps: ser_tps_map, } } - ast::ty_constr(ty, _) { - ser_ty(cx, tps, ty, s, v) - } - ast::ty_mac(_) { cx.span_err(ty.span, ~"cannot serialize macro types"); ~[] @@ -573,8 +568,7 @@ fn mk_ser_fn(cx: ext_ctxt, span: span, name: ast::ident, node: ast::item_fn({inputs: ser_inputs, output: ser_output, purity: ast::impure_fn, - cf: ast::return_val, - constraints: ~[]}, + cf: ast::return_val}, ser_tps, ser_blk), vis: ast::public, @@ -697,10 +691,6 @@ fn deser_ty(cx: ext_ctxt, tps: deser_tps_map, } } - ast::ty_constr(ty, constrs) { - deser_ty(cx, tps, ty, d) - } - ast::ty_mac(_) { #ast{ fail } } @@ -783,8 +773,7 @@ fn mk_deser_fn(cx: ext_ctxt, span: span, node: ast::item_fn({inputs: deser_inputs, output: v_ty, purity: ast::impure_fn, - cf: ast::return_val, - constraints: ~[]}, + cf: ast::return_val}, deser_tps, deser_blk), vis: ast::public, diff --git a/src/libsyntax/ext/pipes/ast_builder.rs b/src/libsyntax/ext/pipes/ast_builder.rs index cb0abe9e8e5..2a2fbe2628a 100644 --- a/src/libsyntax/ext/pipes/ast_builder.rs +++ b/src/libsyntax/ext/pipes/ast_builder.rs @@ -89,10 +89,7 @@ impl ast_builder for ext_ctxt { {inputs: inputs, output: output, purity: ast::impure_fn, - cf: ast::return_val, - // FIXME #2886: we'll probably want a variant that does constrained - // types. - constraints: ~[]} + cf: ast::return_val} } fn item(name: ident, |