---

yaml
---
r: 235355
b: refs/heads/stable
c: 9e96982
h: refs/heads/master
i:
  235353: 95906fe
  235351: 27894e9
v: v3

Author: tsurai

[refs]

@@ -29,7 +29,7 @@ refs/heads/tmp: afae2ff723393b3ab4ccffef6ac7c6d1809e2da0
 refs/tags/1.0.0-alpha.2: 4c705f6bc559886632d3871b04f58aab093bfa2f
 refs/tags/homu-tmp: f859507de8c410b648d934d8f5ec1c52daac971d
 refs/tags/1.0.0-beta: 8cbb92b53468ee2b0c2d3eeb8567005953d40828
-refs/heads/stable: ad930f4145b73b031280795e394da815b10d9c4e
+refs/heads/stable: 9e9698213c84cc7318190208b10e787185ac4070
 refs/tags/1.0.0: 55bd4f8ff2b323f317ae89e254ce87162d52a375
 refs/tags/1.1.0: bc3c16f09287e5545c1d3f76b7abd54f2eca868b
 refs/tags/1.2.0: f557861f822c34f07270347b94b5280de20a597e

branches/stable/mk/cfg/i686-unknown-freebsd.mk

@@ -108,7 +108,7 @@ impl<T> VecDeque<T> {
         ptr::write(self.ptr.offset(off as isize), t);
     }
 
-    /// Returns true if and only if the buffer is at capacity
+    /// Returns true iff the buffer is at capacity
     #[inline]
     fn is_full(&self) -> bool { self.cap - self.len() == 1 }
 

branches/stable/src/libcollections/vec_deque.rs

@@ -175,12 +175,6 @@ impl<'a, 'b: 'a> DebugTuple<'a, 'b> {
     fn is_pretty(&self) -> bool {
         self.fmt.flags() & (1 << (FlagV1::Alternate as usize)) != 0
     }
-
-    /// Returns the wrapped `Formatter`.
-    #[unstable(feature = "debug_builder_formatter", reason = "recently added")]
-    pub fn formatter(&mut self) -> &mut fmt::Formatter<'b> {
-        &mut self.fmt
-    }
 }
 
 struct DebugInner<'a, 'b: 'a> {

branches/stable/src/libcore/fmt/builders.rs

