---

yaml
---
r: 142981
b: refs/heads/try2
c: 458b564
h: refs/heads/master
i:
  142979: 1337bec
v: v3

Author: pcwalton

[refs]

@@ -5,7 +5,7 @@ refs/heads/snap-stage3: 78a7676898d9f80ab540c6df5d4c9ce35bb50463
 refs/heads/try: 519addf6277dbafccbb4159db4b710c37eaa2ec5
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
-refs/heads/try2: 32586faa6adb890bc25caa8b5cb692e8c37e4a89
+refs/heads/try2: 458b564601f1373505086cd714927d38e32727ca
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try2/configure

@@ -750,18 +750,18 @@ then
     cd ${CFG_SRC_DIR}
 
     msg "git: submodule sync"
-    "${CFG_GIT}" submodule sync
+    "${CFG_GIT}" submodule --quiet sync
 
     msg "git: submodule update"
-    "${CFG_GIT}" submodule update --init
+    "${CFG_GIT}" submodule --quiet update --init
     need_ok "git failed"
 
     msg "git: submodule foreach sync"
-    "${CFG_GIT}" submodule foreach --recursive 'if test -e .gitmodules; then git submodule sync; fi'
+    "${CFG_GIT}" submodule --quiet foreach --recursive 'if test -e .gitmodules; then git submodule sync; fi'
     need_ok "git failed"
 
     msg "git: submodule foreach update"
-    "${CFG_GIT}" submodule update --init --recursive
+    "${CFG_GIT}" submodule --quiet update --init --recursive
     need_ok "git failed"
 
     # NB: this is just for the sake of getting the submodule SHA1 values
@@ -770,9 +770,9 @@ then
     "${CFG_GIT}" submodule status --recursive
 
     msg "git: submodule clobber"
-    "${CFG_GIT}" submodule foreach --recursive git clean -dxf
+    "${CFG_GIT}" submodule --quiet foreach --recursive git clean -dxf
     need_ok "git failed"
-    "${CFG_GIT}" submodule foreach --recursive git checkout .
+    "${CFG_GIT}" submodule --quiet foreach --recursive git checkout .
     need_ok "git failed"
 
     cd ${CFG_BUILD_DIR}
@@ -921,6 +921,9 @@ do
         esac
         need_ok "LLVM configure failed"
 
+        # Hack the tools Makefile to turn off the clang build
+        sed -i 's/clang//g' tools/Makefile
+
         cd $CFG_BUILD_DIR
     fi
 

branches/try2/doc/rust.md

@@ -1122,41 +1122,6 @@ static bits_n_strings: BitsNStrings<'static> = BitsNStrings {
 };
 ~~~~
 
-#### Mutable statics
-
-If a static item is declared with the ```mut``` keyword, then it is allowed to
-be modified by the program. One of Rust's goals is to make concurrency bugs hard
-to run into, and this is obviously a very large source of race conditions or
-other bugs. For this reason, an ```unsafe``` block is required when either
-reading or writing a mutable static variable. Care should be taken to ensure
-that modifications to a mutable static are safe with respect to other tasks
-running in the same process.
-
-Mutable statics are still very useful, however. They can be used with C
-libraries and can also be bound from C libraries (in an ```extern``` block).
-
-~~~
-# fn atomic_add(_: &mut uint, _: uint) -> uint { 2 }
-
-static mut LEVELS: uint = 0;
-
-// This violates the idea of no shared state, and this doesn't internally
-// protect against races, so this function is `unsafe`
-unsafe fn bump_levels_unsafe1() -> uint {
-    let ret = LEVELS;
-    LEVELS += 1;
-    return ret;
-}
-
-// Assuming that we have an atomic_add function which returns the old value,
-// this function is "safe" but the meaning of the return value may not be what
-// callers expect, so it's still marked as `unsafe`
-unsafe fn bump_levels_unsafe2() -> uint {
-    return atomic_add(&mut LEVELS, 1);
-}
-
-~~~
-
 ### Traits
 
 A _trait_ describes a set of method types.

branches/try2/doc/tutorial.md

