aboutsummaryrefslogtreecommitdiff
path: root/src/comp/middle/trans.rs
diff options
context:
space:
mode:
authorBrian Anderson <[email protected]>2011-03-06 13:56:38 -0500
committerGraydon Hoare <[email protected]>2011-03-06 15:13:35 -0800
commitd39da6f97819becd9ea41c194b5f0daa178814fe (patch)
tree71f4f00e321803d1cf9ab61de31a8725d6befeb6 /src/comp/middle/trans.rs
parentFlatten conditionals in rustc.rs. Remove FIXME (diff)
downloadrust-d39da6f97819becd9ea41c194b5f0daa178814fe.tar.xz
rust-d39da6f97819becd9ea41c194b5f0daa178814fe.zip
Remove typestate workarounds
Diffstat (limited to 'src/comp/middle/trans.rs')
-rw-r--r--src/comp/middle/trans.rs10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/comp/middle/trans.rs b/src/comp/middle/trans.rs
index dde5aa60..e00d5a92 100644
--- a/src/comp/middle/trans.rs
+++ b/src/comp/middle/trans.rs
@@ -929,8 +929,8 @@ fn static_size_of_tag(@crate_ctxt cx, @ty.t t) -> uint {
ret cx.tag_sizes.get(t);
}
- auto tid = tup(0, 0); // FIXME (#250): typestate botch
- let vec[@ty.t] subtys = vec(); // FIXME (#250): typestate botch
+ auto tid;
+ let vec[@ty.t] subtys;
alt (t.struct) {
case (ty.ty_tag(?tid_, ?subtys_)) {
tid = tid_;
@@ -3419,12 +3419,12 @@ fn trans_bind(@block_ctxt cx, @ast.expr f,
}
// Figure out which tydescs we need to pass, if any.
- // FIXME: typestate botch
- let @ty.t outgoing_fty = ty.plain_ty(ty.ty_nil);
- let vec[ValueRef] lltydescs = vec();
+ let @ty.t outgoing_fty;
+ let vec[ValueRef] lltydescs;
alt (f_res.generic) {
case (none[generic_info]) {
outgoing_fty = ty.expr_ty(f);
+ lltydescs = vec();
}
case (some[generic_info](?ginfo)) {
outgoing_fty = ginfo.item_type;