Skip to content

Commit 649f943

Browse files
committed
---
yaml --- r: 63404 b: refs/heads/snap-stage3 c: e014ab9 h: refs/heads/master v: v3
1 parent 0bc3d5d commit 649f943

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
refs/heads/master: 2d28d645422c1617be58c8ca7ad9a457264ca850
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
4-
refs/heads/snap-stage3: a9012a2ad183ad96238ccf2473b731be85eb12e1
4+
refs/heads/snap-stage3: e014ab9023017ec1c1533a1fbe27288e0b53152f
55
refs/heads/try: 7b78b52e602bb3ea8174f9b2006bff3315f03ef9
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

branches/snap-stage3/src/librustc/middle/borrowck/gather_loans/gather_moves.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,8 @@ fn check_is_legal_to_move_from(bccx: @BorrowckCtxt,
105105
mc::cat_implicit_self(*) |
106106
mc::cat_copied_upvar(*) |
107107
mc::cat_deref(_, _, mc::region_ptr(*)) |
108-
mc::cat_deref(_, _, mc::gc_ptr(*)) => {
108+
mc::cat_deref(_, _, mc::gc_ptr(*)) |
109+
mc::cat_deref(_, _, mc::unsafe_ptr(*)) => {
109110
bccx.span_err(
110111
cmt0.span,
111112
fmt!("cannot move out of %s",
@@ -129,8 +130,7 @@ fn check_is_legal_to_move_from(bccx: @BorrowckCtxt,
129130
mc::cat_rvalue(*) |
130131
mc::cat_local(*) |
131132
mc::cat_arg(*) |
132-
mc::cat_self(*) |
133-
mc::cat_deref(_, _, mc::unsafe_ptr(*)) => {
133+
mc::cat_self(*) => {
134134
true
135135
}
136136

0 commit comments

Comments
 (0)