Skip to content

Commit e09888b

Browse files
JIghtusealexcrichton
authored andcommitted
---
yaml --- r: 110543 b: refs/heads/master c: 00cbda2 h: refs/heads/master i: 110541: cd82bb0 110539: eb79d44 110535: 19e2fd7 110527: 9bfc849 v: v3
1 parent 4f2f512 commit e09888b

File tree

5 files changed

+8
-7
lines changed

5 files changed

+8
-7
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: de2567dec9cfceec59db5d6d17df09c05f70d5a1
2+
refs/heads/master: 00cbda2d0af81a054ba61bd237f98e033ba7a2fa
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: e263ef1df7b892ed29e53313565eb05ab75e52f4
55
refs/heads/try: 597a645456b55e1c886ce15d23a192abdf4d55cf

trunk/src/etc/tidy.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,10 +65,11 @@ def do_license_check(name, contents):
6565
check_tab = False
6666
if line.find(linelength_flag) != -1:
6767
check_linelength = False
68-
if line.find("// XXX") != -1:
69-
report_err("XXX is no longer necessary, use FIXME")
7068
if line.find("TODO") != -1:
7169
report_err("TODO is deprecated; use FIXME")
70+
match = re.match(r'^.*/(\*|/!?)\s*XXX', line)
71+
if match:
72+
report_err("XXX is no longer necessary, use FIXME")
7273
match = re.match(r'^.*//\s*(NOTE.*)$', line)
7374
if match:
7475
m = match.group(1)

trunk/src/librustuv/addrinfo.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ impl Drop for Addrinfo {
120120
}
121121

122122
fn each_ai_flag(_f: |c_int, ai::Flag|) {
123-
/* XXX: do we really want to support these?
123+
/* FIXME: do we really want to support these?
124124
unsafe {
125125
f(uvll::rust_AI_ADDRCONFIG(), ai::AddrConfig);
126126
f(uvll::rust_AI_ALL(), ai::All);
@@ -150,7 +150,7 @@ pub fn accum_addrinfo(addr: &Addrinfo) -> ~[ai::Info] {
150150
}
151151
});
152152

153-
/* XXX: do we really want to support these
153+
/* FIXME: do we really want to support these
154154
let protocol = match (*addr).ai_protocol {
155155
p if p == uvll::rust_IPPROTO_UDP() => Some(ai::UDP),
156156
p if p == uvll::rust_IPPROTO_TCP() => Some(ai::TCP),

trunk/src/libstd/rt/local_ptr.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
//!
1313
//! The runtime will use this for storing ~Task.
1414
//!
15-
//! XXX: Add runtime checks for usage of inconsistent pointer types.
15+
//! FIXME: Add runtime checks for usage of inconsistent pointer types.
1616
//! and for overwriting an existing pointer.
1717
1818
#![allow(dead_code)]

trunk/src/test/bench/shootout-threadring.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ use std::os;
1515
fn start(n_tasks: int, token: int) {
1616
let (tx, mut rx) = channel();
1717
tx.send(token);
18-
// XXX could not get this to work with a range closure
18+
// FIXME could not get this to work with a range closure
1919
let mut i = 2;
2020
while i <= n_tasks {
2121
let (tx, next_rx) = channel();

0 commit comments

Comments
 (0)