diff options
| -rw-r--r-- | src/cargo/cargo.rs | 12 | ||||
| -rw-r--r-- | src/libcore/extfmt.rs | 2 | ||||
| -rw-r--r-- | src/libcore/io.rs | 6 | ||||
| -rw-r--r-- | src/libcore/num.rs | 3 | ||||
| -rw-r--r-- | src/libstd/ebml.rs | 17 | ||||
| -rw-r--r-- | src/libsyntax/parse/parser.rs | 2 |
6 files changed, 23 insertions, 19 deletions
diff --git a/src/cargo/cargo.rs b/src/cargo/cargo.rs index 8cb2b0cc21b..5116d75f6f5 100644 --- a/src/cargo/cargo.rs +++ b/src/cargo/cargo.rs @@ -743,15 +743,15 @@ fn install_one_crate(c: cargo, path: str, cf: str) { #debug(" bin: %s", ct); install_to_dir(ct, c.bindir); if c.opts.mode == system_mode { - // TODO: Put this file in PATH / symlink it so it can be - // used as a generic executable + // FIXME (#2662): Put this file in PATH / symlink it so it can + // be used as a generic executable // `cargo install -G rustray` and `rustray file.obj` } } else { #debug(" lib: %s", ct); install_to_dir(ct, c.libdir); } - } + } } @@ -788,7 +788,9 @@ fn install_source(c: cargo, path: str) { none { cont; } some(crate) { for crate.deps.each |query| { - // TODO: handle cyclic dependencies + // FIXME (#1356): handle cyclic dependencies + // (n.b. #1356 says "Cyclic dependency is an error + // condition") let wd_base = c.workdir + path::path_sep(); let wd = alt tempfile::mkdtemp(wd_base, "") { @@ -797,7 +799,6 @@ fn install_source(c: cargo, path: str) { }; install_query(c, wd, query); - } os::change_dir(path); @@ -808,6 +809,7 @@ fn install_source(c: cargo, path: str) { } } } + } } fn install_git(c: cargo, wd: str, url: str, ref: option<str>) { diff --git a/src/libcore/extfmt.rs b/src/libcore/extfmt.rs index e156e595490..9d37ac14fbf 100644 --- a/src/libcore/extfmt.rs +++ b/src/libcore/extfmt.rs @@ -228,7 +228,7 @@ mod ct { {ty: ty, next: uint} { if i >= lim { error("missing type in conversion"); } let tstr = str::slice(s, i, i+1u); - // TODO: Do we really want two signed types here? + // FIXME (#2249): Do we really want two signed types here? // How important is it to be printf compatible? let t = if str::eq(tstr, "b") { diff --git a/src/libcore/io.rs b/src/libcore/io.rs index 08da519a1bc..14c5736120b 100644 --- a/src/libcore/io.rs +++ b/src/libcore/io.rs @@ -259,8 +259,7 @@ fn file_reader(path: str) -> result<reader, str> { // Byte buffer readers -// TODO: const u8, but this fails with rustboot. -type byte_buf = {buf: ~[u8], mut pos: uint, len: uint}; +type byte_buf = {buf: ~[const u8], mut pos: uint, len: uint}; impl of reader for byte_buf { fn read_bytes(len: uint) -> ~[u8] { @@ -277,7 +276,8 @@ impl of reader for byte_buf { self.pos += 1u; ret b as int; } - fn unread_byte(_byte: int) { #error("TODO: unread_byte"); fail; } + // FIXME (#2738): implement this + fn unread_byte(_byte: int) { #error("Unimplemented: unread_byte"); fail; } fn eof() -> bool { self.pos == self.len } fn seek(offset: int, whence: seek_style) { let pos = self.pos; diff --git a/src/libcore/num.rs b/src/libcore/num.rs index 551b444d89c..130b259c1df 100644 --- a/src/libcore/num.rs +++ b/src/libcore/num.rs @@ -11,6 +11,7 @@ iface num { fn neg() -> self; fn to_int() -> int; - fn from_int(n: int) -> self; // TODO: Static functions. + fn from_int(n: int) -> self; // FIXME (#2376) Static functions. + // n.b. #2376 is for classes, not ifaces, but it could be generalized... } diff --git a/src/libstd/ebml.rs b/src/libstd/ebml.rs index 2258f63b660..395a411aeea 100644 --- a/src/libstd/ebml.rs +++ b/src/libstd/ebml.rs @@ -32,8 +32,8 @@ type ebml_tag = {id: uint, size: uint}; type ebml_state = {ebml_tag: ebml_tag, tag_pos: uint, data_pos: uint}; -// TODO: When we have module renaming, make "reader" and "writer" separate -// modules within this file. +// FIXME (#2739): When we have module renaming, make "reader" and "writer" +// separate modules within this file. // ebml reading type doc = {data: @~[u8], start: uint, end: uint}; @@ -189,7 +189,7 @@ fn writer(w: io::writer) -> writer { ret {writer: w, mut size_positions: size_positions}; } -// TODO: Provide a function to write the standard ebml header. +// FIXME (#2741): Provide a function to write the standard ebml header. impl writer for writer { fn start_tag(tag_id: uint) { #debug["Start tag %u", tag_id]; @@ -291,8 +291,8 @@ impl writer for writer { } } -// TODO: optionally perform "relaxations" on end_tag to more efficiently -// encode sizes; this is a fixed point iteration +// FIXME (#2743): optionally perform "relaxations" on end_tag to more +// efficiently encode sizes; this is a fixed point iteration // Set to true to generate more debugging in EBML serialization. // Totally lame approach. @@ -343,9 +343,10 @@ impl serializer of serialization::serializer for ebml::writer { fn emit_bool(v: bool) { self.wr_tagged_u8(es_bool as uint, v as u8) } - fn emit_f64(_v: f64) { fail "TODO"; } - fn emit_f32(_v: f32) { fail "TODO"; } - fn emit_float(_v: float) { fail "TODO"; } + // FIXME (#2742): implement these + fn emit_f64(_v: f64) { fail "Unimplemented: serializing an f64"; } + fn emit_f32(_v: f32) { fail "Unimplemented: serializing an f32"; } + fn emit_float(_v: float) { fail "Unimplemented: serializing a float"; } fn emit_str(v: str) { self.wr_tagged_str(es_str as uint, v) } diff --git a/src/libsyntax/parse/parser.rs b/src/libsyntax/parse/parser.rs index bec58354137..4d13b8ac9a5 100644 --- a/src/libsyntax/parse/parser.rs +++ b/src/libsyntax/parse/parser.rs @@ -2139,7 +2139,7 @@ class parser { Is it strange for the parser to check this? */ none { - self.fatal("class with no ctor"); + self.fatal("class with no constructor"); } } } |