From 889be71cb4d4252073f2dbdedb71e8ea1645f6e3 Mon Sep 17 00:00:00 2001 From: Tim Chevalier Date: Thu, 5 Jul 2012 15:58:25 -0700 Subject: [PATCH] Comments only: change TODOs to FIXMEs and annotate them --- src/libstd/rope.rs | 8 +++++--- src/libstd/term.rs | 2 +- src/libstd/treemap.rs | 2 +- src/libsyntax/attr.rs | 2 +- src/libsyntax/ext/auto_serialize.rs | 2 +- src/libsyntax/parse/lexer.rs | 3 ++- src/rustc/back/link.rs | 4 ++-- src/rustc/middle/astencode.rs | 2 +- src/rustc/middle/ty.rs | 3 --- src/rustc/middle/typeck/collect.rs | 3 ++- src/rustc/middle/typeck/infer.rs | 4 ++-- src/test/bench/task-perf-word-count-generic.rs | 2 +- src/test/run-pass/unchecked-predicates.rs | 2 -- 13 files changed, 19 insertions(+), 20 deletions(-) diff --git a/src/libstd/rope.rs b/src/libstd/rope.rs index 1a90612869b..187640a54cf 100644 --- a/src/libstd/rope.rs +++ b/src/libstd/rope.rs @@ -588,7 +588,8 @@ mod node { * Used for rebalancing and to allocate stacks for traversals. */ type concat = { - left: @node,//TODO: Perhaps a `vec` instead of `left`/`right` + //FIXME (#2744): Perhaps a `vec` instead of `left`/`right` + left: @node, right: @node, char_len: uint, byte_len: uint, @@ -732,7 +733,8 @@ mod node { } pure fn byte_len(node: @node) -> uint { - alt(*node) {//TODO: Could we do this without the pattern-matching? + //FIXME (#2744): Could we do this without the pattern-matching? + alt(*node) { leaf(y) { ret y.byte_len; } concat(y){ ret y.byte_len; } } @@ -805,7 +807,7 @@ mod node { alt(leaf_iterator::next(it)) { option::none { break; } option::some(x) { - //TODO: Replace with memcpy or something similar + //FIXME (#2744): Replace with memcpy or something similar let mut local_buf: ~[u8] = unsafe::reinterpret_cast(*x.content); let mut i = x.byte_offset; diff --git a/src/libstd/term.rs b/src/libstd/term.rs index fb134e85295..c76417bce08 100644 --- a/src/libstd/term.rs +++ b/src/libstd/term.rs @@ -2,7 +2,7 @@ import core::option; -// TODO: Windows support. +// FIXME (#2807): Windows support. const color_black: u8 = 0u8; const color_red: u8 = 1u8; diff --git a/src/libstd/treemap.rs b/src/libstd/treemap.rs index 1fde1c4fd6a..1a3626e4660 100644 --- a/src/libstd/treemap.rs +++ b/src/libstd/treemap.rs @@ -55,7 +55,7 @@ fn find(m: &const tree_edge, k: K) -> option { alt copy *m { none { none } - // TODO: was that an optimization? + // FIXME (#2808): was that an optimization? some(node) { if k == node.key { some(node.value) diff --git a/src/libsyntax/attr.rs b/src/libsyntax/attr.rs index 838e275332b..43a6183b4d5 100644 --- a/src/libsyntax/attr.rs +++ b/src/libsyntax/attr.rs @@ -368,7 +368,7 @@ enum inline_attr { /// True if something like #[inline] is found in the list of attrs. fn find_inline_attr(attrs: ~[ast::attribute]) -> inline_attr { - // TODO---validate the usage of #[inline] and #[inline(always)] + // FIXME (#2809)---validate the usage of #[inline] and #[inline(always)] do vec::foldl(ia_none, attrs) |ia,attr| { alt attr.node.value.node { ast::meta_word(@"inline") { ia_hint } diff --git a/src/libsyntax/ext/auto_serialize.rs b/src/libsyntax/ext/auto_serialize.rs index a1e6aa06d59..64da3a7dcbd 100644 --- a/src/libsyntax/ext/auto_serialize.rs +++ b/src/libsyntax/ext/auto_serialize.rs @@ -58,7 +58,7 @@ Similarly, the code to deserialize an instance of a non-built-in type where `c_Ti` is the code to deserialize an instance of `Ti` using the deserializer `d`. -TODO--Hygiene. Search for "__" strings. We also assume "std" is the +FIXME (#2810)--Hygiene. Search for "__" strings. We also assume "std" is the standard library. Misc notes: diff --git a/src/libsyntax/parse/lexer.rs b/src/libsyntax/parse/lexer.rs index a85e791696f..333ff95c74d 100644 --- a/src/libsyntax/parse/lexer.rs +++ b/src/libsyntax/parse/lexer.rs @@ -23,7 +23,8 @@ enum tt_frame_up { /* to break a circularity */ tt_frame_up(option) } -/* TODO: figure out how to have a uniquely linked stack, and change to `~` */ +/* FIXME (#2811): figure out how to have a uniquely linked stack, + and change to `~` */ /// an unzipping of `token_tree`s type tt_frame = @{ readme: ~[ast::token_tree], diff --git a/src/rustc/back/link.rs b/src/rustc/back/link.rs index 33f9f376953..2ef5fb17dd8 100644 --- a/src/rustc/back/link.rs +++ b/src/rustc/back/link.rs @@ -58,8 +58,8 @@ mod write { let td = mk_target_data( sess.targ_cfg.target_strs.data_layout); llvm::LLVMAddTargetData(td.lltd, pm.llpm); - // TODO: run the linter here also, once there are llvm-c bindings for - // it. + // FIXME (#2812): run the linter here also, once there are llvm-c + // bindings for it. // Generate a pre-optimization intermediate file if -save-temps was // specified. 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 = ~[]; diff --git a/src/test/bench/task-perf-word-count-generic.rs b/src/test/bench/task-perf-word-count-generic.rs index fa22e77eac7..8e7ba1d3e3a 100644 --- a/src/test/bench/task-perf-word-count-generic.rs +++ b/src/test/bench/task-perf-word-count-generic.rs @@ -235,7 +235,7 @@ fn main(argv: ~[str]) { out.write_line(#fmt["Usage: %s ...", argv[0]]); - // TODO: run something just to make sure the code hasn't + // FIXME (#2815): run something just to make sure the code hasn't // broken yet. This is the unit test mode of this program. ret; diff --git a/src/test/run-pass/unchecked-predicates.rs b/src/test/run-pass/unchecked-predicates.rs index 99131811ae1..c897c676329 100644 --- a/src/test/run-pass/unchecked-predicates.rs +++ b/src/test/run-pass/unchecked-predicates.rs @@ -1,6 +1,4 @@ // Uses foldl to exhibit the unchecked block syntax. -// TODO: since list's head/tail require the predicate "is_not_empty" now and -// we have unit tests for list, this test might me not necessary anymore? use std; import std::list::*;