---

graydon · graydon · commit 533ba5eb883c · 2012-09-18T16:41:51.000-07:00
yaml --- r: 28579 b: refs/heads/try c: e86e8c1 h: refs/heads/master i: 28577: f0dd973 28575: 8f9db01 v: v3
diff --git a/[refs] b/[refs]
@@ -2,7 +2,7 @@
 refs/heads/master: cd6f24f9d14ac90d167386a56e7a6ac1f0318195
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: cd6f24f9d14ac90d167386a56e7a6ac1f0318195
-refs/heads/try: 9b58369f6ba8e01f1965e8aa39e8c7fc25f861cc
+refs/heads/try: e86e8c16e6b10d2b58577d10e713149f7f8a97fa
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: d0c6ce338884ee21843f4b40bf6bf18d222ce5df
diff --git a/branches/try/src/rustc/middle/typeck/check/method.rs b/branches/try/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 => {}
         }

Original file line number	Diff line number	Diff line change
`@@ -527,12 +527,12 @@ impl LookupContext {`
`527`	`527`	`* Attempts both auto-slice and auto-ptr, as appropriate.`
`528`	`528`	`*/`
`529`	`529`
`530`		`- match self.search_for_autoptrd_method(self_ty, autoderefs) {`
	`530`	`+ match self.search_for_autosliced_method(self_ty, autoderefs) {`
`531`	`531`	`Some(move mme) => { return Some(move mme); }`
`532`	`532`	`None => {}`
`533`	`533`	`}`
`534`	`534`
`535`		`- match self.search_for_autosliced_method(self_ty, autoderefs) {`
	`535`	`+ match self.search_for_autoptrd_method(self_ty, autoderefs) {`
`536`	`536`	`Some(move mme) => { return Some(move mme); }`
`537`	`537`	`None => {}`
`538`	`538`	`}`