---

pcwalton · pcwalton · commit d669d064b902 · 2013-03-22T12:57:27.000-07:00
yaml --- r: 139199 b: refs/heads/try2 c: ec59ce5 h: refs/heads/master i: 139197: 0757b87 139195: 3c251d6 139191: 2859dff 139183: f0ab690 139167: 53d076a 139135: 29033cc v: v3
diff --git a/[refs] b/[refs]
@@ -5,7 +5,7 @@ refs/heads/snap-stage3: 78a7676898d9f80ab540c6df5d4c9ce35bb50463
 refs/heads/try: 519addf6277dbafccbb4159db4b710c37eaa2ec5
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
-refs/heads/try2: c1084091d4e5472fac7e158b11120bad6ff210ff
+refs/heads/try2: ec59ce5796723ff62c071f7b36577175c6001791
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
diff --git a/branches/try2/src/test/compile-fail/issue-3969.rs b/branches/try2/src/test/compile-fail/issue-3969.rs
@@ -17,7 +17,7 @@ trait BikeMethods {
 }
 
 impl BikeMethods for Bike {
-    fn woops(&const self) -> ~str { ~"foo" }
+    fn woops() -> ~str { ~"foo" }
     //~^ ERROR method `woops` is declared as static in its impl, but not in its trait
 }
 

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ trait BikeMethods {`
`17`	`17`	`}`
`18`	`18`
`19`	`19`	`impl BikeMethods for Bike {`
`20`		`- fn woops(&const self) -> ~str { ~"foo" }`
	`20`	`+ fn woops() -> ~str { ~"foo" }`
`21`	`21`	//~^ ERROR method `woops` is declared as static in its impl, but not in its trait
`22`	`22`	`}`
`23`	`23`