Skip to content

Commit d7c8386

Browse files
committed
---
yaml --- r: 13487 b: refs/heads/master c: 6b16325 h: refs/heads/master i: 13485: dc56476 13483: 84c5215 13479: e07d041 13471: 44deac9 v: v3
1 parent 352b93c commit d7c8386

File tree

5 files changed

+7
-4
lines changed

5 files changed

+7
-4
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
refs/heads/master: dce5d6ab9c2098d83a5499f8ad33bc0a1a649762
2+
refs/heads/master: 6b16325f43d1e7bbdc7ad55301c17c027f9a716d
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: 4a81779abd786ff22d71434c6d9a5917ea4cdfff
55
refs/heads/try: 2898dcc5d97da9427ac367542382b6239d9c0bbf

trunk/src/libstd/par.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ fn map_slices<A: copy send, B: copy send>(
3939
log(info, "spawning tasks");
4040
while base < len {
4141
let end = uint::min(len, base + items_per_task);
42-
// FIXME: why is the ::<A, ()> annotation required here?
42+
// FIXME: why is the ::<A, ()> annotation required here? (#2617)
4343
vec::unpack_slice::<A, ()>(xs) {|p, _len|
4444
let f = f();
4545
futures += [future::spawn() {|copy base|

trunk/src/libsyntax/ast_map.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import diagnostic::span_handler;
99
enum path_elt { path_mod(ident), path_name(ident) }
1010
type path = [path_elt];
1111

12+
/* FIXMEs that say "bad" are as per #2543 */
1213
fn path_to_str_with_sep(p: path, sep: str) -> str {
1314
let strs = vec::map(p) {|e|
1415
alt e {
@@ -291,6 +292,7 @@ fn node_id_to_str(map: map, id: node_id) -> str {
291292
#fmt["expr %s (id=%?)",
292293
pprust::expr_to_str(expr), id]
293294
}
295+
// FIXMEs are as per #2410
294296
some(node_export(_, path)) {
295297
#fmt["export %s (id=%?)", // FIXME: add more info here
296298
path_to_str(*path), id]

trunk/src/libsyntax/ast_util.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ pure fn dummy_sp() -> span { ret mk_sp(0u, 0u); }
2424
pure fn path_name(p: @path) -> str { path_name_i(p.idents) }
2525

2626
pure fn path_name_i(idents: [ident]) -> str {
27-
// FIXME: Bad copies
27+
// FIXME: Bad copies (#2543 -- same for everything else that says "bad")
2828
str::connect(idents.map({|i|*i}), "::")
2929
}
3030

trunk/src/libsyntax/attr.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,7 @@ fn get_attr_name(attr: ast::attribute) -> ast::ident {
8888
get_meta_item_name(@attr.node.value)
8989
}
9090

91+
// All "bad" FIXME copies are as per #2543
9192
fn get_meta_item_name(meta: @ast::meta_item) -> ast::ident {
9293
alt meta.node {
9394
ast::meta_word(n) { /* FIXME bad */ copy n }
@@ -372,7 +373,7 @@ fn require_unique_names(diagnostic: span_handler,
372373
for metas.each {|meta|
373374
let name = get_meta_item_name(meta);
374375

375-
// FIXME: How do I silence the warnings? --pcw
376+
// FIXME: How do I silence the warnings? --pcw (#2619)
376377
if map.contains_key(*name) {
377378
diagnostic.span_fatal(meta.span,
378379
#fmt["duplicate meta item `%s`", *name]);

0 commit comments

Comments
 (0)