---

yaml
---
r: 138106
b: refs/heads/try
c: f27ad3d
h: refs/heads/master
v: v3

Author: nodakai

[refs]

@@ -2,7 +2,7 @@
 refs/heads/master: b6e0d3a5bf4c88650a22f605f822e02c6b163580
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 78a7676898d9f80ab540c6df5d4c9ce35bb50463
-refs/heads/try: 0dd4cd57fe032e24799e007636989d44f579438f
+refs/heads/try: f27ad3d3e99ce679f782607971a9f6f18befa503
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c

branches/try/README.md

@@ -87,7 +87,7 @@ fetch snapshots, and an OS that can execute the available snapshot binaries.
 
 Snapshot binaries are currently built and tested on several platforms:
 
-* Windows (7, 8, Server 2008 R2), x86 and x86-64 (64-bit support added in Rust 0.12.0)
+* Windows (7, 8, Server 2008 R2), x86 only
 * Linux (2.6.18 or later, various distributions), x86 and x86-64
 * OSX 10.7 (Lion) or greater, x86 and x86-64
 

branches/try/src/compiletest/runtest.rs

@@ -947,15 +947,12 @@ fn check_expected_errors(expected_errors: Vec<errors::ExpectedError> ,
         String::from_chars(c.as_slice())
     }
 
-    #[cfg(target_os = "windows")]
+    #[cfg(windows)]
     fn prefix_matches( line : &str, prefix : &str ) -> bool {
         to_lower(line).as_slice().starts_with(to_lower(prefix).as_slice())
     }
 
-    #[cfg(any(target_os = "linux",
-              target_os = "macos",
-              target_os = "freebsd",
-              target_os = "dragonfly"))]
+    #[cfg(unix)]
     fn prefix_matches( line : &str, prefix : &str ) -> bool {
         line.starts_with( prefix )
     }
@@ -1356,24 +1353,21 @@ fn program_output(config: &Config, testfile: &Path, lib_path: &str, prog: String
 }
 
 // Linux and mac don't require adjusting the library search path
-#[cfg(any(target_os = "linux",
-          target_os = "macos",
-          target_os = "freebsd",
-          target_os = "dragonfly"))]
+#[cfg(unix)]
 fn make_cmdline(_libpath: &str, prog: &str, args: &[String]) -> String {
     format!("{} {}", prog, args.connect(" "))
 }
 
-#[cfg(target_os = "windows")]
+#[cfg(windows)]
 fn make_cmdline(libpath: &str, prog: &str, args: &[String]) -> String {
-    format!("{} {} {}", lib_path_cmd_prefix(libpath), prog, args.connect(" "))
-}
 
