---

ILyoan · ILyoan · commit de608c19da9f · 2013-05-08T13:36:20.000+09:00
yaml --- r: 60083 b: refs/heads/master c: 1813ab5 h: refs/heads/master i: 60081: b0f740a 60079: 94c874d v: v3
diff --git a/[refs] b/[refs]
@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 5a1afaf5810048e8c0c6e5160cf0bf8c323113cf
+refs/heads/master: 1813ab594da579bf20ba84664c3aaea30445a928
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 2d28d645422c1617be58c8ca7ad9a457264ca850
 refs/heads/try: c50a9d5b664478e533ba1d1d353213d70c8ad589
diff --git a/trunk/src/test/run-pass/borrowck-scope-of-deref-issue-4666.rs b/trunk/src/test/run-pass/borrowck-scope-of-deref-issue-4666.rs
diff --git a/trunk/src/test/run-pass/traits-default-method-self.rs b/trunk/src/test/run-pass/traits-default-method-self.rs
@@ -10,16 +10,16 @@
 
 //xfail-test
 
-// Currently failing with an ICE in trans.  (FIXME: #2794)
+// Currently failing with an ICE in trans.  (FIXME: #4350)
 
 trait Cat {
-    fn meow() -> bool;
-    fn scratch() -> bool { self.purr() }
-    fn purr() -> bool { true }
+    fn meow(&self) -> bool;
+    fn scratch(&self) -> bool { self.purr() }
+    fn purr(&self) -> bool { true }
 }
 
 impl Cat for int {
-    fn meow() -> bool {
+    fn meow(&self) -> bool {
         self.scratch()
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -10,16 +10,16 @@`
`10`	`10`
`11`	`11`	`//xfail-test`
`12`	`12`
`13`		`-// Currently failing with an ICE in trans. (FIXME: #2794)`
	`13`	`+// Currently failing with an ICE in trans. (FIXME: #4350)`
`14`	`14`
`15`	`15`	`trait Cat {`
`16`		`- fn meow() -> bool;`
`17`		`- fn scratch() -> bool { self.purr() }`
`18`		`- fn purr() -> bool { true }`
	`16`	`+ fn meow(&self) -> bool;`
	`17`	`+ fn scratch(&self) -> bool { self.purr() }`
	`18`	`+ fn purr(&self) -> bool { true }`
`19`	`19`	`}`
`20`	`20`
`21`	`21`	`impl Cat for int {`
`22`		`- fn meow() -> bool {`
	`22`	`+ fn meow(&self) -> bool {`
`23`	`23`	`self.scratch()`
`24`	`24`	`}`
`25`	`25`	`}`