Skip to content

Commit c6888c3

Browse files
committed
---
yaml --- r: 72151 b: refs/heads/dist-snap c: e782e1f h: refs/heads/master i: 72149: edf89b8 72147: eb3288a 72143: 093c074 v: v3
1 parent 9e1a79c commit c6888c3

File tree

6 files changed

+22
-22
lines changed

6 files changed

+22
-22
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
88
refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c
99
refs/heads/incoming: b50030718cf28f2a5a81857a26b57442734fe854
10-
refs/heads/dist-snap: b57611d10c31a7bfdc3703fa938277caaa87f3a7
10+
refs/heads/dist-snap: e782e1f37183b7ad7731cf0fbb474b55d199a9d5
1111
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
1212
refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
1313
refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0

branches/dist-snap/src/libcore/rt/io/file.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@ use super::{Reader, Writer, Seekable, Closeable};
1414
use super::{IoError, SeekStyle};
1515

1616
/// Open a file with the default FileMode and FileAccess
17-
/// # TODO are there sane defaults here?
17+
/// # XXX are there sane defaults here?
1818
pub fn open_file<P: PathLike>(_path: &P) -> FileStream { fail!() }
1919

20-
/// # TODO
20+
/// # XXX
2121
/// * Ugh, this is ridiculous. What is the best way to represent these options?
2222
enum FileMode {
2323
/// Opens an existing file. IoError if file does not exist.
@@ -33,7 +33,7 @@ enum FileMode {
3333
/// Opens an existing file or creates a new one, truncating it to 0 bytes.
3434
CreateOrTruncate,
3535
}
36-
36+
3737
enum FileAccess {
3838
Read,
3939
Write,

branches/dist-snap/src/libcore/rt/io/mem.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
//! Readers and Writers for in-memory buffers
1212
//!
13-
//! # TODO
13+
//! # XXX
1414
//!
1515
//! * Should probably have something like this for strings.
1616
//! * Should they implement Closable? Would take extra state.
@@ -61,7 +61,7 @@ impl Decorator<~[u8]> for MemWriter {
6161
}
6262
}
6363

64-
/// Reads from an owned byte vector
64+
/// Reads from an owned byte vector
6565
pub struct MemReader {
6666
buf: ~[u8],
6767
pos: uint
@@ -109,13 +109,13 @@ impl Decorator<~[u8]> for MemReader {
109109
}
110110
}
111111

112-
112+
113113
/// Writes to a fixed-size byte slice
114114
struct BufWriter<'self> {
115115
buf: &'self mut [u8],
116116
pos: uint
117117
}
118-
118+
119119
impl<'self> BufWriter<'self> {
120120
pub fn new<'a>(buf: &'a mut [u8]) -> BufWriter<'a> {
121121
BufWriter {
@@ -138,7 +138,7 @@ impl<'self> Seekable for BufWriter<'self> {
138138
}
139139

140140

141-
/// Reads from a fixed-size byte slice
141+
/// Reads from a fixed-size byte slice
142142
struct BufReader<'self> {
143143
buf: &'self [u8],
144144
pos: uint

branches/dist-snap/src/libcore/rt/io/mod.rs

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
/*! Synchronous I/O
1212
1313
This module defines the Rust interface for synchronous I/O.
14-
It supports file access,
14+
It supports file access,
1515
1616
This will likely live in core::io, not core::rt::io.
1717
@@ -73,7 +73,7 @@ Some I/O things don't belong in core
7373
- http
7474
- flate
7575
76-
# TODO
76+
# XXX
7777
7878
* Should default constructors take `Path` or `&str`? `Path` makes simple cases verbose.
7979
Overloading would be nice.
@@ -149,10 +149,10 @@ mod misc;
149149
pub mod blocking {
150150
/// Posix file I/O
151151
pub mod file;
152-
/// # TODO - implement this
152+
/// # XXX - implement this
153153
pub mod stdio { }
154154
/// Sockets
155-
/// # TODO - implement this
155+
/// # XXX - implement this
156156
pub mod net {
157157
pub mod tcp { }
158158
pub mod udp { }
@@ -164,7 +164,7 @@ pub mod blocking {
164164

165165
/// The type passed to I/O condition handlers to indicate error
166166
///
167-
/// # TODO
167+
/// # XXX
168168
///
169169
/// Is something like this sufficient? It's kind of archaic
170170
pub struct IoError {
@@ -195,7 +195,7 @@ pub trait Reader {
195195
///
196196
/// Raises the `io_error` condition on error, then returns `None`.
197197
///
198-
/// # TODO
198+
/// # XXX
199199
///
200200
/// This doesn't take a `len` argument like the old `read`.
201201
/// Will people often need to slice their vectors to call this
@@ -211,7 +211,7 @@ pub trait Reader {
211211
/// println(reader.read_line());
212212
/// }
213213
///
214-
/// # TODO
214+
/// # XXX
215215
///
216216
/// What does this return if the Reader is in an error state?
217217
fn eof(&mut self) -> bool;
@@ -249,7 +249,7 @@ pub enum SeekStyle {
249249
SeekCur,
250250
}
251251

252-
/// # TODO
252+
/// # XXX
253253
/// * Are `u64` and `i64` the right choices?
254254
pub trait Seekable {
255255
fn tell(&self) -> u64;
@@ -262,13 +262,13 @@ pub trait Seekable {
262262
/// uses decorators to add functionality like compression and encryption to I/O
263263
/// streams.
264264
///
265-
/// # TODO
265+
/// # XXX
266266
///
267267
/// Is this worth having a trait for? May be overkill
268268
pub trait Decorator<T> {
269269
/// Destroy the decorator and extract the decorated value
270270
///
271-
/// # TODO
271+
/// # XXX
272272
///
273273
/// Because this takes `self' one could never 'undecorate' a Reader/Writer
274274
/// that has been boxed. Is that ok? This feature is mostly useful for

branches/dist-snap/src/libcore/rt/io/net/http.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ struct HttpServer;
1717
#[cfg(test)]
1818
mod test {
1919
use unstable::run_in_bare_thread;
20-
20+
2121
#[test] #[ignore]
2222
fn smoke_test() {
2323
do run_in_bare_thread {

branches/dist-snap/src/libcore/rt/io/util.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010

1111
//! Utility mixins that apply to all Readers and Writers
1212
13-
// TODO: Not sure how this should be structured
14-
// TODO: Iteration should probably be considered seperately
13+
// XXX: Not sure how this should be structured
14+
// XXX: Iteration should probably be considered seperately
1515

1616
pub trait ReaderUtil {
1717

0 commit comments

Comments
 (0)