@@ -1488,19 +1488,20 @@ macro_rules! tuple {
         impl<$($name:Debug),*> Debug for ($($name,)*) {
             #[allow(non_snake_case, unused_assignments)]
             fn fmt(&self, f: &mut Formatter) -> Result {
-                let mut builder = f.debug_tuple("");
+                try!(write!(f, "("));
                 let ($(ref $name,)*) = *self;
                 let mut n = 0;
                 $(
-                    builder.field($name);
+                    if n > 0 {
+                        try!(write!(f, ", "));
+                    }
+                    try!(write!(f, "{:?}", *$name));
                     n += 1;
                 )*
-
                 if n == 1 {
-                    try!(write!(builder.formatter(), ","));
+                    try!(write!(f, ","));
                 }
-
-                builder.finish()
+                write!(f, ")")
             }
         }
         peel! { $($name,)* }

branches/stable/src/libcore/fmt/mod.rs

@@ -1126,7 +1126,7 @@ macro_rules! uint_impl {
             acc
         }
 
-        /// Returns `true` if and only if `self == 2^k` for some `k`.
+        /// Returns `true` iff `self == 2^k` for some `k`.
         #[stable(feature = "rust1", since = "1.0.0")]
         #[inline]
         pub fn is_power_of_two(self) -> bool {

branches/stable/src/libcore/num/mod.rs

@@ -960,100 +960,6 @@ pub mod types {
             }
         }
 
-        #[cfg(target_arch = "x86")]
-        pub mod arch {
-            pub mod c95 {
-                pub type c_char = i8;
-                pub type c_schar = i8;
-                pub type c_uchar = u8;
-                pub type c_short = i16;
-                pub type c_ushort = u16;
-                pub type c_int = i32;
-                pub type c_uint = u32;
-                pub type c_long = i32;
-                pub type c_ulong = u32;
-                pub type c_float = f32;
-                pub type c_double = f64;
-                pub type size_t = u32;
-                pub type ptrdiff_t = i32;
-                pub type clock_t = i32;
-                pub type time_t = i32;
-                pub type suseconds_t = i32;
-                pub type wchar_t = i32;
-            }
-            pub mod c99 {
-                pub type c_longlong = i64;
-                pub type c_ulonglong = u64;
-                pub type intptr_t = i32;
-                pub type uintptr_t = u32;
-                pub type intmax_t = i64;
-                pub type uintmax_t = u64;
-            }
-            pub mod posix88 {
-                pub type off_t = i64;
-                pub type dev_t = u32;
-                pub type ino_t = u32;
-                pub type pid_t = i32;
-                pub type uid_t = u32;
-                pub type gid_t = u32;
-                pub type useconds_t = u32;
-                pub type mode_t = u16;
-                pub type ssize_t = i32;
-            }
-            pub mod posix01 {
-                use types::common::c95::{c_void};
-                use types::common::c99::{uint8_t, uint32_t, int32_t};
-                use types::os::arch::c95::{c_long, time_t};
-                use types::os::arch::posix88::{dev_t, gid_t, ino_t};
-                use types::os::arch::posix88::{mode_t, off_t};
-                use types::os::arch::posix88::{uid_t};
-
-                pub type nlink_t = u16;
-                pub type blksize_t = i32;
-                pub type blkcnt_t = i64;
-                pub type fflags_t = u32;
-                #[repr(C)]
-                #[derive(Copy, Clone)] pub struct stat {
-                    pub st_dev: dev_t,
-                    pub st_ino: ino_t,
-                    pub st_mode: mode_t,
-                    pub st_nlink: nlink_t,
-                    pub st_uid: uid_t,
-                    pub st_gid: gid_t,
-                    pub st_rdev: dev_t,
-                    pub st_atime: time_t,
-                    pub st_atime_nsec: c_long,
-                    pub st_mtime: time_t,
-                    pub st_mtime_nsec: c_long,
-                    pub st_ctime: time_t,
-                    pub st_ctime_nsec: c_long,
-                    pub st_size: off_t,
-                    pub st_blocks: blkcnt_t,
-                    pub st_blksize: blksize_t,
-                    pub st_flags: fflags_t,
-                    pub st_gen: uint32_t,
-                    pub st_lspare: int32_t,
-                    pub st_birthtime: time_t,
-                    pub st_birthtime_nsec: c_long,
-                    pub __unused: [uint8_t; 2],
-                }
-
-                #[repr(C)]
-                #[derive(Copy, Clone)] pub struct utimbuf {
-                    pub actime: time_t,
-                    pub modtime: time_t,
-                }
-
-                pub type pthread_attr_t = *mut c_void;
-            }
-            pub mod posix08 {
-            }
-            pub mod bsd44 {
-            }
-            pub mod extra {
-            }
-        }
-
         #[cfg(target_arch = "x86_64")]
         pub mod arch {
             pub mod c95 {

branches/stable/src/liblibc/lib.rs

@@ -368,7 +368,6 @@ impl Target {
             arm_linux_androideabi,
             aarch64_linux_android,
 
-            i686_unknown_freebsd,
             x86_64_unknown_freebsd,
 
             i686_unknown_dragonfly,

branches/stable/src/librustc_back/target/i686_unknown_freebsd.rs

@@ -72,7 +72,7 @@ r##"<!DOCTYPE html>
             <div class="search-container">
                 <input class="search-input" name="search"
                        autocomplete="off"
-                       placeholder="Click or press ‘S’ to search, ‘?’ for more options…"
+                       placeholder="Click or press 'S' to search, '?' for more options..."
                        type="search">
             </div>
         </form>
@@ -85,7 +85,7 @@ r##"<!DOCTYPE html>
 
     <div id="help" class="hidden">
         <div class="shortcuts">
-            <h1>Keyboard Shortcuts</h1>
+            <h1>Keyboard shortcuts</h1>
             <dl>
                 <dt>?</dt>
                 <dd>Show this help dialog</dd>
@@ -100,7 +100,7 @@ r##"<!DOCTYPE html>
             </dl>
         </div>
         <div class="infos">
-            <h1>Search Tricks</h1>
+            <h1>Search tricks</h1>
             <p>
                 Prefix searches with a type followed by a colon (e.g.
                 <code>fn:</code>) to restrict the search to a given type.

branches/stable/src/librustc_back/target/mod.rs

@@ -447,6 +447,7 @@ tr.result span.primitive::after { content: ' (primitive type)'; font-style: ital
 
 #help {
     background: #e9e9e9;
+    border-radius: 4px;
     box-shadow: 0 0 6px rgba(0,0,0,.2);
     position: absolute;
     top: 300px;
@@ -460,7 +461,7 @@ tr.result span.primitive::after { content: ' (primitive type)'; font-style: ital
 
 #help dt {
     float: left;
-    border-radius: 4px;
+    border-radius: 3px;
     border: 1px solid #bfbfbf;
     background: #fff;
     width: 23px;

branches/stable/src/librustdoc/html/layout.rs

@@ -76,65 +76,62 @@
     highlightSourceLines(null);
     $(window).on('hashchange', highlightSourceLines);
 
-    // Gets the human-readable string for the virtual-key code of the
-    // given KeyboardEvent, ev.
+    // Helper function for Keyboard events,
+    // Get's the char from the keypress event
     //
-    // This function is meant as a polyfill for KeyboardEvent#key,
-    // since it is not supported in Trident.  We also test for
-    // KeyboardEvent#keyCode because the handleShortcut handler is
-    // also registered for the keydown event, because Blink doesn't fire
-    // keypress on hitting the Escape key.
+    // This method is used because e.wich === x is not
+    // compatible with non-english keyboard layouts
     //
-    // So I guess you could say things are getting pretty interoperable.
-    function getVirtualKey(ev) {
-        if ("key" in ev && typeof ev.key != "undefined")
-            return ev.key;
-
-        var c = ev.charCode || ev.keyCode;
-        if (c == 27)
-            return "Escape";
-        return String.fromCharCode(c);
+    // Note: event.type must be keypress !
+    function getChar(event) {
+      if (event.which == null) {
+        return String.fromCharCode(event.keyCode) // IE
+      } else if (event.which!=0 && event.charCode!=0) {
+        return String.fromCharCode(event.which)   // the rest
+      } else {
+        return null // special key
+      }
     }
 
-    function handleShortcut(ev) {
-        if (document.activeElement.tagName == "INPUT")
+    $(document).on('keypress', function handleKeyboardShortcut(e) {
+        if (document.activeElement.tagName === 'INPUT') {
             return;
+        }
 
-        switch (getVirtualKey(ev)) {
-        case "Escape":
-            if (!$("#help").hasClass("hidden")) {
-                ev.preventDefault();
-                $("#help").addClass("hidden");
-            } else if (!$("#search").hasClass("hidden")) {
-                ev.preventDefault();
-                $("#search").addClass("hidden");
-                $("#main").removeClass("hidden");
-            }
-            break;
-
-        case "s":
-        case "S":
-            ev.preventDefault();
-            $(".search-input").focus();
-            break;
-
-        case "?":
-            if (ev.shiftKey && $("#help").hasClass("hidden")) {
-                ev.preventDefault();
-                $("#help").removeClass("hidden");
+        if (getChar(e) === '?') {
+            if (e.shiftKey && $('#help').hasClass('hidden')) {
+                e.preventDefault();
+                $('#help').removeClass('hidden');
             }
-            break;
+        } else if (getChar(e) === 's' || getChar(e) === 'S') {
+            e.preventDefault();
+            $('.search-input').focus();
+        }
+    }).on('keydown', function(e) {
+        // The escape key event has to be captured with the keydown event.
+        // Because keypressed has no keycode for the escape key
+        // (and other special keys in general)...
+        if (document.activeElement.tagName === 'INPUT') {
+            return;
         }
-    }
 
-    $(document).on("keypress", handleShortcut);
-    $(document).on("keydown", handleShortcut);
-    $(document).on("click", function(ev) {
-        if (!$(ev.target).closest("#help").length) {
-            $("#help").addClass("hidden");
+        if (e.keyCode === 27) { // escape key
+            if (!$('#help').hasClass('hidden')) {
+                e.preventDefault();
+                $('#help').addClass('hidden');
+            } else if (!$('#search').hasClass('hidden')) {
+                e.preventDefault();
+                $('#search').addClass('hidden');
+                $('#main').removeClass('hidden');
+            }
+        }
+    }).on('click', function(e) {
+        if (!$(e.target).closest('#help').length) {
+            $('#help').addClass('hidden');
         }
     });
 
+
     $('.version-selector').on('change', function() {
         var i, match,
             url = document.location.href,
@@ -153,7 +150,6 @@
 
         document.location.href = url;
     });
-
     /**
      * A function to compute the Levenshtein distance between two strings
      * Licensed under the Creative Commons Attribution-ShareAlike 3.0 Unported

branches/stable/src/librustdoc/html/static/main.css

@@ -17,7 +17,7 @@ document.addEventListener('DOMContentLoaded', function() {
     }
 
     var featureRegexp = new RegExp('^\s*#!\\[feature\\(\.*?\\)\\]');
-    var elements = document.querySelectorAll('pre.rust');
+    var elements = document.querySelectorAll('pre.rust-example-rendered');
 
     Array.prototype.forEach.call(elements, function(el) {
         el.onmouseover = function(e) {