---

yaml
---
r: 147160
b: refs/heads/try2
c: 9f7baed
h: refs/heads/master
v: v3

Author: nikomatsakis

[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: 22f14fb27f145dbea3c9312e1e88936c327ccf10
+refs/heads/try2: 9f7baedc62bdad979e1b32a3a645fc2546259b30
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try2/src/librustc/middle/borrowck/doc.rs

@@ -650,7 +650,7 @@ The rule for mutable borrowed pointers is as follows:
 
 Let's examine the two numbered clauses:
 
-Clause (1) specifies that tThe lifetime of the loan (`LT`) cannot
+Clause (1) specifies that the lifetime of the loan (`LT`) cannot
 exceed the lifetime of the `&mut` pointer (`LT'`). The reason for this
 is that the `&mut` pointer is guaranteed to be the only legal way to
 mutate its referent -- but only for the lifetime `LT'`.  After that

branches/try2/src/librustc/middle/borrowck/mod.rs

@@ -671,7 +671,7 @@ impl BorrowckCtxt {
                 // supposed to be going away.
                 format!("unsafe borrow of aliasable, const value")
             }
-            err_borrowed_pointer_too_short(_, _, r) => {
+            err_borrowed_pointer_too_short(..) => {
                 let descr = match opt_loan_path(err.cmt) {
                     Some(lp) => format!("`{}`", self.loan_path_to_str(lp)),
                     None => self.cmt_to_str(err.cmt),