Skip to content

Commit da31c8e

Browse files
committed
---
yaml --- r: 109794 b: refs/heads/snap-stage3 c: fcf9b30 h: refs/heads/master v: v3
1 parent e5cda07 commit da31c8e

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
refs/heads/master: b8ef9fd9c9f642ce7b8aed82782a1ed745d08d64
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
4-
refs/heads/snap-stage3: 49a80810950a2f2ea12f5efd4cf188cb68cb1283
4+
refs/heads/snap-stage3: fcf9b30f426fcf8fd0b6e0a044825fdfa4a1bfdb
55
refs/heads/try: f64fdf524a434f0e5cd0bc91d09c144723f3c90d
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

branches/snap-stage3/src/libstd/io/util.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -85,12 +85,12 @@ impl Reader for NullReader {
8585

8686
/// A `Writer` which multiplexes writes to a set of `Writers`.
8787
pub struct MultiWriter {
88-
writers: ~[~Writer]
88+
writers: Vec<~Writer>
8989
}
9090

9191
impl MultiWriter {
9292
/// Creates a new `MultiWriter`
93-
pub fn new(writers: ~[~Writer]) -> MultiWriter {
93+
pub fn new(writers: Vec<~Writer>) -> MultiWriter {
9494
MultiWriter { writers: writers }
9595
}
9696
}
@@ -273,8 +273,8 @@ mod test {
273273
}
274274
}
275275

276-
let mut multi = MultiWriter::new(~[~TestWriter as ~Writer,
277-
~TestWriter as ~Writer]);
276+
let mut multi = MultiWriter::new(vec!(~TestWriter as ~Writer,
277+
~TestWriter as ~Writer));
278278
multi.write([1, 2, 3]).unwrap();
279279
assert_eq!(2, unsafe { writes });
280280
assert_eq!(0, unsafe { flushes });
@@ -285,8 +285,8 @@ mod test {
285285

286286
#[test]
287287
fn test_chained_reader() {
288-
let rs = ~[MemReader::new(vec!(0, 1)), MemReader::new(vec!()),
289-
MemReader::new(vec!(2, 3))];
288+
let rs = vec!(MemReader::new(vec!(0, 1)), MemReader::new(vec!()),
289+
MemReader::new(vec!(2, 3)));
290290
let mut r = ChainedReader::new(rs.move_iter());
291291
assert_eq!(vec!(0, 1, 2, 3), r.read_to_end().unwrap());
292292
}

0 commit comments

Comments
 (0)