---

yaml
---
r: 38579
b: refs/heads/incoming
c: 140d16a
h: refs/heads/master
i:
  38577: a2420d3
  38575: 133c083
v: v3

Author: catamorphism

[refs]

@@ -6,7 +6,7 @@ refs/heads/try: 3d5418789064fdb463e872a4e651af1c628a3650
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: a810c03263670238bccd64cabb12a23a46e3a278
-refs/heads/incoming: 5bca5f7c5474083aeddca1d5c405ff08ec8322f4
+refs/heads/incoming: 140d16ac5803a0e7b61d0f901a82549c09e4411f
 refs/heads/dist-snap: 22efa39382d41b084fde1719df7ae8ce5697d8c9
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/incoming/doc/tutorial-ffi.md

@@ -30,7 +30,7 @@ fn sha1(data: ~str) -> ~str unsafe {
     let bytes = str::to_bytes(data);
     let hash = crypto::SHA1(vec::raw::to_ptr(bytes),
                             vec::len(bytes) as c_uint, ptr::null());
-    return as_hex(vec::raw::from_buf(hash, 20));
+    return as_hex(vec::from_buf(hash, 20));
 }
 
 fn main(args: ~[~str]) {
@@ -132,7 +132,7 @@ fn sha1(data: ~str) -> ~str {
         let bytes = str::to_bytes(data);
         let hash = crypto::SHA1(vec::raw::to_ptr(bytes),
                                 vec::len(bytes), ptr::null());
-        return as_hex(vec::raw::from_buf(hash, 20));
+        return as_hex(vec::from_buf(hash, 20));
     }
 }
 ~~~~
@@ -177,7 +177,7 @@ Let's look at our `sha1` function again.
 let bytes = str::to_bytes(data);
 let hash = crypto::SHA1(vec::raw::to_ptr(bytes),
                         vec::len(bytes), ptr::null());
-return as_hex(vec::raw::from_buf(hash, 20));
+return as_hex(vec::from_buf(hash, 20));
 # }
 # }
 ~~~~
@@ -198,7 +198,7 @@ unsafe null pointer of type `*u8`. (Rust generics are awesome
 like that: they can take the right form depending on the type that they
 are expected to return.)
 
-Finally, `vec::raw::from_buf` builds up a new `~[u8]` from the
+Finally, `vec::from_buf` builds up a new `~[u8]` from the
 unsafe pointer that `SHA1` returned. SHA1 digests are always
 twenty bytes long, so we can pass `20` for the length of the new
 vector.