---

yaml
---
r: 96622
b: refs/heads/dist-snap
c: 76d9a96
h: refs/heads/master
v: v3

Author: nikomatsakis

[refs]

@@ -6,7 +6,7 @@ refs/heads/try: c274a6888410ce3e357e014568b43310ed787d36
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c
-refs/heads/dist-snap: 1252947fa976c30ef99961e197e25e86c69621c4
+refs/heads/dist-snap: 76d9a9671bf456407c1b8fd029a4a1149684fb5b
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
 refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0

branches/dist-snap/src/librustc/middle/borrowck/doc.rs

@@ -215,6 +215,24 @@ of this rule: there are comments in the borrowck source referencing
 these names, so that you can cross reference to find the actual code
 that corresponds to the formal rule.
 
+### Invariants
+
+I want to collect, at a high-level, the invariants the borrow checker
+maintains. I will give them names and refer to them throughout the
+text. Together these invariants are crucial for the overall soundness
+of the system.
+
+**Mutability requires uniqueness.** To mutate a path
+
+**Unique mutability.** There is only one *usable* mutable path to any
+given memory at any given time. This implies that when claiming memory
+with an expression like `p = &mut x`, the compiler must guarantee that
+the borrowed value `x` can no longer be mutated so long as `p` is
+live. (This is done via restrictions, read on.)
+
+**.**
+
+
 ### The `gather_loans` pass
 
 We start with the `gather_loans` pass, which walks the AST looking for

branches/dist-snap/src/test/run-pass/borrowck-borrow-of-mut-base-ptr-safe.rs

@@ -21,5 +21,5 @@ fn foo<'a>(mut t0: &'a mut int,
     let r: &int = &*t0; // ...after all, could do same thing directly.
 }
 
-fn main() {
+pub fn main() {
 }

branches/dist-snap/src/test/run-pass/borrowck-freeze-frozen-mut.rs

@@ -30,7 +30,7 @@ pub fn main() {
         assert_eq!(*index1, 2);
         assert_eq!(*index2, 3);
     }
-    assert_eq!(data[0], 1);
+    assert_eq!(data[0], 5);
     assert_eq!(data[1], 2);
     assert_eq!(data[2], 3);
 }