---

yaml
---
r: 32637
b: refs/heads/dist-snap
c: 2469cba
h: refs/heads/master
i:
  32635: 4a8d46d
v: v3

Author: nikomatsakis

[refs]

@@ -7,6 +7,6 @@ refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: d0c6ce338884ee21843f4b40bf6bf18d222ce5df
 refs/heads/incoming: d9317a174e434d4c99fc1a37fd7dc0d2f5328d37
-refs/heads/dist-snap: 527a6f60f14c6f38b524cfd5119c670aa0f9bef9
+refs/heads/dist-snap: 2469cba0b17b24d37c7bc4833c56ce027b8c1632
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/dist-snap/src/rustc/middle/typeck/check/method.rs

@@ -168,8 +168,8 @@ impl LookupContext {
                     // around newtype enums.  They can be further
                     // deref'd, but they may also have intrinsic
                     // methods hanging off of them with interior type.
-                    match self.search_for_appr_autorefd_method(self_ty,
-                                                               autoderefs) {
+                    match self.search_for_any_autorefd_method(self_ty,
+                                                              autoderefs) {
                         Some(move mme) => { return Some(mme); }
                         None => {}
                     }
@@ -186,7 +186,7 @@ impl LookupContext {
             }
         }
 
-        self.search_for_appr_autorefd_method(self_ty, autoderefs)
+        self.search_for_any_autorefd_method(self_ty, autoderefs)
     }
 
     fn deref(ty: ty::t, enum_dids: &DVec<ast::def_id>) -> Option<ty::t> {
@@ -527,15 +527,13 @@ impl LookupContext {
          * Attempts both auto-slice and auto-ptr, as appropriate.
          */
 
-        let tcx = self.tcx();
-
         match self.search_for_autosliced_method(self_ty, autoderefs) {
-            Some(mme) => { return mme; }
+            Some(move mme) => { return Some(move mme); }
             None => {}
         }
 
         match self.search_for_autoptrd_method(self_ty, autoderefs) {
-            Some(mme) => { return mme; }
+            Some(move mme) => { return Some(move mme); }
             None => {}
         }
 
@@ -553,6 +551,7 @@ impl LookupContext {
          * Searches for a candidate by converting things like
          * `~[]` to `&[]`. */
 
+        let tcx = self.tcx();
         match ty::get(self_ty).sty {
             ty_evec(mt, vstore_box) |
             ty_evec(mt, vstore_uniq) |
@@ -593,6 +592,7 @@ impl LookupContext {
          * appropriate mutability.
          */
 
+        let tcx = self.tcx();
         match ty::get(self_ty).sty {
             ty_box(*) | ty_uniq(*) | ty_rptr(*) => {
                 // we should be fully autoderef'd

branches/dist-snap/src/test/run-pass/auto-ref-sliceable.rs

@@ -0,0 +1,16 @@
+trait Pushable<T> {
+    fn push_val(&mut self, +t: T);
+}
+
+impl<T> ~[T]: Pushable<T> {
+    fn push_val(&mut self, +t: T) {
+        vec::push(*self, t);
+    }
+}
+
+fn main() {
+    let mut v = ~[1];
+    v.push_val(2);
+    v.push_val(3);
+    assert v == ~[1, 2, 3];
+}