---

yaml
---
r: 39567
b: refs/heads/incoming
c: baa4379
h: refs/heads/master
i:
  39565: f70be89
  39563: 5e20910
  39559: 2a626e2
  39551: e179219
v: v3

Author: catamorphism

[refs]

@@ -6,7 +6,7 @@ refs/heads/try: 3d5418789064fdb463e872a4e651af1c628a3650
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: a810c03263670238bccd64cabb12a23a46e3a278
-refs/heads/incoming: 197a1f9cfe7839bcff0020c54af3e90c4985174d
+refs/heads/incoming: baa4379e5aa0d810304577b41dbe2b59d3030c20
 refs/heads/dist-snap: 22efa39382d41b084fde1719df7ae8ce5697d8c9
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/incoming/AUTHORS.txt

@@ -44,7 +44,6 @@ Drew Willcoxon <[email protected]>
 Elliott Slaughter <[email protected]>
 Elly Fong-Jones <[email protected]>
 Eric Holk <[email protected]>
-Eric Holmes <[email protected]>
 Erick Tryzelaar <[email protected]>
 Erik Rose <[email protected]>
 Evan McClanahan <[email protected]>
@@ -90,7 +89,6 @@ Magnus Auvinen <[email protected]>
 Mahmut Bulut <[email protected]>
 Margaret Meyerhofer <[email protected]>
 Marijn Haverbeke <[email protected]>
-Martin DeMello <[email protected]>
 Matt Brubeck <[email protected]>
 Matthew O'Connor <[email protected]>
 Max Penet <[email protected]>

branches/incoming/Makefile.in

@@ -154,7 +154,7 @@ LIBRUSTI_DSYM_GLOB :=$(call CFG_LIB_DSYM_GLOB,rusti)
 
 # version-string calculation
 CFG_GIT_DIR := $(CFG_SRC_DIR).git
-CFG_RELEASE = 0.6
+CFG_RELEASE = 0.5
 CFG_VERSION = $(CFG_RELEASE)
 
 ifneq ($(wildcard $(CFG_GIT)),)

branches/incoming/README.md

@@ -42,7 +42,7 @@ packages:
 Assuming you're on a relatively modern *nix system and have met the
 prerequisites, something along these lines should work.
 
-    $ wget http://static.rust-lang.org/dist/rust-0.5.tar.gz
+    $ wget http://dl.rust-lang.org/dist/rust-0.5.tar.gz
     $ tar -xzf rust-0.5.tar.gz
     $ cd rust-0.5
     $ ./configure
@@ -59,8 +59,8 @@ When complete, `make install` will place several programs into
 API-documentation tool, and `cargo`, the Rust package manager.
 
 [wiki-start]: https://github.com/mozilla/rust/wiki/Note-getting-started-developing-Rust
-[tarball]: http://static.rust-lang.org/dist/rust-0.5.tar.gz
-[win-exe]: http://static.rust-lang.org/dist/rust-0.5-install.exe
+[tarball]: http://dl.rust-lang.org/dist/rust-0.5.tar.gz
+[win-exe]: http://dl.rust-lang.org/dist/rust-0.5-install.exe
 
 
 ## License
@@ -74,4 +74,4 @@ See LICENSE.txt for details.
 
 The [tutorial] is a good starting point.
 
-[tutorial]: http://static.rust-lang.org/doc/tutorial.html
+[tutorial]: http://dl.rust-lang.org/doc/tutorial.html

branches/incoming/doc/tutorial-ffi.md

