---

yaml
---
r: 14834
b: refs/heads/try
c: b30cb8e
h: refs/heads/master
v: v3

Author: nikomatsakis

[refs]

@@ -2,5 +2,5 @@
 refs/heads/master: 61b1875c16de39c166b0f4d54bba19f9c6777d1a
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 4a81779abd786ff22d71434c6d9a5917ea4cdfff
-refs/heads/try: d91742294f282a07b1e26d8da02f7ecec4e0b952
+refs/heads/try: b30cb8e43a57f8f16065c37a664b26db0891f134
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105

branches/try/src/fuzzer/fuzzer.rs

@@ -221,10 +221,10 @@ fn under(n: uint, it: fn(uint)) {
     while i < n { it(i); i += 1u; }
 }
 
-fn devnull() -> io::writer { io::mem_buffer_writer(io::mk_mem_buffer()) }
+fn devnull() -> io::writer { io::mem_buffer_writer(io::mem_buffer()) }
 
 fn as_str(f: fn@(io::writer)) -> str {
-    let buf = io::mk_mem_buffer();
+    let buf = io::mem_buffer();
     f(io::mem_buffer_writer(buf));
     io::mem_buffer_str(buf)
 }

branches/try/src/libcore/core.rc

@@ -31,7 +31,7 @@ export uint, u8, u16, u32, u64;
 export float, f32, f64;
 export box, char, str, ptr, vec, bool;
 export either, option, result, iter;
-export libc, os, ctypes, io, run, rand, sys, unsafe, logging, serialization;
+export libc, os, io, run, rand, sys, unsafe, logging, serialization;
 export comm, task, future;
 export extfmt;
 export tuple;

branches/try/src/libcore/io.rs

@@ -543,7 +543,7 @@ impl of writer for mem_buffer {
     fn flush() -> int { 0 }
 }
 
-fn mk_mem_buffer() -> mem_buffer {
+fn mem_buffer() -> mem_buffer {
     @{mutable buf: [mutable], mutable pos: 0u}
 }
 fn mem_buffer_writer(b: mem_buffer) -> writer { b as writer }
@@ -554,14 +554,14 @@ fn mem_buffer_str(b: mem_buffer) -> str {
 }
 
 fn with_str_writer(f: fn(writer)) -> str {
-    let buf = mk_mem_buffer();
+    let buf = mem_buffer();
     let wr = mem_buffer_writer(buf);
     f(wr);
     io::mem_buffer_str(buf)
 }
 
 fn with_buf_writer(f: fn(writer)) -> [u8] {
-    let buf = mk_mem_buffer();
+    let buf = mem_buffer();
     let wr = mem_buffer_writer(buf);
     f(wr);
     io::mem_buffer_buf(buf)

branches/try/src/libcore/serialization.rs

@@ -96,7 +96,7 @@ fn emit_from_vec<S: serializer, T>(s: S, v: [T], f: fn(T)) {
 
 fn read_to_vec<D: deserializer, T>(d: D, f: fn() -> T) -> [T] {
     d.read_vec {|len|
-        vec::init_fn(len) {|i|
+        vec::from_fn(len) {|i|
             d.read_vec_elt(i) {|| f() }
         }
     }

branches/try/src/libcore/vec.rs

@@ -31,6 +31,7 @@ export grow_fn;
 export grow_set;
 export map;
 export map2;
+export flat_map;
 export filter_map;
 export filter;
 export concat;

branches/try/src/libstd/serialization.rs

@@ -5,3 +5,8 @@ Deprecated in favor of core::serialization."];
 use core;
 import list::list;
 import ebml::writer;
+
+import core::serialization::{serializer,deserializer};
+
+export serializer;
+export deserializer;

branches/try/src/libstd/test.rs

@@ -189,7 +189,7 @@ fn print_failures(st: console_test_state) {
 
 #[test]
 fn should_sort_failures_before_printing_them() {
-    let buffer = io::mk_mem_buffer();
+    let buffer = io::mem_buffer();
     let writer = io::mem_buffer_writer(buffer);
 
     let test_a = {

branches/try/src/rustc/metadata/astencode.rs

@@ -948,7 +948,7 @@ fn mk_ctxt() -> fake_ext_ctxt {
 #[cfg(test)]
 fn roundtrip(in_item: @ast::item) {
     #debug["in_item = %s", pprust::item_to_str(in_item)];
-    let mbuf = io::mk_mem_buffer();
+    let mbuf = io::mem_buffer();
     let ebml_w = ebml::writer(io::mem_buffer_writer(mbuf));
     encode_item_ast(ebml_w, in_item);
     let ebml_doc = ebml::new_doc(@io::mem_buffer_buf(mbuf));

branches/try/src/rustc/metadata/encoder.rs

@@ -745,7 +745,7 @@ fn encode_metadata(cx: crate_ctxt, crate: @crate) -> [u8] {
                 type_abbrevs: abbrevs,
                 reachable: reachable};
 
-    let buf = io::mk_mem_buffer();
+    let buf = io::mem_buffer();
     let buf_w = io::mem_buffer_writer(buf);
     let ebml_w = ebml::writer(buf_w);
 
@@ -779,7 +779,7 @@ fn encode_metadata(cx: crate_ctxt, crate: @crate) -> [u8] {
 // Get the encoded string for a type
 fn encoded_ty(tcx: ty::ctxt, t: ty::t) -> str {
     let cx = @{ds: def_to_str, tcx: tcx, abbrevs: tyencode::ac_no_abbrevs};
-    let buf = io::mk_mem_buffer();
+    let buf = io::mem_buffer();
     tyencode::enc_ty(io::mem_buffer_writer(buf), cx, t);
     ret io::mem_buffer_str(buf);
 }

branches/try/src/rustc/metadata/tyencode.rs

@@ -40,7 +40,7 @@ fn enc_ty(w: io::writer, cx: @ctxt, t: ty::t) {
         let result_str = alt cx.tcx.short_names_cache.find(t) {
           some(s) { *s }
           none {
-            let buf = io::mk_mem_buffer();
+            let buf = io::mem_buffer();
             enc_sty(io::mem_buffer_writer(buf), cx, ty::get(t).struct);
             cx.tcx.short_names_cache.insert(t, @io::mem_buffer_str(buf));
             io::mem_buffer_str(buf)