Comments only: change TODOs to FIXMEs and annotate them

4 files changed, 5 insertions, 7 deletions

diff --git a/src/rustc/middle/astencode.rs b/src/rustc/middle/astencode.rs
index ced44551a7f..2f165b7ff02 100644
--- a/src/rustc/middle/astencode.rs
+++ b/src/rustc/middle/astencode.rs
@@ -162,7 +162,7 @@ impl translation_routines for extended_decode_ctxt {
         {crate: ast::local_crate, node: self.tr_id(did.node)}
     }
     fn tr_span(_span: span) -> span {
-        ast_util::dummy_sp() // TODO...
+        ast_util::dummy_sp() // FIXME (#1972): handle span properly
     }
 }
 
diff --git a/src/rustc/middle/ty.rs b/src/rustc/middle/ty.rs
index 298aecf4fd7..6580feab330 100644
--- a/src/rustc/middle/ty.rs
+++ b/src/rustc/middle/ty.rs
@@ -2758,9 +2758,6 @@ fn lookup_field_type(tcx: ctxt, class_id: def_id, id: def_id,
            some(tpt) { tpt.ty }
            none {
                let tpt = csearch::get_field_type(tcx, class_id, id);
-               // ok b/c fields are monomorphic
-               // TODO: Comment might be a lie, what if it mentions
-               // class-bound ty params?
                tcx.tcache.insert(id, tpt);
                tpt.ty
            }
diff --git a/src/rustc/middle/typeck/collect.rs b/src/rustc/middle/typeck/collect.rs
index 16423bbd8d8..84ed98be6f4 100644
--- a/src/rustc/middle/typeck/collect.rs
+++ b/src/rustc/middle/typeck/collect.rs
@@ -344,7 +344,8 @@ fn convert(ccx: @crate_ctxt, it: @ast::item) {
               inputs: t_args,
               output: t_res,
               ret_style: ast::return_val,
-              constraints: ~[]}); // tjc TODO
+              constraints: ~[]}); // FIXME (#2813): allow ctors to have
+         // constraints, or remove constraints from the language
         write_ty_to_tcx(tcx, ctor.node.id, t_ctor);
         tcx.tcache.insert(local_def(ctor.node.id),
                           {bounds: tpt.bounds,
diff --git a/src/rustc/middle/typeck/infer.rs b/src/rustc/middle/typeck/infer.rs
index bdcc3dea7fb..ab72c5637ff 100644
--- a/src/rustc/middle/typeck/infer.rs
+++ b/src/rustc/middle/typeck/infer.rs
@@ -554,8 +554,8 @@ impl transaction_methods for infer_ctxt {
 
         let r <- self.try(f);
 
-        // TODO---could use a vec::clear() that ran destructors but kept
-        // the vec at its currently allocated length
+        // FIXME (#2814)---could use a vec::clear() that ran destructors but
+        // kept the vec at its currently allocated length
         self.tvb.bindings = ~[];
         self.rb.bindings = ~[];