---

yaml
---
r: 152588
b: refs/heads/try2
c: 178c4fb
h: refs/heads/master
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: 702ef1b7215e310a0c5e2e761bef922f36dd5f65
+refs/heads/try2: 178c4fbccbc59fc7c554cb3cda33413d7d455366
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

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

@@ -825,14 +825,14 @@ impl<'a> CheckLoanCtxt<'a> {
             this: &CheckLoanCtxt,
             assignment_id: ast::NodeId,
             assignment_span: Span,
-            assignee_cmt: mc::cmt) -> bool
+            assignee_cmt: mc::cmt)
         {
             //! Check for assignments that violate the terms of an
             //! outstanding loan.
 
             let loan_path = match opt_loan_path(&assignee_cmt) {
                 Some(lp) => lp,
-                None => { return true; /* no loan path, can't be any loans */ }
+                None => { return; /* no loan path, can't be any loans */ }
             };
 
             // Start by searching for an assignment to a *restricted*
@@ -852,7 +852,7 @@ impl<'a> CheckLoanCtxt<'a> {
                 false
             });
 
-            if !cont { return false }
+            if !cont { return; }
 
             // The previous code handled assignments to paths that
             // have been restricted. This covers paths that have been
@@ -899,21 +899,19 @@ impl<'a> CheckLoanCtxt<'a> {
                     LpExtend(_, mc::McDeclared, _) |
                     LpExtend(_, mc::McImmutable, _) |
                     LpVar(_) => {
-                        return true;
+                        return;
                     }
                 };
 
                 // Check for a non-const loan of `loan_path`
-                let cont = this.each_in_scope_loan(assignment_id, |loan| {
+                this.each_in_scope_loan(assignment_id, |loan| {
                     if loan.loan_path == loan_path {
                         this.report_illegal_mutation(assignment_span, &*full_loan_path, loan);
                         false
                     } else {
                         true
                     }
                 });
-
-                if !cont { return false }
             }
         }
     }