---

yaml
---
r: 13707
b: refs/heads/master
c: 15b60ac
h: refs/heads/master
i:
  13705: 3678f70
  13703: 005dc5c
v: v3

Author: msullivan

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 329eca6044fdf376a7a89ec7a96dba7a8b884cf7
+refs/heads/master: 15b60ac56b8f4ac84b49c1cad60655e6cd6433f2
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 4a81779abd786ff22d71434c6d9a5917ea4cdfff
 refs/heads/try: 2898dcc5d97da9427ac367542382b6239d9c0bbf

trunk/src/rustc/middle/trans/base.rs

@@ -2055,7 +2055,7 @@ fn trans_external_path(ccx: @crate_ctxt, did: ast::def_id, t: ty::t)
 }
 
 fn normalize_for_monomorphization(tcx: ty::ctxt, ty: ty::t) -> option<ty::t> {
-    // FIXME[mono]/~ could do this recursively. is that worthwhile? (#2529)
+    // FIXME[mono] could do this recursively. is that worthwhile? (#2529)
     alt ty::get(ty).struct {
       ty::ty_box(mt) { some(ty::mk_opaque_box(tcx)) }
       ty::ty_fn(fty) { some(ty::mk_fn(tcx, {purity: ast::impure_fn,

trunk/src/rustc/middle/trans/closure.rs

@@ -136,7 +136,7 @@ fn mk_closure_tys(tcx: ty::ctxt,
         }]/~;
     }
     let bound_data_ty = ty::mk_tup(tcx, bound_tys);
-    // FIXME[mono]/~ remove tuple of tydescs from closure types (#2531)
+    // FIXME[mono] remove tuple of tydescs from closure types (#2531)
     let cdata_ty = ty::mk_tup(tcx, [ty::mk_tup(tcx, []/~),
                                     bound_data_ty]/~);
     #debug["cdata_ty=%s", ty_to_str(tcx, cdata_ty)];

trunk/src/rustc/middle/trans/impl.rs

@@ -151,7 +151,7 @@ fn trans_iface_callee(bcx: block, val: ValueRef,
     let vtable = Load(bcx, PointerCast(bcx, GEPi(bcx, val, [0u, 0u]/~),
                                        T_ptr(T_ptr(T_vtable()))));
     let box = Load(bcx, GEPi(bcx, val, [0u, 1u]/~));
-    // FIXME[impl]/~ I doubt this is alignment-safe (#2534)
+    // FIXME[impl] I doubt this is alignment-safe (#2534)
     let self = GEPi(bcx, box, [0u, abi::box_field_body]/~);
     let env = self_env(self, ty::mk_opaque_box(bcx.tcx()), some(box));
     let llfty = type_of::type_of_fn_from_ty(ccx, callee_ty);