about summary refs log tree commit diff
diff options
context:
space:
mode:
authorGraydon Hoare <graydon@mozilla.com>2012-09-18 16:41:51 -0700
committerGraydon Hoare <graydon@mozilla.com>2012-09-18 16:41:51 -0700
commite86e8c16e6b10d2b58577d10e713149f7f8a97fa (patch)
treea571f1d917526e2dc34583053b8f1b02b14bea93
parent9b58369f6ba8e01f1965e8aa39e8c7fc25f861cc (diff)
downloadrust-e86e8c16e6b10d2b58577d10e713149f7f8a97fa.tar.gz
rust-e86e8c16e6b10d2b58577d10e713149f7f8a97fa.zip
Revert "change relative priority of auto-slice and auto-ptr"
This reverts commit 2ac64d91ac9df242c780d162863c8c0abce448b1.
-rw-r--r--src/rustc/middle/typeck/check/method.rs4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/rustc/middle/typeck/check/method.rs b/src/rustc/middle/typeck/check/method.rs
index 8486b9de02b..8eb8f06a3ef 100644
--- a/src/rustc/middle/typeck/check/method.rs
+++ b/src/rustc/middle/typeck/check/method.rs
@@ -527,12 +527,12 @@ impl LookupContext {
          * Attempts both auto-slice and auto-ptr, as appropriate.
          */
 
-        match self.search_for_autoptrd_method(self_ty, autoderefs) {
+        match self.search_for_autosliced_method(self_ty, autoderefs) {
             Some(move mme) => { return Some(move mme); }
             None => {}
         }
 
-        match self.search_for_autosliced_method(self_ty, autoderefs) {
+        match self.search_for_autoptrd_method(self_ty, autoderefs) {
             Some(move mme) => { return Some(move mme); }
             None => {}
         }