Skip to content

Commit

Permalink
Rename check_for_assignment_to_restricted_or_frozen_location
Browse files Browse the repository at this point in the history
Rename check_for_assignment_to_restricted_or_frozen_location to
check_for_assignment_to_borrowed_path.
  • Loading branch information
Cameron Zwarich committed Jun 16, 2014
1 parent a924d74 commit 480cd6f
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions src/librustc/middle/borrowck/check_loans.rs
Expand Up @@ -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);
}
Expand Down Expand Up @@ -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,
Expand Down

5 comments on commit 480cd6f

@bors
Copy link
Contributor

@bors bors commented on 480cd6f Jun 17, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@bors
Copy link
Contributor

@bors bors commented on 480cd6f Jun 17, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

merging zwarich/rust/check-loans-not-restrictions = 480cd6f into auto

@bors
Copy link
Contributor

@bors bors commented on 480cd6f Jun 17, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

zwarich/rust/check-loans-not-restrictions = 480cd6f merged ok, testing candidate = 79fca99

@bors
Copy link
Contributor

@bors bors commented on 480cd6f Jun 17, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fast-forwarding master to auto = 79fca99

Please sign in to comment.