---

yaml
---
r: 102367
b: refs/heads/master
c: a7da925
h: refs/heads/master
i:
  102365: 7bc1dd7
  102363: 5dae950
  102359: 1a16d45
  102351: aa9251b
  102335: e685cad
v: v3

Author: bors

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 28d4f80836b3557a500e61f4b4fa7d8b47c6a0bf
+refs/heads/master: a7da925b020ee649adc99883264529f664eaf91a
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 6e7f170fedd3c526a643c0b2d13863acd982be02
 refs/heads/try: a97642026c18a624ff6ea01075dd9550f8ed07ff

trunk/src/compiletest/runtest.rs

@@ -111,11 +111,11 @@ h5 a:link, h5 a:visited {color: black;}
 /* Code
    ========================================================================== */
 pre, code {
-    font-family: Menlo, Monaco, Consolas, "Courier New", monospace;
+    font-family: Menlo, Monaco, Consolas, "DejaVu Sans Mono", monospace;
     border-radius: 4px;
 }
 pre {
-    background-color: #F5F5F5;
+    background-color: #FDFDFD;
     border: 1px solid #CCC;
     border-radius: 0.5em;
     white-space: pre-wrap;
@@ -142,24 +142,24 @@ pre code {
 }
 
 /* Code highlighting */
-.cm-s-default span.cm-keyword {color: #803C8D;}
+.cm-s-default span.cm-keyword {color: #8959A8;}
 .cm-s-default span.cm-atom {color: #219;}
-.cm-s-default span.cm-number {color: #2AA198;}
-.cm-s-default span.cm-def {color: #256EB8;}
-.cm-s-default span.cm-variable {color: black;}
-.cm-s-default span.cm-variable-2 {color: #817E61;}
-.cm-s-default span.cm-variable-3 {color: #085;}
+.cm-s-default span.cm-number {color: #3E999F;}
+.cm-s-default span.cm-def {color: #4271AE;}
+/*.cm-s-default span.cm-variable {color: #C82829;}*/
+.cm-s-default span.cm-variable-2 {color: #6F906C;}
+.cm-s-default span.cm-variable-3 {color: #B76514;}
 .cm-s-default span.cm-property {color: black;}
 .cm-s-default span.cm-operator {color: black;}
-.cm-s-default span.cm-comment {color: #A82323;}
-.cm-s-default span.cm-string {color: #866544;}
-.cm-s-default span.cm-string-2 {color: #F50;}
+.cm-s-default span.cm-comment {color: #8E908C;}
+.cm-s-default span.cm-string {color: #718C00;}
+.cm-s-default span.cm-string-2 {color: #866544;}
 .cm-s-default span.cm-meta {color: #555;}
 /*.cm-s-default span.cm-error {color: #F00;}*/
 .cm-s-default span.cm-qualifier {color: #555;}
 .cm-s-default span.cm-builtin {color: #30A;}
 .cm-s-default span.cm-bracket {color: #CC7;}
-.cm-s-default span.cm-tag {color: #170;}
+.cm-s-default span.cm-tag {color: #C82829;}
 .cm-s-default span.cm-attribute {color: #00C;}
 
 /* The rest

trunk/src/doc/rust.css

@@ -2485,8 +2485,11 @@ before the expression they apply to.
 `*`
   : Dereference. When applied to a [pointer](#pointer-types) it denotes the pointed-to location.
     For pointers to mutable locations, the resulting [lvalue](#lvalues-rvalues-and-temporaries) can be assigned to.
-    For [enums](#enumerated-types) that have only a single variant, containing a single parameter,
-    the dereference operator accesses this parameter.
+    On non-pointer types, it calls calls the `deref` method of the `std::ops::Deref` trait, or the
+    `deref_mut` method of the `std::ops::DerefMut` trait (if implemented by the type and required
+    for an outer expression that will or could mutate the dereference), and produces the
+    result of dereferencing the `&` or `&mut` borrowed pointer returned from the overload method.
+
 `!`
   : Logical negation. On the boolean type, this flips between `true` and
     `false`. On integer types, this inverts the individual bits in the

trunk/src/doc/rust.md

@@ -63,7 +63,7 @@ is how the above advertisement works. An example from the `libstd`
 documentation:
 
 ~~~
-#[doc(html_logo_url = "http://www.rust-lang.org/logos/rust-logo-128x128-blk.png",
+#[doc(html_logo_url = "http://www.rust-lang.org/logos/rust-logo-128x128-blk-v2.png",
       html_favicon_url = "http://www.rust-lang.org/favicon.ico",
       html_root_url = "http://static.rust-lang.org/doc/master")];
 ~~~

trunk/src/doc/rustdoc.md

@@ -25,7 +25,7 @@ Rust extras are part of the standard Rust distribution.
 #[license = "MIT/ASL2"];
 #[crate_type = "rlib"];
 #[crate_type = "dylib"];
-#[doc(html_logo_url = "http://www.rust-lang.org/logos/rust-logo-128x128-blk.png",
+#[doc(html_logo_url = "http://www.rust-lang.org/logos/rust-logo-128x128-blk-v2.png",
       html_favicon_url = "http://www.rust-lang.org/favicon.ico",
       html_root_url = "http://static.rust-lang.org/doc/master")];
 

trunk/src/libextra/lib.rs

@@ -167,7 +167,7 @@
 #[license = "MIT/ASL2"];
 #[crate_type = "rlib"];
 #[crate_type = "dylib"];
-#[doc(html_logo_url = "http://www.rust-lang.org/logos/rust-logo-128x128-blk.png",
+#[doc(html_logo_url = "http://www.rust-lang.org/logos/rust-logo-128x128-blk-v2.png",
       html_favicon_url = "http://www.rust-lang.org/favicon.ico",
       html_root_url = "http://static.rust-lang.org/doc/master")];
 

trunk/src/libgreen/lib.rs

@@ -11,6 +11,7 @@
 //! A small module implementing a simple "runtime" used for bootstrapping a rust
 //! scheduler pool and then interacting with it.
 
+use std::any::Any;
 use std::cast;
 use std::rt::Runtime;
 use std::rt::local::Local;

trunk/src/libgreen/simple.rs

@@ -18,6 +18,7 @@
 //! contains the rust task itself in order to juggle around ownership of the
 //! values.
 
+use std::any::Any;
 use std::cast;
 use std::rt::env;
 use std::rt::Runtime;

trunk/src/libgreen/task.rs

@@ -45,7 +45,7 @@
 #[license = "MIT/ASL2"];
 #[crate_type = "rlib"];
 #[crate_type = "dylib"];
-#[doc(html_logo_url = "http://www.rust-lang.org/logos/rust-logo-128x128-blk.png",
+#[doc(html_logo_url = "http://www.rust-lang.org/logos/rust-logo-128x128-blk-v2.png",
       html_favicon_url = "http://www.rust-lang.org/favicon.ico",
       html_root_url = "http://static.rust-lang.org/doc/master")];
 #[deny(unused_result, unused_must_use)];

trunk/src/libnative/lib.rs

@@ -14,6 +14,7 @@
 //! by rust tasks. This implements the necessary API traits laid out by std::rt
 //! in order to spawn new tasks and deschedule the current task.
 
+use std::any::Any;
 use std::cast;
 use std::rt::env;
 use std::rt::local::Local;