@@ -22,7 +22,7 @@ extern mod crypto {
 
 fn as_hex(data: ~[u8]) -> ~str {
     let mut acc = ~"";
-    for data.each |&byte| { acc += fmt!("%02x", byte as uint); }
+    for data.each |byte| { acc += fmt!("%02x", byte as uint); }
     return acc;
 }
 
@@ -33,8 +33,8 @@ fn sha1(data: ~str) -> ~str unsafe {
     return as_hex(vec::from_buf(hash, 20));
 }
 
-fn main() {
-    io::println(sha1(core::os::args()[1]));
+fn main(args: ~[~str]) {
+    io::println(sha1(args[1]));
 }
 ~~~~
 

branches/incoming/doc/tutorial.md

@@ -99,7 +99,7 @@ If you've fulfilled those prerequisites, something along these lines
 should work.
 
 ~~~~ {.notrust}
-$ curl -O http://static.rust-lang.org/dist/rust-0.5.tar.gz
+$ curl -O http://dl.rust-lang.org/dist/rust-0.5.tar.gz
 $ tar -xzf rust-0.5.tar.gz
 $ cd rust-0.5
 $ ./configure
@@ -118,8 +118,8 @@ API-documentation tool, `cargo`, the Rust package manager,
 and `rusti`, the Rust REPL.
 
 [wiki-start]: https://github.com/mozilla/rust/wiki/Note-getting-started-developing-Rust
-[tarball]: http://static.rust-lang.org/dist/rust-0.5.tar.gz
-[win-exe]: http://static.rust-lang.org/dist/rust-0.5-install.exe
+[tarball]: http://dl.rust-lang.org/dist/rust-0.5.tar.gz
+[win-exe]: http://dl.rust-lang.org/dist/rust-0.5-install.exe
 
 ## Compiling your first program
 
@@ -2419,10 +2419,10 @@ these two files:
 pub fn explore() -> &str { "world" }
 ~~~~
 
-~~~~
+~~~~ {.xfail-test}
 // main.rs
 extern mod world;
-fn main() { io::println(~"hello " + world::explore()); }
+fn main() { io::println("hello " + world::explore()); }
 ~~~~
 
 Now compile and run like this (adjust to your platform if necessary):

branches/incoming/src/compiletest/compiletest.rc

@@ -18,8 +18,8 @@
 #[allow(deprecated_mode)];
 #[allow(deprecated_pattern)];
 
-extern mod core(vers = "0.6");
-extern mod std(vers = "0.6");
+extern mod core(vers = "0.5");
+extern mod std(vers = "0.5");
 
 use core::*;
 

branches/incoming/src/driver/driver.rs

@@ -9,21 +9,21 @@
 // except according to those terms.
 
 #[no_core];
-extern mod core(vers = "0.6");
+extern mod core(vers = "0.5");
 
 #[cfg(cargo)]
-extern mod self(name = "cargo", vers = "0.6");
+extern mod self(name = "cargo", vers = "0.5");
 
 #[cfg(fuzzer)]
-extern mod self(name = "fuzzer", vers = "0.6");
+extern mod self(name = "fuzzer", vers = "0.5");
 
 #[cfg(rustdoc)]
-extern mod self(name = "rustdoc", vers = "0.6");
+extern mod self(name = "rustdoc", vers = "0.5");
 
 #[cfg(rusti)]
-extern mod self(name = "rusti", vers = "0.6");
+extern mod self(name = "rusti", vers = "0.5");
 
 #[cfg(rustc)]
-extern mod self(name = "rustc", vers = "0.6");
+extern mod self(name = "rustc", vers = "0.5");
 
 fn main() { self::main() }

branches/incoming/src/etc/vim/after/syntax/rust.vim

@@ -7,6 +7,10 @@ if exists('g:rust_conceal_mod_path')
 	syn match rustNiceOperator "::" conceal cchar=ㆍ
 endif
 
+syn match rustLeftArrowHead contained "-" conceal cchar= 
+syn match rustLeftArrowTail contained "<" conceal cchar=⟵
+syn match rustNiceOperator "<-" contains=rustLeftArrowHead,rustLeftArrowTail
+
 syn match rustRightArrowHead contained ">" conceal cchar= 
 syn match rustRightArrowTail contained "-" conceal cchar=⟶
 syn match rustNiceOperator "->" contains=rustRightArrowHead,rustRightArrowTail

branches/incoming/src/libcargo/cargo.rc

@@ -20,7 +20,7 @@
 // End:
 
 #[link(name = "cargo",
-       vers = "0.6",
+       vers = "0.5",
        uuid = "9ff87a04-8fed-4295-9ff8-f99bb802650b",
        url = "https://github.com/mozilla/rust/tree/master/src/cargo")];
 
