---

yaml
---
r: 152587
b: refs/heads/try2
c: 702ef1b
h: refs/heads/master
i:
  152585: 1ca2554
  152583: 52fd3e4
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: ba203c5c5de5af9941dc5be4b7c200db69b3c4d4
+refs/heads/try2: 702ef1b7215e310a0c5e2e761bef922f36dd5f65
 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

@@ -684,11 +684,9 @@ impl<'a> CheckLoanCtxt<'a> {
         // and aliasing restrictions:
         if assignee_cmt.mutbl.is_mutable() {
             if check_for_aliasable_mutable_writes(self, assignment_span, assignee_cmt.clone()) {
-                if mode != euv::Init &&
+                if mode != euv::Init {
                     check_for_assignment_to_restricted_or_frozen_location(
-                        self, assignment_id, assignment_span, assignee_cmt.clone())
-                {
-                    // Safe, but record for lint pass later:
+                        self, assignment_id, assignment_span, assignee_cmt.clone());
                     mark_variable_as_used_mut(self, assignee_cmt);
                 }
             }