Skip to content

Commit 92419b2

Browse files
committed
---
yaml --- r: 31144 b: refs/heads/dist-snap c: ea5f192 h: refs/heads/master v: v3
1 parent e01c085 commit 92419b2

File tree

4 files changed

+12
-9
lines changed

4 files changed

+12
-9
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,6 @@ refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
88
refs/heads/try2: d0c6ce338884ee21843f4b40bf6bf18d222ce5df
99
refs/heads/incoming: d9317a174e434d4c99fc1a37fd7dc0d2f5328d37
10-
refs/heads/dist-snap: 407094e39a41ba2a6c69ee9cfaba5f600c5632b0
10+
refs/heads/dist-snap: ea5f19206c77fd6413ddfe86290b35520c779df7
1111
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
1212
refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/dist-snap/src/libsyntax/ext/pipes/ast_builder.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ impl ast_builder for ext_ctxt {
6262
{mode: ast::infer(self.next_id()),
6363
ty: ty,
6464
ident: name,
65-
// TODO: should this be the same as the infer id?
65+
// FIXME #2886: should this be the same as the infer id?
6666
id: self.next_id()}
6767
}
6868

@@ -90,7 +90,7 @@ impl ast_builder for ext_ctxt {
9090
output: output,
9191
purity: ast::impure_fn,
9292
cf: ast::return_val,
93-
// TODO: we'll probably want a variant that does constrained
93+
// FIXME #2886: we'll probably want a variant that does constrained
9494
// types.
9595
constraints: ~[]}
9696
}
@@ -157,7 +157,7 @@ impl ast_builder for ext_ctxt {
157157
}
158158

159159
fn ty_path(path: @ast::path) -> @ast::ty {
160-
// TODO: make sure the node ids are legal.
160+
// FIXME #2886: make sure the node ids are legal.
161161
@{id: self.next_id(),
162162
node: ast::ty_path(path, self.next_id()),
163163
span: empty_span()}

branches/dist-snap/src/libsyntax/ext/tt/transcribe.rs

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,8 @@ enum tt_frame_up { /* to break a circularity */
1212
tt_frame_up(option<tt_frame>)
1313
}
1414

15-
/* TODO: figure out how to have a uniquely linked stack, and change to `~` */
15+
/* FIXME #2811: figure out how to have a uniquely linked stack, and change to
16+
`~` */
1617
///an unzipping of `token_tree`s
1718
type tt_frame = @{
1819
readme: ~[ast::token_tree],
@@ -185,7 +186,8 @@ fn tt_next_token(&&r: tt_reader) -> {tok: token, sp: span} {
185186
"attempted to repeat an expression containing no syntax \
186187
variables matched as repeating at this depth");
187188
}
188-
lis_contradiction(msg) { /* TODO blame macro invoker instead*/
189+
lis_contradiction(msg) { /* FIXME #2887 blame macro invoker
190+
instead*/
189191
r.sp_diag.span_fatal(sp, msg);
190192
}
191193
lis_constraint(len, _) {
@@ -196,7 +198,8 @@ fn tt_next_token(&&r: tt_reader) -> {tok: token, sp: span} {
196198

197199
if len == 0 {
198200
if !zerok {
199-
r.sp_diag.span_fatal(sp, /* TODO blame invoker */
201+
r.sp_diag.span_fatal(sp, /* FIXME #2887 blame invoker
202+
*/
200203
"this must repeat at least \
201204
once");
202205
}
@@ -206,7 +209,7 @@ fn tt_next_token(&&r: tt_reader) -> {tok: token, sp: span} {
206209
}
207210
}
208211
}
209-
// TODO: think about span stuff here
212+
// FIXME #2887: think about span stuff here
210213
tt_interpolate(sp, ident) {
211214
alt *lookup_cur_ad(r, ident) {
212215
/* sidestep the interpolation tricks for ident because

branches/dist-snap/src/libsyntax/fold.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -280,7 +280,7 @@ fn noop_fold_item_underscore(i: item_, fld: ast_fold) -> item_ {
280280
/* FIXME (#2543) */ copy methods)
281281
}
282282
item_mac(m) {
283-
// TODO: we might actually want to do something here.
283+
// FIXME #2888: we might actually want to do something here.
284284
item_mac(m)
285285
}
286286
};

0 commit comments

Comments
 (0)