@@ -37,10 +37,10 @@
 #[allow(deprecated_mode)];
 #[allow(deprecated_pattern)];
 
-extern mod core(vers = "0.6");
-extern mod std(vers = "0.6");
-extern mod rustc(vers = "0.6");
-extern mod syntax(vers = "0.6");
+extern mod core(vers = "0.5");
+extern mod std(vers = "0.5");
+extern mod rustc(vers = "0.5");
+extern mod syntax(vers = "0.5");
 
 #[legacy_exports]
 mod pgp;

branches/incoming/src/libcargo/pgp.rs

@@ -102,7 +102,7 @@ fn verify(root: &Path, data: &Path, sig: &Path) -> bool {
     let path = root.push("gpg");
     let res = gpgv(~[~"--homedir", path.to_str(),
                   ~"--keyring", ~"pubring.gpg",
-                  ~"--verbose",
+                  ~"--verify",
                  sig.to_str(), data.to_str()]);
     if res.status != 0 {
         return false;

branches/incoming/src/libcore/core.rc

@@ -36,7 +36,7 @@ Implicitly, all crates behave as if they included the following prologue:
 
 
 #[link(name = "core",
-       vers = "0.6",
+       vers = "0.5",
        uuid = "c70c24a7-5551-4f73-8e37-380b11d80be8",
        url = "https://github.com/mozilla/rust/tree/master/src/libcore")];
 
@@ -103,7 +103,7 @@ pub mod owned;
 #[cfg(notest)] pub mod cmp;
 
 // Make core testable by not duplicating lang items. See #2912
-#[cfg(test)] extern mod realcore(name = "core", vers = "0.6");
+#[cfg(test)] extern mod realcore(name = "core", vers = "0.5");
 #[cfg(test)] pub use kinds = realcore::kinds;
 #[cfg(test)] pub use ops = realcore::ops;
 #[cfg(test)] pub use cmp = realcore::cmp;
