---

yaml
---
r: 108231
b: refs/heads/dist-snap
c: fb12aeb
h: refs/heads/master
i:
  108229: 3cebfc2
  108227: 04d43be
  108223: 6ab30bd
v: v3

Author: bors

[refs]

@@ -6,7 +6,7 @@ refs/heads/try: f64fdf524a434f0e5cd0bc91d09c144723f3c90d
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c
-refs/heads/dist-snap: 54760b9f27d2d4ce64f548d27c35cdab73e625ab
+refs/heads/dist-snap: fb12aebbd82eb3a7673738f1ed25f428b3d67242
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
 refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0

branches/dist-snap/src/doc/complement-cheatsheet.md

@@ -36,12 +36,42 @@ let y: ~str = x.to_str_radix(16);
 Use [`FromStrRadix`](http://static.rust-lang.org/doc/master/std/num/trait.FromStrRadix.html), and its helper function, [`from_str_radix`](http://static.rust-lang.org/doc/master/std/num/fn.from_str_radix.html).
 
 ~~~
-use std::num::from_str_radix;
+use std::num;
 
-let x: Option<i64> = from_str_radix("deadbeef", 16);
+let x: Option<i64> = num::from_str_radix("deadbeef", 16);
 let y: i64 = x.unwrap();
 ~~~
 
+**Vector of Bytes to String**
+
+To return a Borrowed String Slice (&str) use the str helper function [`from_utf8`](http://static.rust-lang.org/doc/master/std/str/fn.from_utf8.html).
+
+~~~
+use std::str;
+
+let bytes = ~[104u8,105u8];
+let x: Option<&str> = str::from_utf8(bytes);
+let y: &str = x.unwrap();
+~~~
+
+To return an Owned String (~str) use the str helper function [`from_utf8_owned`](http://static.rust-lang.org/doc/master/std/str/fn.from_utf8_owned.html).
+
+~~~
+use std::str;
+
+let x: Option<~str> = str::from_utf8_owned(~[104u8,105u8]);
+let y: ~str = x.unwrap();
+~~~~
+
+To return a [`MaybeOwned`](http://static.rust-lang.org/doc/master/std/str/enum.MaybeOwned.html) use the str helper function [`from_utf8_lossy`](http://static.rust-lang.org/doc/master/std/str/fn.from_utf8_owned.html).  This function also replaces non-valid utf-8 sequences with U+FFFD replacement character.
+
+~~~
+use std::str;
+
+let x = bytes!(72u8,"ello ",0xF0,0x90,0x80,"World!");
+let y = str::from_utf8_lossy(x);
+~~~~
+
 # File operations
 
 ## How do I read from a file?