---

yaml
---
r: 67016
b: refs/heads/master
c: 78f8b40
h: refs/heads/master
v: v3

Author: bors

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 93fa7a4b09d755e1dba3a71f56b3dc34d900776f
+refs/heads/master: 78f8b407e3ab5590a57467fce1febd5289bf7fe5
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 18e3db7392d2d0697b7e27d6d986139960144d85
 refs/heads/try: 7b78b52e602bb3ea8174f9b2006bff3315f03ef9

trunk/doc/rust.md

@@ -1122,6 +1122,41 @@ 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.

trunk/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,7 +118,6 @@ 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
 
@@ -410,8 +409,6 @@ 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
@@ -1517,8 +1514,6 @@ 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
@@ -2543,9 +2538,4 @@ 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

trunk/src/libextra/json.rs

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

trunk/src/librustc/middle/borrowck/check_loans.rs

@@ -31,11 +31,10 @@ use syntax::codemap::span;
 use syntax::visit;
 use util::ppaux::Repr;
 
-#[deriving(Clone)]
 struct CheckLoanCtxt<'self> {
     bccx: @BorrowckCtxt,
     dfcx_loans: &'self LoanDataFlow,
-    move_data: @move_data::FlowedMoveData,
+    move_data: move_data::FlowedMoveData,
     all_loans: &'self [Loan],
     reported: @mut HashSet<ast::node_id>,
 }
@@ -47,10 +46,10 @@ pub fn check_loans(bccx: @BorrowckCtxt,
                    body: &ast::blk) {
     debug!("check_loans(body id=%?)", body.id);
 
-    let clcx = CheckLoanCtxt {
+    let clcx = @mut CheckLoanCtxt {
         bccx: bccx,
         dfcx_loans: dfcx_loans,
-        move_data: @move_data,
+        move_data: move_data,
         all_loans: all_loans,
         reported: @mut HashSet::new(),
     };
@@ -140,7 +139,7 @@ impl<'self> CheckLoanCtxt<'self> {
         return result;
     }
 
-    pub fn check_for_conflicting_loans(&self, scope_id: ast::node_id) {
+    pub fn check_for_conflicting_loans(&mut self, scope_id: ast::node_id) {
         //! Checks to see whether any of the loans that are issued
         //! by `scope_id` conflict with loans that have already been
         //! issued when we enter `scope_id` (for example, we do not
@@ -597,7 +596,7 @@ impl<'self> CheckLoanCtxt<'self> {
         MoveOk
     }
 
-    pub fn check_call(&self,
+    pub fn check_call(&mut self,
                       _expr: @ast::expr,
                       _callee: Option<@ast::expr>,
                       _callee_id: ast::node_id,
@@ -618,8 +617,8 @@ fn check_loans_in_fn<'a>(fk: &visit::fn_kind,
                          body: &ast::blk,
                          sp: span,
                          id: ast::node_id,
-                         (this, visitor): (CheckLoanCtxt<'a>,
-                                           visit::vt<CheckLoanCtxt<'a>>)) {
+                         (this, visitor): (@mut CheckLoanCtxt<'a>,
+                                           visit::vt<@mut CheckLoanCtxt<'a>>)) {
     match *fk {
         visit::fk_item_fn(*) |
         visit::fk_method(*) => {
@@ -635,7 +634,7 @@ fn check_loans_in_fn<'a>(fk: &visit::fn_kind,
 
     visit::visit_fn(fk, decl, body, sp, id, (this, visitor));
 
-    fn check_captured_variables(this: CheckLoanCtxt,
+    fn check_captured_variables(this: @mut CheckLoanCtxt,
                                 closure_id: ast::node_id,
                                 span: span) {
         let cap_vars = this.bccx.capture_map.get(&closure_id);
@@ -653,7 +652,7 @@ fn check_loans_in_fn<'a>(fk: &visit::fn_kind,
         }
         return;
 
-        fn check_by_move_capture(this: CheckLoanCtxt,
+        fn check_by_move_capture(this: @mut CheckLoanCtxt,
                                  closure_id: ast::node_id,
                                  cap_var: &moves::CaptureVar,
                                  move_path: @LoanPath) {
@@ -677,14 +676,14 @@ fn check_loans_in_fn<'a>(fk: &visit::fn_kind,
 }
 
 fn check_loans_in_local<'a>(local: @ast::local,
-                            (this, vt): (CheckLoanCtxt<'a>,
-                                         visit::vt<CheckLoanCtxt<'a>>)) {
+                            (this, vt): (@mut CheckLoanCtxt<'a>,
+                                         visit::vt<@mut CheckLoanCtxt<'a>>)) {
     visit::visit_local(local, (this, vt));
 }
 
 fn check_loans_in_expr<'a>(expr: @ast::expr,
-                           (this, vt): (CheckLoanCtxt<'a>,
-                                        visit::vt<CheckLoanCtxt<'a>>)) {
+                           (this, vt): (@mut CheckLoanCtxt<'a>,
+                                        visit::vt<@mut CheckLoanCtxt<'a>>)) {
     visit::visit_expr(expr, (this, vt));
 
     debug!("check_loans_in_expr(expr=%s)",
@@ -737,17 +736,17 @@ fn check_loans_in_expr<'a>(expr: @ast::expr,
 }
 
 fn check_loans_in_pat<'a>(pat: @ast::pat,
-                          (this, vt): (CheckLoanCtxt<'a>,
-                                       visit::vt<CheckLoanCtxt<'a>>))
+                          (this, vt): (@mut CheckLoanCtxt<'a>,
+                                       visit::vt<@mut CheckLoanCtxt<'a>>))
 {
     this.check_for_conflicting_loans(pat.id);
     this.check_move_out_from_id(pat.id, pat.span);
     visit::visit_pat(pat, (this, vt));
 }
 
 fn check_loans_in_block<'a>(blk: &ast::blk,
-                            (this, vt): (CheckLoanCtxt<'a>,
-                                         visit::vt<CheckLoanCtxt<'a>>))
+                            (this, vt): (@mut CheckLoanCtxt<'a>,
+                                         visit::vt<@mut CheckLoanCtxt<'a>>))
 {
     visit::visit_block(blk, (this, vt));
     this.check_for_conflicting_loans(blk.id);