---

yaml
---
r: 224238
b: refs/heads/beta
c: 8ebf952
h: refs/heads/master
v: v3

Author: eefriedman

[refs]

@@ -23,7 +23,7 @@ refs/tags/0.9: 36870b185fc5f5486636d4515f0e22677493f225
 refs/tags/0.10: ac33f2b15782272ae348dbd7b14b8257b2148b5a
 refs/tags/0.11.0: e1247cb1d0d681be034adb4b558b5a0c0d5720f9
 refs/tags/0.12.0: f0c419429ef30723ceaf6b42f9b5a2aeb5d2e2d1
-refs/heads/beta: 04badd6a973d2499731b49365a121dbc4c9c468e
+refs/heads/beta: 8ebf95257bfc9093cb25dba209ded303ec167e5f
 refs/tags/1.0.0-alpha: e42bd6d93a1d3433c486200587f8f9e12590a4d7
 refs/heads/tmp: 938f5d7af401e2d8238522fed4a612943b6e77fd
 refs/tags/1.0.0-alpha.2: 4c705f6bc559886632d3871b04f58aab093bfa2f

branches/beta/src/doc/rust.css

@@ -221,10 +221,6 @@ a > code {
     color: #428BCA;
 }
 
-.section-header > a > code {
-    color: #8D1A38;
-}
-
 /* Code highlighting */
 pre.rust .kw { color: #8959A8; }
 pre.rust .kw-2, pre.rust .prelude-ty { color: #4271AE; }

branches/beta/src/doc/trpl/SUMMARY.md

@@ -16,7 +16,6 @@
     * [Iterators](iterators.md)
     * [Concurrency](concurrency.md)
     * [Error Handling](error-handling.md)
-    * [Choosing your Guarantees](choosing-your-guarantees.md)
     * [FFI](ffi.md)
     * [Borrow and AsRef](borrow-and-asref.md)
     * [Release Channels](release-channels.md)

branches/beta/src/doc/trpl/choosing-your-guarantees.md

@@ -84,18 +84,10 @@ pub fn from_u32(i: u32) -> Option<char> {
     if (i > MAX as u32) || (i >= 0xD800 && i <= 0xDFFF) {
         None
     } else {
-        Some(unsafe { from_u32_unchecked(i) })
+        Some(unsafe { transmute(i) })
     }
 }
 
-/// Converts a `u32` to an `char`, not checking whether it is a valid unicode
-/// codepoint.
-#[inline]
-#[unstable(feature = "char_from_unchecked", reason = "recently added API")]
-pub unsafe fn from_u32_unchecked(i: u32) -> char {
-    transmute(i)
-}
-
 /// Converts a number to the character representing it.
 ///
 /// # Return value
@@ -123,11 +115,12 @@ pub fn from_digit(num: u32, radix: u32) -> Option<char> {
         panic!("from_digit: radix is too high (maximum 36)");
     }
     if num < radix {
-        let num = num as u8;
-        if num < 10 {
-            Some((b'0' + num) as char)
-        } else {
-            Some((b'a' + num - 10) as char)
+        unsafe {
+            if num < 10 {
+                Some(transmute('0' as u32 + num))
+            } else {
+                Some(transmute('a' as u32 + num - 10))
+            }
         }
     } else {
         None
@@ -325,13 +318,16 @@ impl Iterator for EscapeUnicode {
                 Some('{')
             }
             EscapeUnicodeState::Value(offset) => {
-                let c = from_digit(((self.c as u32) >> (offset * 4)) & 0xf, 16).unwrap();
+                let v = match ((self.c as i32) >> (offset * 4)) & 0xf {
+                    i @ 0 ... 9 => '0' as i32 + i,
+                    i => 'a' as i32 + (i - 10)
+                };
                 if offset == 0 {
                     self.state = EscapeUnicodeState::RightBrace;
                 } else {
                     self.state = EscapeUnicodeState::Value(offset - 1);
                 }
-                Some(c)
+                Some(unsafe { transmute(v) })
             }
             EscapeUnicodeState::RightBrace => {
                 self.state = EscapeUnicodeState::Done;