@@ -84,7 +84,7 @@ supported build environments that are most likely to work.
 > know.
 
 [bug-3319]: https://github.com/mozilla/rust/issues/3319
-[wiki-start]: https://github.com/mozilla/rust/wiki/Note-getting-started-developing-Rust
+[wiki-start]:	https://github.com/mozilla/rust/wiki/Note-getting-started-developing-Rust
 
 To build from source you will also need the following prerequisite
 packages:
@@ -118,6 +118,7 @@ API-documentation tool; `rustpkg`, the Rust package manager;
 `rusti`, the Rust REPL; and `rust`, a tool which acts both as a unified
 interface for them, and for a few common command line scenarios.
 
+[wiki-start]: https://github.com/mozilla/rust/wiki/Note-getting-started-developing-Rust
 [tarball]: http://static.rust-lang.org/dist/rust-0.7.tar.gz
 [win-exe]: http://static.rust-lang.org/dist/rust-0.7-install.exe
 
@@ -409,6 +410,8 @@ println(fmt!("what is this thing: %?", mystery_object));
 
 You can define your own syntax extensions with the macro system. For details, see the [macro tutorial][macros].
 
+[macros]: tutorial-macros.html
+
 # Control structures
 
 ## Conditionals
@@ -1514,6 +1517,8 @@ closures, but they also own them: that is, no other code can access
 them. Owned closures are used in concurrent code, particularly
 for spawning [tasks][tasks].
 
+[tasks]: tutorial-tasks.html
+
 ## Closure compatibility
 
 Rust closures have a convenient subtyping property: you can pass any kind of
@@ -2538,4 +2543,9 @@ There is further documentation on the [wiki].
 [ffi]: tutorial-ffi.html
 
 [wiki]: https://github.com/mozilla/rust/wiki/Docs
+[unit testing]: https://github.com/mozilla/rust/wiki/Doc-unit-testing
+[rustdoc]: https://github.com/mozilla/rust/wiki/Doc-using-rustdoc
+[cargo]: https://github.com/mozilla/rust/wiki/Doc-using-cargo-to-manage-packages
+[attributes]: https://github.com/mozilla/rust/wiki/Doc-attributes
 
+[pound-rust]: http://chat.mibbit.com/?server=irc.mozilla.org&channel=%23rust

branches/try2/src/etc/vim/compiler/rustc.vim

@@ -893,9 +893,9 @@ mod tests {
     #[test]
     fn test_1_element() {
         let mut act = Bitv::new(1u, false);
-        assert!(act.eq_vec([false]));
+        assert!(act.eq_vec(~[false]));
         act = Bitv::new(1u, true);
-        assert!(act.eq_vec([true]));
+        assert!(act.eq_vec(~[true]));
     }
 
     #[test]
@@ -913,11 +913,11 @@ mod tests {
 
         act = Bitv::new(10u, false);
         assert!((act.eq_vec(
-                    [false, false, false, false, false, false, false, false, false, false])));
+                    ~[false, false, false, false, false, false, false, false, false, false])));
         // all 1
 
         act = Bitv::new(10u, true);
-        assert!((act.eq_vec([true, true, true, true, true, true, true, true, true, true])));
+        assert!((act.eq_vec(~[true, true, true, true, true, true, true, true, true, true])));
         // mixed
 
         act = Bitv::new(10u, false);
