---

yaml
---
r: 30559
b: refs/heads/incoming
c: 651e63c
h: refs/heads/master
i:
  30557: 65970dd
  30555: 14b3d07
  30551: 412cedf
  30543: 3a1505e
  30527: b00b885
v: v3

Author: erickt

[refs]

@@ -6,7 +6,7 @@ refs/heads/try: d324a424d8f84b1eb049b12cf34182bda91b0024
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: d0c6ce338884ee21843f4b40bf6bf18d222ce5df
-refs/heads/incoming: f1f57392564a89155b404a8d326fac9d6923626b
+refs/heads/incoming: 651e63cc5c2b90204e8cd9d263da567fe2a66fbf
 refs/heads/dist-snap: 2f32a1581f522e524009138b33b1c7049ced668d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/incoming/src/libcore/flate.rs

@@ -18,8 +18,8 @@ const lz_fast : c_int = 0x1;   // LZ with only one probe
 const lz_norm : c_int = 0x80;  // LZ with 128 probes, "normal"
 const lz_best : c_int = 0xfff; // LZ with 4095 probes, "best"
 
-fn deflate_buf(buf: &[const u8]) -> ~[u8] {
-    do vec::as_const_buf(buf) |b, len| {
+fn deflate_bytes(bytes: &[const u8]) -> ~[u8] {
+    do vec::as_const_buf(bytes) |b, len| {
         unsafe {
             let mut outsz : size_t = 0;
             let res =
@@ -36,8 +36,8 @@ fn deflate_buf(buf: &[const u8]) -> ~[u8] {
     }
 }
 
-fn inflate_buf(buf: &[const u8]) -> ~[u8] {
-    do vec::as_const_buf(buf) |b, len| {
+fn inflate_bytes(bytes: &[const u8]) -> ~[u8] {
+    do vec::as_const_buf(bytes) |b, len| {
         unsafe {
             let mut outsz : size_t = 0;
             let res =
@@ -69,11 +69,11 @@ fn test_flate_round_trip() {
         }
         debug!("de/inflate of %u bytes of random word-sequences",
                in.len());
-        let cmp = flate::deflate_buf(in);
-        let out = flate::inflate_buf(cmp);
+        let cmp = flate::deflate_bytes(in);
+        let out = flate::inflate_bytes(cmp);
         debug!("%u bytes deflated to %u (%.1f%% size)",
                in.len(), cmp.len(),
                100.0 * ((cmp.len() as float) / (in.len() as float)));
         assert(in == out);
     }
-}
+}

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

@@ -1178,7 +1178,7 @@ fn encode_metadata(parms: encode_parms, crate: @crate) -> ~[u8] {
 
     (do str::as_bytes(~"rust\x00\x00\x00\x01") |bytes| {
         vec::slice(bytes, 0, 8)
-    }) + flate::deflate_buf(io::mem_buffer_buf(buf))
+    }) + flate::deflate_bytes(io::mem_buffer_buf(buf))
 }
 
 // Get the encoded string for a type

branches/incoming/src/rustc/metadata/loader.rs

@@ -202,8 +202,8 @@ fn get_metadata_section(os: os,
                 let cvbuf1 = ptr::offset(cvbuf, vlen);
                 debug!("inflating %u bytes of compressed metadata",
                        csz - vlen);
-                do vec::raw::form_slice(cvbuf1, csz-vlen) |buf| {
-                    let inflated = flate::inflate_buf(buf);
+                do vec::raw::form_slice(cvbuf1, csz-vlen) |bytes| {
+                    let inflated = flate::inflate_bytes(bytes);
                     found = move Some(@(move inflated));
                 }
                 if found != None {