---

yaml
---
r: 27768
b: refs/heads/try
c: 2e1b98d
h: refs/heads/master
v: v3

Author: bblum

[refs]

@@ -2,7 +2,7 @@
 refs/heads/master: cd6f24f9d14ac90d167386a56e7a6ac1f0318195
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: cd6f24f9d14ac90d167386a56e7a6ac1f0318195
-refs/heads/try: 1f32c2c5e4a21e7e826a9acb97181bf53b87ff89
+refs/heads/try: 2e1b98d34f105f4632b30bcd5c51e40cb7a1b637
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: d0c6ce338884ee21843f4b40bf6bf18d222ce5df

branches/try/src/rustc/util/ppaux.rs

@@ -50,7 +50,7 @@ fn explain_region(cx: ctxt, region: ty::region) -> ~str {
           some(ast_map::node_block(blk)) => {
             fmt!{"the lifetime %s as defined on %s",
                  bound_region_to_str(cx, br),
-                 explain_span(cx, ~"the block", blk.span)}
+                 explain_span(cx, ~"block", blk.span)}
           }
           some(_) | none => {
             // this really should not happen

branches/try/src/test/compile-fail/borrowck-confuse-region.rs

@@ -8,7 +8,7 @@
 fn get() -> &int {
     let x = 3;
     return &x;
-    //~^ ERROR illegal borrow: borrowed pointer must be valid for the lifetime & as defined on the the block at 8:17, but the borrowed value is only valid for the block at 8:17
+    //~^ ERROR illegal borrow: borrowed pointer must be valid for the lifetime & as defined on the block at 8:17, but the borrowed value is only valid for the block at 8:17
 }
 
-fn main() {}
+fn main() {}