aboutsummaryrefslogtreecommitdiff
path: root/src/boot
diff options
context:
space:
mode:
authorGraydon Hoare <[email protected]>2010-06-30 00:58:15 -0700
committerGraydon Hoare <[email protected]>2010-06-30 00:58:15 -0700
commit5a8d93c65282c57402f28aa84f10b5f350b4f1d4 (patch)
treeab248180939d2b4600c8afc8d803adffb37e7506 /src/boot
parentReimplement backup scheme for handling lvals not yet resolved by typechecker. (diff)
downloadrust-5a8d93c65282c57402f28aa84f10b5f350b4f1d4.tar.xz
rust-5a8d93c65282c57402f28aa84f10b5f350b4f1d4.zip
Remove redundant (and misnamed) function "without_exterior" in trans.
Diffstat (limited to 'src/boot')
-rw-r--r--src/boot/me/trans.ml14
1 files changed, 3 insertions, 11 deletions
diff --git a/src/boot/me/trans.ml b/src/boot/me/trans.ml
index 38088e94..9e0dfdf3 100644
--- a/src/boot/me/trans.ml
+++ b/src/boot/me/trans.ml
@@ -2865,14 +2865,6 @@ let trans_visitor
end
tys
- and without_exterior t =
- match t with
- | Ast.TY_mutable t
- | Ast.TY_exterior t
- | Ast.TY_constrained (t, _) ->
- without_exterior t
- | _ -> t
-
and trans_copy_ty
(ty_params:Il.cell)
(initializing:bool)
@@ -2891,7 +2883,7 @@ let trans_visitor
Ast.sprintf_ty src_ty)
end;
in
- assert (without_exterior src_ty = without_exterior dst_ty);
+ assert (simplified_ty src_ty = simplified_ty dst_ty);
match (ty_mem_ctrl src_ty, ty_mem_ctrl dst_ty) with
| (MEM_rc_opaque, MEM_rc_opaque)
@@ -2945,11 +2937,11 @@ let trans_visitor
(src:Il.cell) (src_ty:Ast.ty)
(curr_iso:Ast.ty_iso option)
: unit =
- assert (without_exterior src_ty = without_exterior dst_ty);
+ assert (simplified_ty src_ty = simplified_ty dst_ty);
iflog (fun _ ->
annotate ("heavy copy: slot preparation"));
- let ty = without_exterior src_ty in
+ let ty = simplified_ty src_ty in
let ty = maybe_iso curr_iso ty in
let curr_iso = maybe_enter_iso ty curr_iso in
let (dst, dst_ty) = deref_ty initializing dst dst_ty in