---

sfackler · sfackler · commit 58b94dd68ca3 · 2014-04-06T15:40:01.000-07:00
yaml --- r: 110200 b: refs/heads/auto c: fcf9b30 h: refs/heads/master v: v3
diff --git a/[refs] b/[refs]
@@ -13,7 +13,7 @@ refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0
 refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
 refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
 refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
-refs/heads/auto: 49a80810950a2f2ea12f5efd4cf188cb68cb1283
+refs/heads/auto: fcf9b30f426fcf8fd0b6e0a044825fdfa4a1bfdb
 refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167
 refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c
 refs/tags/0.1: b19db808c2793fe2976759b85a355c3ad8c8b336
diff --git a/branches/auto/src/libstd/io/util.rs b/branches/auto/src/libstd/io/util.rs
@@ -85,12 +85,12 @@ impl Reader for NullReader {
 
 /// A `Writer` which multiplexes writes to a set of `Writers`.
 pub struct MultiWriter {
-    writers: ~[~Writer]
+    writers: Vec<~Writer>
 }
 
 impl MultiWriter {
     /// Creates a new `MultiWriter`
-    pub fn new(writers: ~[~Writer]) -> MultiWriter {
+    pub fn new(writers: Vec<~Writer>) -> MultiWriter {
         MultiWriter { writers: writers }
     }
 }
@@ -273,8 +273,8 @@ mod test {
             }
         }
 
-        let mut multi = MultiWriter::new(~[~TestWriter as ~Writer,
-                                           ~TestWriter as ~Writer]);
+        let mut multi = MultiWriter::new(vec!(~TestWriter as ~Writer,
+                                              ~TestWriter as ~Writer));
         multi.write([1, 2, 3]).unwrap();
         assert_eq!(2, unsafe { writes });
         assert_eq!(0, unsafe { flushes });
@@ -285,8 +285,8 @@ mod test {
 
     #[test]
     fn test_chained_reader() {
-        let rs = ~[MemReader::new(vec!(0, 1)), MemReader::new(vec!()),
-                   MemReader::new(vec!(2, 3))];
+        let rs = vec!(MemReader::new(vec!(0, 1)), MemReader::new(vec!()),
+                      MemReader::new(vec!(2, 3)));
         let mut r = ChainedReader::new(rs.move_iter());
         assert_eq!(vec!(0, 1, 2, 3), r.read_to_end().unwrap());
     }

Original file line number	Diff line number	Diff line change
`@@ -85,12 +85,12 @@ impl Reader for NullReader {`
`85`	`85`
`86`	`86`	/// A `Writer` which multiplexes writes to a set of `Writers`.
`87`	`87`	`pub struct MultiWriter {`
`88`		`- writers: ~[~Writer]`
	`88`	`+ writers: Vec<~Writer>`
`89`	`89`	`}`
`90`	`90`
`91`	`91`	`impl MultiWriter {`
`92`	`92`	/// Creates a new `MultiWriter`
`93`		`- pub fn new(writers: ~[~Writer]) -> MultiWriter {`
	`93`	`+ pub fn new(writers: Vec<~Writer>) -> MultiWriter {`
`94`	`94`	`MultiWriter { writers: writers }`
`95`	`95`	`}`
`96`	`96`	`}`
`@@ -273,8 +273,8 @@ mod test {`
`273`	`273`	`}`
`274`	`274`	`}`
`275`	`275`
`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));`
`278`	`278`	`multi.write([1, 2, 3]).unwrap();`
`279`	`279`	`assert_eq!(2, unsafe { writes });`
`280`	`280`	`assert_eq!(0, unsafe { flushes });`
`@@ -285,8 +285,8 @@ mod test {`
`285`	`285`
`286`	`286`	`#[test]`
`287`	`287`	`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)));`
`290`	`290`	`let mut r = ChainedReader::new(rs.move_iter());`
`291`	`291`	`assert_eq!(vec!(0, 1, 2, 3), r.read_to_end().unwrap());`
`292`	`292`	`}`