---

yaml
---
r: 83334
b: refs/heads/try
c: 40834a0
h: refs/heads/master
v: v3

Author: bors

[refs]

@@ -2,7 +2,7 @@
 refs/heads/master: 0e4d1fc8cae42e15e00f71d9f439b01bb25a86ae
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 6c08cc2db4f98e9f07ae7d50338396c4123c2f0a
-refs/heads/try: 83499d1a89ef4e38a0cd0fc02316539a836e24a2
+refs/heads/try: 40834a0c23b32416af6a04512c6937004e487a88
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c

branches/try/mk/tools.mk

@@ -21,8 +21,7 @@ RUSTPKG_INPUTS := $(wildcard $(S)src/librustpkg/*.rs)
 
 # Rustdoc, the documentation tool
 RUSTDOC_LIB := $(S)src/librustdoc/rustdoc.rs
-RUSTDOC_INPUTS := $(wildcard $(addprefix $(S)src/librustdoc/,        \
-                                           *.rs */*.rs */*/*.rs))
+RUSTDOC_INPUTS := $(wildcard $(S)src/librustdoc/*.rs)
 
 # Rusti, the JIT REPL
 RUSTI_LIB := $(S)src/librusti/rusti.rs

branches/try/src/etc/vim/syntax/rust.vim

@@ -34,7 +34,7 @@ syn match     rustIdentifier  contains=rustIdentifierPrime "\%([^[:cntrl:][:spac
 syn match     rustFuncName    "\%([^[:cntrl:][:space:][:punct:][:digit:]]\|_\)\%([^[:cntrl:][:punct:][:space:]]\|_\)*" display contained
 
 " Reserved (but not yet used) keywords {{{2
-syn keyword   rustKeyword     be yield typeof
+syn keyword   rustKeyword     alignof be offsetof pure sizeof typeof yield
 
 " Built-in types {{{2
 syn keyword   rustType        int uint float char bool u8 u16 u32 u64 f32

branches/try/src/libextra/semver.rs

@@ -8,10 +8,25 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-//! Semver parsing and logic
-
-#[allow(missing_doc)];
-
+//! Semantic version parsing and comparison.
+//!
+//! Semantic versioning (see http://semver.org/) is a set of rules for
+//! assigning version numbers intended to convey meaning about what has
+//! changed, and how much. A version number has five parts:
+//!
+//!  * Major number, updated for incompatible API changes
+//!  * Minor number, updated for backwards-compatible API additions
+//!  * Patch number, updated for backwards-compatible bugfixes
+//!  * Pre-release information (optional), preceded by a hyphen (`-`)
+//!  * Build metadata (optional), preceded by a plus sign (`+`)
+//!
+//! The three mandatory components are required to be decimal numbers. The
+//! pre-release information and build metadata are required to be a
+//! period-separated list of identifiers containing only alphanumeric
+//! characters and hyphens.
+//!
+//! An example version number with all five components is
+//! `0.8.1-rc.3.0+20130922.linux`.
 
 use std::char;
 use std::cmp;
@@ -20,6 +35,8 @@ use std::io;
 use std::option::{Option, Some, None};
 use std::to_str::ToStr;
 
+/// An identifier in the pre-release or build metadata. If the identifier can
+/// be parsed as a decimal value, it will be represented with `Numeric`.
 #[deriving(Clone, Eq)]
 pub enum Identifier {
     Numeric(uint),
@@ -49,12 +66,20 @@ impl ToStr for Identifier {
 }
 
 
+/// Represents a version number conforming to the semantic versioning scheme.
 #[deriving(Clone, Eq)]
 pub struct Version {
+    /// The major version, to be incremented on incompatible changes.
     major: uint,
+    /// The minor version, to be incremented when functionality is added in a
+    /// backwards-compatible manner.
     minor: uint,
+    /// The patch version, to be incremented when backwards-compatible bug
+    /// fixes are made.
     patch: uint,
+    /// The pre-release version identifier, if one exists.
     pre: ~[Identifier],
+    /// The build metadata, ignored when determining version precedence.
     build: ~[Identifier],
 }
 
@@ -202,6 +227,7 @@ fn parse_reader(rdr: @io::Reader) -> Version {
 }
 
 
+/// Parse a string into a semver object.
 pub fn parse(s: &str) -> Option<Version> {
     if !s.is_ascii() {
         return None;

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

@@ -36,7 +36,7 @@ pub fn render<T: fmt::Default, S: fmt::Default>(
 
     <link href='http://fonts.googleapis.com/css?family=Oswald:700|Inconsolata:400'
           rel='stylesheet' type='text/css'>
-    <link rel=\"stylesheet\" type=\"text/css\" href=\"{root_path}{crate}/main.css\">
+    <link rel=\"stylesheet\" type=\"text/css\" href=\"{root_path}main.css\">
 
     {favicon, select, none{} other{
         <link rel=\"icon\" href=\"#\" sizes=\"16x16\"
@@ -52,7 +52,7 @@ pub fn render<T: fmt::Default, S: fmt::Default>(
 
     <section class=\"sidebar\">
         {logo, select, none{} other{
-            <a href='{root_path}{crate}/index.html'><img src='#' alt=''/></a>
+            <a href='{root_path}index.html'><img src='#' alt=''/></a>
         }}
 
         {sidebar}
@@ -73,9 +73,9 @@ pub fn render<T: fmt::Default, S: fmt::Default>(
     <script>
         var rootPath = \"{root_path}\";
     </script>
-    <script src=\"{root_path}{crate}/jquery.js\"></script>
+    <script src=\"{root_path}jquery.js\"></script>
     <script src=\"{root_path}{crate}/search-index.js\"></script>
-    <script src=\"{root_path}{crate}/main.js\"></script>
+    <script src=\"{root_path}main.js\"></script>
 
     <div id=\"help\" class=\"hidden\">
         <div class=\"shortcuts\">

branches/try/src/librustdoc/html/render.rs

@@ -128,15 +128,20 @@ pub fn run(mut crate: clean::Crate, dst: Path) {
     crate = cache.fold_crate(crate);
 
     // Add all the static files
-    let dst = cx.dst.push(crate.name);
-    mkdir(&dst);
-    write(dst.push("jquery.js"), include_str!("static/jquery-2.0.3.min.js"));
-    write(dst.push("main.js"), include_str!("static/main.js"));
-    write(dst.push("main.css"), include_str!("static/main.css"));
-    write(dst.push("normalize.css"), include_str!("static/normalize.css"));
+    write(cx.dst.push("jquery.js"), include_str!("static/jquery-2.0.3.min.js"));
+    write(cx.dst.push("main.js"), include_str!("static/main.js"));
+    write(cx.dst.push("main.css"), include_str!("static/main.css"));
+    write(cx.dst.push("normalize.css"), include_str!("static/normalize.css"));
+    write(cx.dst.push("index.html"), format!("
+        <DOCTYPE html><html><head>
+            <meta http-equiv='refresh'
+                  content=\"0; url={}/index.html\">
+        </head><body></body></html>
+    ", crate.name));
 
     {
-        let dst = dst.push("search-index.js");
+        mkdir(&cx.dst.push(crate.name));
+        let dst = cx.dst.push(crate.name).push("search-index.js");
         let mut w = BufferedWriter::new(dst.open_writer(io::CreateOrTruncate));
         let w = &mut w as &mut io::Writer;
         write!(w, "var searchIndex = [");

branches/try/src/libstd/rt/sched.rs

@@ -1212,9 +1212,10 @@ mod test {
         }
     }
 
-    #[test]
+    // FIXME: #9407: xfail-test
     fn dont_starve_1() {
         use rt::comm::oneshot;
+        use unstable::running_on_valgrind;
 
         do stress_factor().times {
             do run_in_mt_newsched_task {

branches/try/src/libsyntax/parse/token.rs

@@ -482,6 +482,9 @@ fn mk_fresh_ident_interner() -> @ident_interner {
         "pure",               // 65
         "yield",              // 66
         "typeof",             // 67
+        "alignof",            // 68
+        "offsetof",           // 69
+        "sizeof",             // 70
     ];
 
     @interner::StrInterner::prefill(init_vec)
@@ -622,14 +625,17 @@ pub mod keywords {
         True,
         Trait,
         Type,
-        Typeof,
         Unsafe,
         Use,
         While,
 
         // Reserved keywords
+        Alignof,
         Be,
+        Offsetof,
         Pure,
+        Sizeof,
+        Typeof,
         Yield,
     }
 
@@ -667,12 +673,16 @@ pub mod keywords {
                 True => Ident { name: 57, ctxt: 0 },
                 Trait => Ident { name: 58, ctxt: 0 },
                 Type => Ident { name: 59, ctxt: 0 },
-                Typeof => Ident { name: 67, ctxt: 0 },
                 Unsafe => Ident { name: 60, ctxt: 0 },
                 Use => Ident { name: 61, ctxt: 0 },
                 While => Ident { name: 62, ctxt: 0 },
+
+                Alignof => Ident { name: 68, ctxt: 0 },
                 Be => Ident { name: 64, ctxt: 0 },
+                Offsetof => Ident { name: 69, ctxt: 0 },
                 Pure => Ident { name: 65, ctxt: 0 },
+                Sizeof => Ident { name: 70, ctxt: 0 },
+                Typeof => Ident { name: 67, ctxt: 0 },
                 Yield => Ident { name: 66, ctxt: 0 },
             }
         }
@@ -689,7 +699,7 @@ pub fn is_keyword(kw: keywords::Keyword, tok: &Token) -> bool {
 pub fn is_any_keyword(tok: &Token) -> bool {
     match *tok {
         token::IDENT(sid, false) => match sid.name {
-            8 | 27 | 32 .. 67 => true,
+            8 | 27 | 32 .. 70 => true,
             _ => false,
         },
         _ => false
@@ -709,7 +719,7 @@ pub fn is_strict_keyword(tok: &Token) -> bool {
 pub fn is_reserved_keyword(tok: &Token) -> bool {
     match *tok {
         token::IDENT(sid, false) => match sid.name {
-            64 .. 67 => true,
+            64 .. 70 => true,
             _ => false,
         },
         _ => false,

branches/try/src/rustllvm/llvm-auto-clean-trigger

@@ -1,4 +1,4 @@
 # If this file is modified, then llvm will be forcibly cleaned and then rebuilt.
 # The actual contents of this file do not matter, but to trigger a change on the
 # build bots then the contents should be changed so git updates the mtime.
-2013-09-11
+2013-09-22