aboutsummaryrefslogtreecommitdiff
path: root/src/comp/middle
diff options
context:
space:
mode:
Diffstat (limited to 'src/comp/middle')
-rw-r--r--src/comp/middle/fold.rs4
-rw-r--r--src/comp/middle/typestate_check.rs4
2 files changed, 4 insertions, 4 deletions
diff --git a/src/comp/middle/fold.rs b/src/comp/middle/fold.rs
index 25617640..a0f3bc93 100644
--- a/src/comp/middle/fold.rs
+++ b/src/comp/middle/fold.rs
@@ -173,7 +173,7 @@ type ast_fold[ENV] =
(fn(&ENV e, &span sp,
&path p, vec[@expr] args,
- option.t[@expr] body,
+ option.t[str] body,
@expr expanded,
ann a) -> @expr) fold_expr_ext,
@@ -1343,7 +1343,7 @@ fn identity_fold_expr_path[ENV](&ENV env, &span sp,
fn identity_fold_expr_ext[ENV](&ENV env, &span sp,
&path p, vec[@expr] args,
- option.t[@expr] body,
+ option.t[str] body,
@expr expanded,
ann a) -> @expr {
ret @respan(sp, ast.expr_ext(p, args, body, expanded, a));
diff --git a/src/comp/middle/typestate_check.rs b/src/comp/middle/typestate_check.rs
index 3e67cf2e..8a6e840a 100644
--- a/src/comp/middle/typestate_check.rs
+++ b/src/comp/middle/typestate_check.rs
@@ -1922,9 +1922,9 @@ fn annotate_expr(&fn_info_map fm, &@expr e) -> @expr {
case (expr_path(_,_,_)) {
/* no change */
}
- case (expr_ext(?p, ?es, ?e_opt, ?e, ?a)) {
+ case (expr_ext(?p, ?es, ?s_opt, ?e, ?a)) {
e1 = expr_ext(p, annotate_exprs(fm, es),
- annotate_option_exp(fm, e_opt),
+ s_opt,
annotate_expr(fm, e), a);
}
/* no change, next 3 cases */