---

yaml
---
r: 92230
b: refs/heads/auto
c: 9f7baed
h: refs/heads/master
v: v3

Author: nikomatsakis

[refs]

@@ -13,7 +13,7 @@ refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0
 refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
 refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
 refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
-refs/heads/auto: 22f14fb27f145dbea3c9312e1e88936c327ccf10
+refs/heads/auto: 9f7baedc62bdad979e1b32a3a645fc2546259b30
 refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167
 refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c
 refs/tags/0.1: b19db808c2793fe2976759b85a355c3ad8c8b336

branches/auto/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/auto/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),