@@ -926,7 +926,7 @@ mod tests {
         act.set(2u, true);
         act.set(3u, true);
         act.set(4u, true);
-        assert!((act.eq_vec([true, true, true, true, true, false, false, false, false, false])));
+        assert!((act.eq_vec(~[true, true, true, true, true, false, false, false, false, false])));
         // mixed
 
         act = Bitv::new(10u, false);
@@ -935,15 +935,15 @@ mod tests {
         act.set(7u, true);
         act.set(8u, true);
         act.set(9u, true);
-        assert!((act.eq_vec([false, false, false, false, false, true, true, true, true, true])));
+        assert!((act.eq_vec(~[false, false, false, false, false, true, true, true, true, true])));
         // mixed
 
         act = Bitv::new(10u, false);
         act.set(0u, true);
         act.set(3u, true);
         act.set(6u, true);
         act.set(9u, true);
-        assert!((act.eq_vec([true, false, false, true, false, false, true, false, false, true])));
+        assert!((act.eq_vec(~[true, false, false, true, false, false, true, false, false, true])));
     }
 
     #[test]
@@ -953,14 +953,14 @@ mod tests {
 
         act = Bitv::new(31u, false);
         assert!(act.eq_vec(
-                [false, false, false, false, false, false, false, false, false, false, false,
+                ~[false, false, false, false, false, false, false, false, false, false, false,
                 false, false, false, false, false, false, false, false, false, false, false, false,
                 false, false, false, false, false, false, false, false]));
         // all 1
 
         act = Bitv::new(31u, true);
         assert!(act.eq_vec(
-                [true, true, true, true, true, true, true, true, true, true, true, true, true,
+                ~[true, true, true, true, true, true, true, true, true, true, true, true, true,
                 true, true, true, true, true, true, true, true, true, true, true, true, true, true,
                 true, true, true, true]));
         // mixed
@@ -975,7 +975,7 @@ mod tests {
         act.set(6u, true);
         act.set(7u, true);
         assert!(act.eq_vec(
-                [true, true, true, true, true, true, true, true, false, false, false, false, false,
+                ~[true, true, true, true, true, true, true, true, false, false, false, false, false,
                 false, false, false, false, false, false, false, false, false, false, false, false,
                 false, false, false, false, false, false]));
         // mixed
@@ -990,7 +990,7 @@ mod tests {
         act.set(22u, true);
         act.set(23u, true);
         assert!(act.eq_vec(
-                [false, false, false, false, false, false, false, false, false, false, false,
+                ~[false, false, false, false, false, false, false, false, false, false, false,
                 false, false, false, false, false, true, true, true, true, true, true, true, true,
                 false, false, false, false, false, false, false]));
         // mixed
@@ -1004,7 +1004,7 @@ mod tests {
         act.set(29u, true);
         act.set(30u, true);
         assert!(act.eq_vec(
-                [false, false, false, false, false, false, false, false, false, false, false,
+                ~[false, false, false, false, false, false, false, false, false, false, false,
                 false, false, false, false, false, false, false, false, false, false, false, false,
                 false, true, true, true, true, true, true, true]));
         // mixed
@@ -1014,7 +1014,7 @@ mod tests {
         act.set(17u, true);
         act.set(30u, true);
         assert!(act.eq_vec(
-                [false, false, false, true, false, false, false, false, false, false, false, false,
+                ~[false, false, false, true, false, false, false, false, false, false, false, false,
                 false, false, false, false, false, true, false, false, false, false, false, false,
                 false, false, false, false, false, false, true]));
     }
@@ -1026,14 +1026,14 @@ mod tests {
 
         act = Bitv::new(32u, false);
         assert!(act.eq_vec(
-                [false, false, false, false, false, false, false, false, false, false, false,
+                ~[false, false, false, false, false, false, false, false, false, false, false,
                 false, false, false, false, false, false, false, false, false, false, false, false,
                 false, false, false, false, false, false, false, false, false]));
         // all 1
 
         act = Bitv::new(32u, true);
         assert!(act.eq_vec(
-                [true, true, true, true, true, true, true, true, true, true, true, true, true,
+                ~[true, true, true, true, true, true, true, true, true, true, true, true, true,
                 true, true, true, true, true, true, true, true, true, true, true, true, true, true,
                 true, true, true, true, true]));
         // mixed
@@ -1048,7 +1048,7 @@ mod tests {
         act.set(6u, true);
         act.set(7u, true);
         assert!(act.eq_vec(
-                [true, true, true, true, true, true, true, true, false, false, false, false, false,
+                ~[true, true, true, true, true, true, true, true, false, false, false, false, false,
                 false, false, false, false, false, false, false, false, false, false, false, false,
                 false, false, false, false, false, false, false]));
         // mixed
@@ -1063,7 +1063,7 @@ mod tests {
         act.set(22u, true);
         act.set(23u, true);
         assert!(act.eq_vec(
-                [false, false, false, false, false, false, false, false, false, false, false,
+                ~[false, false, false, false, false, false, false, false, false, false, false,
                 false, false, false, false, false, true, true, true, true, true, true, true, true,
                 false, false, false, false, false, false, false, false]));
         // mixed
@@ -1078,7 +1078,7 @@ mod tests {
         act.set(30u, true);
         act.set(31u, true);
         assert!(act.eq_vec(
-                [false, false, false, false, false, false, false, false, false, false, false,
+                ~[false, false, false, false, false, false, false, false, false, false, false,
                 false, false, false, false, false, false, false, false, false, false, false, false,
                 false, true, true, true, true, true, true, true, true]));
         // mixed
@@ -1089,7 +1089,7 @@ mod tests {
         act.set(30u, true);
         act.set(31u, true);
         assert!(act.eq_vec(
-                [false, false, false, true, false, false, false, false, false, false, false, false,
+                ~[false, false, false, true, false, false, false, false, false, false, false, false,
                 false, false, false, false, false, true, false, false, false, false, false, false,
                 false, false, false, false, false, false, true, true]));
     }
@@ -1101,14 +1101,14 @@ mod tests {
 
         act = Bitv::new(33u, false);
         assert!(act.eq_vec(
-                [false, false, false, false, false, false, false, false, false, false, false,
+                ~[false, false, false, false, false, false, false, false, false, false, false,
                 false, false, false, false, false, false, false, false, false, false, false, false,
                 false, false, false, false, false, false, false, false, false, false]));
         // all 1
 
         act = Bitv::new(33u, true);
         assert!(act.eq_vec(
-                [true, true, true, true, true, true, true, true, true, true, true, true, true,
+                ~[true, true, true, true, true, true, true, true, true, true, true, true, true,
                 true, true, true, true, true, true, true, true, true, true, true, true, true, true,
                 true, true, true, true, true, true]));
         // mixed
@@ -1123,7 +1123,7 @@ mod tests {
         act.set(6u, true);
         act.set(7u, true);
         assert!(act.eq_vec(
-                [true, true, true, true, true, true, true, true, false, false, false, false, false,
+                ~[true, true, true, true, true, true, true, true, false, false, false, false, false,
                 false, false, false, false, false, false, false, false, false, false, false, false,
                 false, false, false, false, false, false, false, false]));
         // mixed
@@ -1138,7 +1138,7 @@ mod tests {
         act.set(22u, true);
         act.set(23u, true);
         assert!(act.eq_vec(
-                [false, false, false, false, false, false, false, false, false, false, false,
+                ~[false, false, false, false, false, false, false, false, false, false, false,
                 false, false, false, false, false, true, true, true, true, true, true, true, true,
                 false, false, false, false, false, false, false, false, false]));
         // mixed
@@ -1153,7 +1153,7 @@ mod tests {
         act.set(30u, true);
         act.set(31u, true);
         assert!(act.eq_vec(
-                [false, false, false, false, false, false, false, false, false, false, false,
+                ~[false, false, false, false, false, false, false, false, false, false, false,
                 false, false, false, false, false, false, false, false, false, false, false, false,
                 false, true, true, true, true, true, true, true, true, false]));
         // mixed
@@ -1165,7 +1165,7 @@ mod tests {
         act.set(31u, true);
         act.set(32u, true);
         assert!(act.eq_vec(
-                [false, false, false, true, false, false, false, false, false, false, false, false,
+                ~[false, false, false, true, false, false, false, false, false, false, false, false,
                 false, false, false, false, false, true, false, false, false, false, false, false,
                 false, false, false, false, false, false, true, true, true]));
     }

branches/try2/src/libextra/bitv.rs

@@ -1086,8 +1086,9 @@ impl serialize::Decoder for Decoder {
         debug!("read_map()");
         let len = match self.stack.pop() {
             Object(obj) => {
+                let mut obj = obj;
                 let len = obj.len();
-                for obj.consume().advance |(key, value)| {
+                do obj.consume |key, value| {
                     self.stack.push(value);
                     self.stack.push(String(key));
                 }