---

yaml
---
r: 152583
b: refs/heads/try2
c: 9934759
h: refs/heads/master
i:
  152581: 886ddae
  152579: 3a009ad
  152575: 73925e4
v: v3

Author: Cameron Zwarich

[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: 6849362f383c9c21a72cea5377c28596061c6c13
+refs/heads/try2: 99347591956958ab62074a41a83b4a62587c2ee6
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try2/src/librustc/middle/borrowck/gather_loans/restrictions.rs

@@ -133,7 +133,7 @@ impl<'a> RestrictionsContext<'a> {
                             cause: self.cause,
                             cmt: cmt_base,
                             code: err_borrowed_pointer_too_short(
-                                self.loan_region, lt, restrictions)});
+                                self.loan_region, lt)});
                     return Safe;
                 }
                 Safe
@@ -148,7 +148,7 @@ impl<'a> RestrictionsContext<'a> {
                             cause: self.cause,
                             cmt: cmt_base,
                             code: err_borrowed_pointer_too_short(
-                                self.loan_region, lt, restrictions)});
+                                self.loan_region, lt)});
                     return Safe;
                 }
 

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

@@ -310,8 +310,7 @@ impl Repr for RestrictionSet {
 pub enum bckerr_code {
     err_mutbl,
     err_out_of_scope(ty::Region, ty::Region), // superscope, subscope
-    err_borrowed_pointer_too_short(
-        ty::Region, ty::Region, RestrictionSet), // loan, ptr
+    err_borrowed_pointer_too_short(ty::Region, ty::Region), // loan, ptr
 }
 
 // Combination of an error code and the categorization of the expression
@@ -711,7 +710,7 @@ impl<'a> BorrowckCtxt<'a> {
                     suggestion);
             }
 
-            err_borrowed_pointer_too_short(loan_scope, ptr_scope, _) => {
+            err_borrowed_pointer_too_short(loan_scope, ptr_scope) => {
                 let descr = match opt_loan_path(&err.cmt) {
                     Some(lp) => {
                         format!("`{}`", self.loan_path_to_str(&*lp))