---

yaml
---
r: 13640
b: refs/heads/master
c: cc323d8
h: refs/heads/master
v: v3

Author: catamorphism

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: a06398214a6e2e9a431309e198e00e0f2dfe397d
+refs/heads/master: cc323d8637c36a8762bebaedad98cc916f4fcc1f
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 4a81779abd786ff22d71434c6d9a5917ea4cdfff
 refs/heads/try: 2898dcc5d97da9427ac367542382b6239d9c0bbf

trunk/src/rustc/middle/liveness.rs

@@ -1669,7 +1669,14 @@ impl check_methods for @liveness {
                     #fmt["illegal move from field `%s`", *name]);
                 ret;
               }
-              vk_local(*) | vk_self | vk_implicit_ret {
+              vk_self {
+                self.tcx.sess.span_err(
+                    move_span,
+                    "illegal move from self (cannot move out of a field of \
+                       self)");
+                ret;
+              }
+              vk_local(*) | vk_implicit_ret {
                 self.tcx.sess.span_bug(
                     move_span,
                     #fmt["illegal reader (%?) for `%?`",

trunk/src/test/compile-fail/issue-2590.rs

@@ -0,0 +1,13 @@
+import dvec::dvec;
+
+type parser = {
+    tokens: dvec<int>,
+};
+
+impl parser for parser {
+    fn parse() -> [mut int] {
+        dvec::unwrap(self.tokens) //! ERROR illegal move from self
+    }
+}
+
+fn main() {}