-// Build the LD_LIBRARY_PATH variable as it would be seen on the command line
-// for diagnostic purposes
-#[cfg(target_os = "windows")]
-fn lib_path_cmd_prefix(path: &str) -> String {
-    format!("{}=\"{}\"", util::lib_path_env_var(), util::make_new_path(path))
+    // Build the LD_LIBRARY_PATH variable as it would be seen on the command line
+    // for diagnostic purposes
+    fn lib_path_cmd_prefix(path: &str) -> String {
+        format!("{}=\"{}\"", util::lib_path_env_var(), util::make_new_path(path))
+    }
+
+    format!("{} {} {}", lib_path_cmd_prefix(libpath), prog, args.connect(" "))
 }
 
 fn dump_output(config: &Config, testfile: &Path, out: &str, err: &str) {

branches/try/src/doc/README.md

@@ -1,6 +1,4 @@
-# Rust documentations
-
-## Dependencies
+# Dependencies
 
 [Pandoc](http://johnmacfarlane.net/pandoc/installing.html), a universal
 document converter, is required to generate docs as HTML from Rust's
@@ -12,7 +10,7 @@ docs from the master (English) docs.
 [GNU gettext](http://www.gnu.org/software/gettext/) is required for managing
 the translation data.
 
-## Building
+# Building
 
 To generate all the docs, just run `make docs` from the root of the repository.
 This will convert the distributed Markdown docs to HTML and generate HTML doc
@@ -26,7 +24,7 @@ rustdoc --output html-doc/ --output-format html ../src/libstd/path.rs
 
 (This, of course, requires a working build of the `rustdoc` tool.)
 
-## Additional notes
+# Additional notes
 
 To generate an HTML version of a doc from Markdown manually, you can do
 something like:
@@ -35,39 +33,37 @@ something like:
 pandoc --from=markdown --to=html5 --number-sections -o reference.html reference.md
 ~~~~
 
-(`reference.md` being the Rust Reference Manual.)
+(reference.md being the Rust Reference Manual.)
 
 The syntax for pandoc flavored markdown can be found at:
-
-- http://johnmacfarlane.net/pandoc/README.html#pandocs-markdown
+http://johnmacfarlane.net/pandoc/README.html#pandocs-markdown
 
 A nice quick reference (for non-pandoc markdown) is at:
+http://kramdown.rubyforge.org/quickref.html
 
-- http://kramdown.gettalong.org/quickref.html
-
-## Notes for translators
+# Notes for translators
 
 Notice: The procedure described below is a work in progress. We are working on
 translation system but the procedure contains some manual operations for now.
 
-To start the translation for a new language, see `po4a.conf` at first.
+To start the translation for a new language, see po4a.conf at first.
 
-To generate `.pot` and `.po` files, do something like:
+To generate .pot and .po files, do something like:
 
 ~~~~
 po4a --copyright-holder="The Rust Project Developers" \
     --package-name="Rust" \
-    --package-version="0.13.0" \
+    --package-version="0.11.0" \
     -M UTF-8 -L UTF-8 \
     src/doc/po4a.conf
 ~~~~
 
-(the version number must be changed if it is not `0.13.0` now.)
+(the version number must be changed if it is not 0.11.0 now.)
 
-Now you can translate documents with `.po` files, commonly used with gettext. If
+Now you can translate documents with .po files, commonly used with gettext. If
 you are not familiar with gettext-based translation, please read the online
 manual linked from http://www.gnu.org/software/gettext/ . We use UTF-8 as the
-file encoding of `.po` files.
+file encoding of .po files.
 
 When you want to make a commit, do the command below before staging your
 change:
@@ -83,4 +79,4 @@ for f in src/doc/po/**/*.po; do
 done
 ~~~~
 
-This removes untranslated entries from `.po` files to save disk space.
+This removes untranslated entries from .po files to save disk space.

branches/try/src/doc/guide-ffi.md

@@ -475,7 +475,7 @@ conventions. Rust provides a way to tell the compiler which convention to use:
 ~~~~
 extern crate libc;
 
-#[cfg(all(target_os = "win32", target_arch = "x86"))]
+#[cfg(target_os = "win32", target_arch = "x86")]
 #[link(name = "kernel32")]
 #[allow(non_snake_case)]
 extern "stdcall" {

branches/try/src/doc/guide-unsafe.md

@@ -313,15 +313,17 @@ literal string (i.e `""`)
 ```
 #![feature(asm)]
 
-#[cfg(any(target_arch = "x86", target_arch = "x86_64"))]
+#[cfg(target_arch = "x86")]
+#[cfg(target_arch = "x86_64")]
 fn foo() {
     unsafe {
         asm!("NOP");
     }
 }
 
 // other platforms
-#[cfg(not(any(target_arch = "x86", target_arch = "x86_64")))]
+#[cfg(not(target_arch = "x86"),
+      not(target_arch = "x86_64"))]
 fn foo() { /* ... */ }
 
 fn main() {
@@ -338,7 +340,7 @@ but you must add the right number of `:` if you skip them:
 
 ```
 # #![feature(asm)]
-# #[cfg(any(target_arch = "x86", target_arch = "x86_64"))]
+# #[cfg(target_arch = "x86")] #[cfg(target_arch = "x86_64")]
 # fn main() { unsafe {
 asm!("xor %eax, %eax"
     :
@@ -352,7 +354,7 @@ Whitespace also doesn't matter:
 
 ```
 # #![feature(asm)]
-# #[cfg(any(target_arch = "x86", target_arch = "x86_64"))]
+# #[cfg(target_arch = "x86")] #[cfg(target_arch = "x86_64")]
 # fn main() { unsafe {
 asm!("xor %eax, %eax" ::: "eax");
 # } }
@@ -366,7 +368,7 @@ expressions must be mutable lvalues:
 
 ```
 # #![feature(asm)]
-# #[cfg(any(target_arch = "x86", target_arch = "x86_64"))]
+# #[cfg(target_arch = "x86")] #[cfg(target_arch = "x86_64")]
 fn add(a: int, b: int) -> int {
     let mut c = 0;
     unsafe {
@@ -377,7 +379,7 @@ fn add(a: int, b: int) -> int {
     }
     c
 }
-# #[cfg(not(any(target_arch = "x86", target_arch = "x86_64")))]
+# #[cfg(not(target_arch = "x86"), not(target_arch = "x86_64"))]
 # fn add(a: int, b: int) -> int { a + b }
 
 fn main() {
@@ -394,7 +396,7 @@ stay valid.
 
 ```
 # #![feature(asm)]
-# #[cfg(any(target_arch = "x86", target_arch = "x86_64"))]
+# #[cfg(target_arch = "x86")] #[cfg(target_arch = "x86_64")]
 # fn main() { unsafe {
 // Put the value 0x200 in eax
 asm!("mov $$0x200, %eax" : /* no outputs */ : /* no inputs */ : "eax");

branches/try/src/doc/reference.md

@@ -185,24 +185,40 @@ grammar as double-quoted strings. Other tokens have exact rules given.
 
 ### Keywords
 
-<p id="keyword-table-marker">The keywords are the following strings, organized by first letter:</p>
+The keywords are the following strings, organized by first letter:
 
+<div id="keywords">
 |          |        |        |       |
 |----------|--------|--------|-------|
 | as       |        |        |       |
+|----------|--------|--------|-------|
 | box      | break  |        |       |
+|----------|--------|--------|-------|
 | continue | crate  |        |       |
+|----------|--------|--------|-------|
 | else     | enum   | extern |       |
+|----------|--------|--------|-------|
 | false    | fn     | for    |       |
+|----------|--------|--------|-------|
 | if       | impl   | in     |       |
+|----------|--------|--------|-------|
 | let      | loop   |        |       |
+|----------|--------|--------|-------|
 | match    | mod    | mut    |       |
+|----------|--------|--------|-------|
 | priv     | proc   | pub    |       |
+|----------|--------|--------|-------|
 | ref      | return |        |       |
+|----------|--------|--------|-------|
 | self     | static | struct | super |
+|----------|--------|--------|-------|
 | trait    | true   | type   |       |
+|----------|--------|--------|-------|
 | unsafe   | use    |        |       |
+|----------|--------|--------|-------|
 | while    |        |        |       |
+|----------|--------|--------|-------|
+</div>
 
 Each of these keywords has special meaning in its grammar, and all of them are
 excluded from the `ident` rule.
@@ -2033,28 +2049,26 @@ fn macos_only() {
 }
 
 // This function is only included when either foo or bar is defined
-#[cfg(any(foo, bar))]
+#[cfg(foo)]
+#[cfg(bar)]
 fn needs_foo_or_bar() {
   // ...
 }
 
 // This function is only included when compiling for a unixish OS with a 32-bit
 // architecture
-#[cfg(all(unix, target_word_size = "32"))]
+#[cfg(unix, target_word_size = "32")]
 fn on_32bit_unix() {
   // ...
 }
-
-// This function is only included when foo is not defined
-#[cfg(not(foo))]
-fn needs_not_foo() {
-  // ...
-}
 ```
 
 This illustrates some conditional compilation can be achieved using the
-`#[cfg(...)]` attribute. `any`, `all` and `not` can be used to assemble
-arbitrarily complex configurations through nesting.
+`#[cfg(...)]` attribute. Note that `#[cfg(foo, bar)]` is a condition that needs
+both `foo` and `bar` to be defined while `#[cfg(foo)] #[cfg(bar)]` only needs
+one of `foo` and `bar` to be defined (this resembles in the disjunctive normal
+form). Additionally, one can reverse a condition by enclosing it in a
+`not(...)`, like e. g. `#[cfg(not(target_os = "win32"))]`.
 
 The following configurations must be defined by the implementation:
 
@@ -2472,8 +2486,6 @@ The currently implemented features of the reference compiler are:
 
 * `if_let` - Allows use of the `if let` syntax.
 
-* `while_let` - Allows use of the `while let` syntax.
-
 * `intrinsics` - Allows use of the "rust-intrinsics" ABI. Compiler intrinsics
                  are inherently unstable and no promise about them is made.
 
@@ -3480,18 +3492,6 @@ of a condition expression it expects a refutable let statement. If the value of
 expression on the right hand side of the let statement matches the pattern, the corresponding
 block will execute, otherwise flow proceeds to the first `else` block that follows.
 
-### While let loops
-
-```{.ebnf .gram}
-while_let_expr : "while" "let" pat '=' expr '{' block '}' ;
-```
-
-A `while let` loop is semantically identical to a `while` loop but in place of a
-condition expression it expects a refutable let statement. If the value of the
-expression on the right hand side of the let statement matches the pattern, the
-loop body block executes and control returns to the pattern matching statement.
-Otherwise, the while expression completes.
-
 ### Return expressions
 
 ```{.ebnf .gram}

branches/try/src/doc/rust.css

@@ -393,9 +393,4 @@ pre.rust { position: relative; }
     }
 }
 
-#keyword-table-marker + table thead { display: none; }
-#keyword-table-marker + table td { border: none; }
-#keyword-table-marker + table {
-    margin-left: 2em;
-    margin-bottom: 1em;
-}
+#keywords table td { border: none; }

branches/try/src/liballoc/arc.rs

@@ -276,7 +276,6 @@ impl<T: Sync + Send> Drop for Weak<T> {
 #[allow(experimental)]
 mod tests {
     use std::clone::Clone;
-    use std::collections::MutableSeq;
     use std::comm::channel;
     use std::mem::drop;
     use std::ops::Drop;

branches/try/src/libcollections/bitv.rs

@@ -33,7 +33,7 @@
 //!     bv.set(0, false);
 //!     bv.set(1, false);
 //!
-//!     for i in iter::range_inclusive(2, (max_prime as f64).sqrt() as uint) {
+//!     for i in range(2, max_prime) {
 //!         // if i is a prime
 //!         if bv[i] {
 //!             // Mark all multiples of i as non-prime (any multiples below i * i
@@ -2659,7 +2659,7 @@ mod tests {
         let mut r = rng();
         let mut bitv = Bitv::with_capacity(BENCH_BITS, false);
         b.iter(|| {
-            for i in range(0u, 100) {
+            for _ in range(0u, 100) {
                 bitv.set((r.next_u32() as uint) % BENCH_BITS, r.gen());
             }
             &bitv

branches/try/src/libcollections/dlist.rs

@@ -890,13 +890,13 @@ mod tests {
         }
 
         let v = vec![1i,2,3,4,5];
-        let u = vec![9i,8,1,2,3,4,5];
+        let mut u = vec![9i,8,1,2,3,4,5];
         let mut m = list_from(v.as_slice());
         m.prepend(list_from(u.as_slice()));
         check_links(&m);
-        let sum = u.append(v.as_slice());
-        assert_eq!(sum.len(), m.len());
-        for elt in sum.into_iter() {
+        u.extend(v.as_slice().iter().map(|&b| b));
+        assert_eq!(u.len(), m.len());
+        for elt in u.into_iter() {
             assert_eq!(m.pop_front(), Some(elt))
         }
     }