From: bors <bors@rust-lang.org>
Date: Fri, 17 Jan 2014 20:02:07 +0000 (-0800)
Subject: auto merge of #11598 : alexcrichton/rust/io-export, r=brson
X-Git-Url: https://git.lizzy.rs/?a=commitdiff_plain;h=9bf85a250c93fbd5e65440bba6d300908fb08b9a;p=rust.git

auto merge of #11598 : alexcrichton/rust/io-export, r=brson

* Reexport io::mem and io::buffered structs directly under io, make mem/buffered
  private modules
* Remove with_mem_writer
* Remove DEFAULT_CAPACITY and use DEFAULT_BUF_SIZE (in io::buffered)

cc #11119
---

9bf85a250c93fbd5e65440bba6d300908fb08b9a
diff --cc src/libextra/ebml.rs
index a927c3b02bc,9feaa327324..84d4584751d
--- a/src/libextra/ebml.rs
+++ b/src/libextra/ebml.rs
@@@ -943,57 -935,9 +943,57 @@@ mod tests 
      use serialize::Encodable;
      use serialize;
  
-     use std::io::mem::MemWriter;
+     use std::io::MemWriter;
      use std::option::{None, Option, Some};
  
 +    #[test]
 +    fn test_vuint_at() {
 +        let data = [
 +            0x80,
 +            0xff,
 +            0x40, 0x00,
 +            0x7f, 0xff,
 +            0x20, 0x00, 0x00,
 +            0x3f, 0xff, 0xff,
 +            0x10, 0x00, 0x00, 0x00,
 +            0x1f, 0xff, 0xff, 0xff
 +        ];
 +
 +        let mut res: reader::Res;
 +
 +        // Class A
 +        res = reader::vuint_at(data, 0);
 +        assert_eq!(res.val, 0);
 +        assert_eq!(res.next, 1);
 +        res = reader::vuint_at(data, res.next);
 +        assert_eq!(res.val, (1 << 7) - 1);
 +        assert_eq!(res.next, 2);
 +
 +        // Class B
 +        res = reader::vuint_at(data, res.next);
 +        assert_eq!(res.val, 0);
 +        assert_eq!(res.next, 4);
 +        res = reader::vuint_at(data, res.next);
 +        assert_eq!(res.val, (1 << 14) - 1);
 +        assert_eq!(res.next, 6);
 +
 +        // Class C
 +        res = reader::vuint_at(data, res.next);
 +        assert_eq!(res.val, 0);
 +        assert_eq!(res.next, 9);
 +        res = reader::vuint_at(data, res.next);
 +        assert_eq!(res.val, (1 << 21) - 1);
 +        assert_eq!(res.next, 12);
 +
 +        // Class D
 +        res = reader::vuint_at(data, res.next);
 +        assert_eq!(res.val, 0);
 +        assert_eq!(res.next, 16);
 +        res = reader::vuint_at(data, res.next);
 +        assert_eq!(res.val, (1 << 28) - 1);
 +        assert_eq!(res.next, 20);
 +    }
 +
      #[test]
      fn test_option_int() {
          fn test_v(v: Option<int>) {
diff --cc src/libstd/io/mem.rs
index a6caa1bfc29,660c3d3adbc..6c380be343c
--- a/src/libstd/io/mem.rs
+++ b/src/libstd/io/mem.rs
@@@ -398,16 -435,9 +435,10 @@@ mod test 
          assert_eq!(reader.read(buf), None);
      }
  
-     #[test]
-     fn test_with_mem_writer() {
-         let buf = with_mem_writer(|wr| wr.write([1,2,3,4,5,6,7]));
-         assert_eq!(buf, ~[1,2,3,4,5,6,7]);
-     }
- 
      #[test]
      fn test_read_char() {
 -        let mut r = BufReader::new(bytes!("Việt"));
 +        let b = bytes!("Việt");
 +        let mut r = BufReader::new(b);
          assert_eq!(r.read_char(), Some('V'));
          assert_eq!(r.read_char(), Some('i'));
          assert_eq!(r.read_char(), Some('ệ'));