@@ -249,7 +249,7 @@ mod core {
 // Similar to above. Some magic to make core testable.
 #[cfg(test)]
 mod std {
-    extern mod std(vers = "0.6");
+    extern mod std(vers = "0.5");
     pub use std::std::test;
 }
 

branches/incoming/src/libcore/float.rs

@@ -466,9 +466,9 @@ pub fn test_from_str() {
    assert from_str(~".e-1") == Some(0.);
    assert from_str(~"5.") == Some(5.);
    assert from_str(~".5") == Some(0.5);
-   assert from_str(~"0.6") == Some(0.5);
-   assert from_str(~"0.6") == Some(0.5);
-   assert from_str(~"0.6") == Some(0.5);
+   assert from_str(~"0.5") == Some(0.5);
+   assert from_str(~"0.5") == Some(0.5);
+   assert from_str(~"0.5") == Some(0.5);
    assert from_str(~"-.5") == Some(-0.5);
    assert from_str(~"-.5") == Some(-0.5);
    assert from_str(~"-5") == Some(-5.);

branches/incoming/src/libcore/result.rs

@@ -234,7 +234,7 @@ impl<T, E> Result<T, E> {
     pure fn unwrap(self) -> T { unwrap(self) }
 
     #[inline(always)]
-    pure fn unwrap_err(self) -> E { unwrap_err(self) }
+    pure fn unwrap_err(self) -> T { unwrap(self) }
 
     #[inline(always)]
     pure fn chain<U>(self, op: fn(T) -> Result<U,E>) -> Result<U,E> {

branches/incoming/src/libfuzzer/fuzzer.rc

@@ -11,7 +11,7 @@
 
 
 #[link(name = "fuzzer",
-       vers = "0.6",
+       vers = "0.5",
        uuid = "d6418797-2736-4833-bd82-d3c684b7c1b0",
        url = "https://github.com/mozilla/rust/tree/master/src/libfuzzer")];
 
@@ -28,9 +28,9 @@
 #[allow(deprecated_mode)];
 #[allow(deprecated_pattern)];
 
-extern mod core(vers = "0.6");
-extern mod std(vers = "0.6");
-extern mod syntax(vers = "0.6");
+extern mod core(vers = "0.5");
+extern mod std(vers = "0.5");
+extern mod syntax(vers = "0.5");
 
 use core::*;
 

branches/incoming/src/librustc/middle/trans/base.rs

@@ -2396,6 +2396,30 @@ fn declare_intrinsics(llmod: ModuleRef) -> HashMap<~str, ValueRef> {
                                 T_fn(~[T_f32()], T_f32()));
     let truncf64 = decl_cdecl_fn(llmod, ~"llvm.trunc.f64",
                                 T_fn(~[T_f64()], T_f64()));
+    let ctpop8 = decl_cdecl_fn(llmod, ~"llvm.ctpop.i8",
+                                T_fn(~[T_i8()], T_i8()));
+    let ctpop16 = decl_cdecl_fn(llmod, ~"llvm.ctpop.i16",
+                                T_fn(~[T_i16()], T_i16()));
+    let ctpop32 = decl_cdecl_fn(llmod, ~"llvm.ctpop.i32",
+                                T_fn(~[T_i32()], T_i32()));
+    let ctpop64 = decl_cdecl_fn(llmod, ~"llvm.ctpop.i64",
+                                T_fn(~[T_i64()], T_i64()));
+    let ctlz8 = decl_cdecl_fn(llmod, ~"llvm.ctlz.i8",
+                                T_fn(~[T_i8(), T_i1()], T_i8()));
+    let ctlz16 = decl_cdecl_fn(llmod, ~"llvm.ctlz.i16",
+                                T_fn(~[T_i16(), T_i1()], T_i16()));
+    let ctlz32 = decl_cdecl_fn(llmod, ~"llvm.ctlz.i32",
+                                T_fn(~[T_i32(), T_i1()], T_i32()));
+    let ctlz64 = decl_cdecl_fn(llmod, ~"llvm.ctlz.i64",
+                                T_fn(~[T_i64(), T_i1()], T_i64()));
+    let cttz8 = decl_cdecl_fn(llmod, ~"llvm.cttz.i8",
+                                T_fn(~[T_i8(), T_i1()], T_i8()));
+    let cttz16 = decl_cdecl_fn(llmod, ~"llvm.cttz.i16",
+                                T_fn(~[T_i16(), T_i1()], T_i16()));
+    let cttz32 = decl_cdecl_fn(llmod, ~"llvm.cttz.i32",
+                                T_fn(~[T_i32(), T_i1()], T_i32()));
+    let cttz64 = decl_cdecl_fn(llmod, ~"llvm.cttz.i64",
+                                T_fn(~[T_i64(), T_i1()], T_i64()));
 
     let intrinsics = HashMap();
     intrinsics.insert(~"llvm.gcroot", gcroot);
@@ -2436,6 +2460,18 @@ fn declare_intrinsics(llmod: ModuleRef) -> HashMap<~str, ValueRef> {
     intrinsics.insert(~"llvm.ceil.f64", ceilf64);
     intrinsics.insert(~"llvm.trunc.f32", truncf32);
     intrinsics.insert(~"llvm.trunc.f64", truncf64);
+    intrinsics.insert(~"llvm.ctpop.i8", ctpop8);
+    intrinsics.insert(~"llvm.ctpop.i16", ctpop16);
+    intrinsics.insert(~"llvm.ctpop.i32", ctpop32);
+    intrinsics.insert(~"llvm.ctpop.i64", ctpop64);
+    intrinsics.insert(~"llvm.ctlz.i8", ctlz8);
+    intrinsics.insert(~"llvm.ctlz.i16", ctlz16);
+    intrinsics.insert(~"llvm.ctlz.i32", ctlz32);
+    intrinsics.insert(~"llvm.ctlz.i64", ctlz64);
+    intrinsics.insert(~"llvm.cttz.i8", cttz8);
+    intrinsics.insert(~"llvm.cttz.i16", cttz16);
+    intrinsics.insert(~"llvm.cttz.i32", cttz32);
+    intrinsics.insert(~"llvm.cttz.i64", cttz64);
 
     return intrinsics;
 }

branches/incoming/src/librustc/middle/trans/foreign.rs

@@ -1194,6 +1194,74 @@ fn trans_intrinsic(ccx: @crate_ctxt, decl: ValueRef, item: @ast::foreign_item,
             let truncf = ccx.intrinsics.get(~"llvm.trunc.f64");
             Store(bcx, Call(bcx, truncf, ~[x]), fcx.llretptr);
         }
+        ~"ctpop8" => {
+            let x = get_param(decl, first_real_arg);
+            let ctpop = ccx.intrinsics.get(~"llvm.ctpop.i8");
+            Store(bcx, Call(bcx, ctpop, ~[x]), fcx.llretptr)
+        }
+        ~"ctpop16" => {
+            let x = get_param(decl, first_real_arg);
+            let ctpop = ccx.intrinsics.get(~"llvm.ctpop.i16");
+            Store(bcx, Call(bcx, ctpop, ~[x]), fcx.llretptr)
+        }
+        ~"ctpop32" => {
+            let x = get_param(decl, first_real_arg);
+            let ctpop = ccx.intrinsics.get(~"llvm.ctpop.i32");
+            Store(bcx, Call(bcx, ctpop, ~[x]), fcx.llretptr)
+        }
+        ~"ctpop64" => {
+            let x = get_param(decl, first_real_arg);
+            let ctpop = ccx.intrinsics.get(~"llvm.ctpop.i64");
+            Store(bcx, Call(bcx, ctpop, ~[x]), fcx.llretptr)
+        }
+        ~"ctlz8" => {
+            let x = get_param(decl, first_real_arg);
+            let y = C_bool(false);
+            let ctlz = ccx.intrinsics.get(~"llvm.ctlz.i8");
+            Store(bcx, Call(bcx, ctlz, ~[x, y]), fcx.llretptr)
+        }
+        ~"ctlz16" => {
+            let x = get_param(decl, first_real_arg);
+            let y = C_bool(false);
+            let ctlz = ccx.intrinsics.get(~"llvm.ctlz.i16");
+            Store(bcx, Call(bcx, ctlz, ~[x, y]), fcx.llretptr)
+        }
+        ~"ctlz32" => {
+            let x = get_param(decl, first_real_arg);
+            let y = C_bool(false);
+            let ctlz = ccx.intrinsics.get(~"llvm.ctlz.i32");
+            Store(bcx, Call(bcx, ctlz, ~[x, y]), fcx.llretptr)
+        }
+        ~"ctlz64" => {
+            let x = get_param(decl, first_real_arg);
+            let y = C_bool(false);
+            let ctlz = ccx.intrinsics.get(~"llvm.ctlz.i64");
+            Store(bcx, Call(bcx, ctlz, ~[x, y]), fcx.llretptr)
+        }
+        ~"cttz8" => {
+            let x = get_param(decl, first_real_arg);
+            let y = C_bool(false);
+            let cttz = ccx.intrinsics.get(~"llvm.cttz.i8");
+            Store(bcx, Call(bcx, cttz, ~[x, y]), fcx.llretptr)
+        }
+        ~"cttz16" => {
+            let x = get_param(decl, first_real_arg);
+            let y = C_bool(false);
+            let cttz = ccx.intrinsics.get(~"llvm.cttz.i16");
+            Store(bcx, Call(bcx, cttz, ~[x, y]), fcx.llretptr)
+        }
+        ~"cttz32" => {
+            let x = get_param(decl, first_real_arg);
+            let y = C_bool(false);
+            let cttz = ccx.intrinsics.get(~"llvm.cttz.i32");
+            Store(bcx, Call(bcx, cttz, ~[x, y]), fcx.llretptr)
+        }
+        ~"cttz64" => {
+            let x = get_param(decl, first_real_arg);
+            let y = C_bool(false);
+            let cttz = ccx.intrinsics.get(~"llvm.cttz.i64");
+            Store(bcx, Call(bcx, cttz, ~[x, y]), fcx.llretptr)
+        }
         _ => {
             // Could we make this an enum rather than a string? does it get
             // checked earlier?