---

Cameron Zwarich · Cameron Zwarich · commit 1b264a940f8e · 2014-06-16T15:40:21.000-07:00
yaml --- r: 152591 b: refs/heads/try2 c: 480cd6f h: refs/heads/master i: 152589: 1f02e28 152587: fee0754 152583: 52fd3e4 152575: 73925e4 v: v3
diff --git a/[refs] b/[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: a924d740df600e2a71656ed477711b0f2a68c722
+refs/heads/try2: 480cd6fb9052e3db33e01c94e1193f80801b292f
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
diff --git a/branches/try2/src/librustc/middle/borrowck/check_loans.rs b/branches/try2/src/librustc/middle/borrowck/check_loans.rs
@@ -660,7 +660,7 @@ impl<'a> CheckLoanCtxt<'a> {
         if assignee_cmt.mutbl.is_mutable() {
             if check_for_aliasable_mutable_writes(self, assignment_span, assignee_cmt.clone()) {
                 if mode != euv::Init {
-                    check_for_assignment_to_restricted_or_frozen_location(
+                    check_for_assignment_to_borrowed_path(
                         self, assignment_id, assignment_span, assignee_cmt.clone());
                     mark_variable_as_used_mut(self, assignee_cmt);
                 }
@@ -796,7 +796,7 @@ impl<'a> CheckLoanCtxt<'a> {
             }
         }
 
-        fn check_for_assignment_to_restricted_or_frozen_location(
+        fn check_for_assignment_to_borrowed_path(
             this: &CheckLoanCtxt,
             assignment_id: ast::NodeId,
             assignment_span: Span,

Original file line number	Diff line number	Diff line change
`@@ -660,7 +660,7 @@ impl<'a> CheckLoanCtxt<'a> {`
`660`	`660`	`if assignee_cmt.mutbl.is_mutable() {`
`661`	`661`	`if check_for_aliasable_mutable_writes(self, assignment_span, assignee_cmt.clone()) {`
`662`	`662`	`if mode != euv::Init {`
`663`		`- check_for_assignment_to_restricted_or_frozen_location(`
	`663`	`+ check_for_assignment_to_borrowed_path(`
`664`	`664`	`self, assignment_id, assignment_span, assignee_cmt.clone());`
`665`	`665`	`mark_variable_as_used_mut(self, assignee_cmt);`
`666`	`666`	`}`
`@@ -796,7 +796,7 @@ impl<'a> CheckLoanCtxt<'a> {`
`796`	`796`	`}`
`797`	`797`	`}`
`798`	`798`
`799`		`- fn check_for_assignment_to_restricted_or_frozen_location(`
	`799`	`+ fn check_for_assignment_to_borrowed_path(`
`800`	`800`	`this: &CheckLoanCtxt,`
`801`	`801`	`assignment_id: ast::NodeId,`
`802`	`802`	`assignment_span: Span,`