---

nikomatsakis · nikomatsakis · commit 0348c1df42c6 · 2013-02-16T08:03:58.000-05:00
yaml --- r: 47726 b: refs/heads/incoming c: d3f3d07 h: refs/heads/master v: v3
diff --git a/[refs] b/[refs]
@@ -6,7 +6,7 @@ refs/heads/try: 2a8fb58d79e685d5ca07b039badcf2ae3ef077ea
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c
-refs/heads/incoming: 6c728e32c0bad69318c1c4d4413ea55ce7c5813f
+refs/heads/incoming: d3f3d0731cb1c6050b540bc5542b575dd19844fa
 refs/heads/dist-snap: 8b98e5a296d95c5e832db0756828e5bec31c6f50
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
diff --git a/branches/incoming/src/test/run-pass/regions-self-impls.rs b/branches/incoming/src/test/run-pass/regions-self-impls.rs
@@ -12,12 +12,12 @@ struct Clam<'self> {
     chowder: &'self int
 }
 
-trait get_chowder {
-    fn get_chowder() -> &self/int;
+trait get_chowder<'self> {
+    fn get_chowder() -> &'self int;
 }
 
-impl get_chowder for Clam {
-    fn get_chowder() -> &self/int { return self.chowder; }
+impl<'self> get_chowder<'self> for Clam<'self> {
+    fn get_chowder() -> &'self int { return self.chowder; }
 }
 
 pub fn main() {

Original file line number	Diff line number	Diff line change
`@@ -12,12 +12,12 @@ struct Clam<'self> {`
`12`	`12`	`chowder: &'self int`
`13`	`13`	`}`
`14`	`14`
`15`		`-trait get_chowder {`
`16`		`- fn get_chowder() -> &self/int;`
	`15`	`+trait get_chowder<'self> {`
	`16`	`+ fn get_chowder() -> &'self int;`
`17`	`17`	`}`
`18`	`18`
`19`		`-impl get_chowder for Clam {`
`20`		`- fn get_chowder() -> &self/int { return self.chowder; }`
	`19`	`+impl<'self> get_chowder<'self> for Clam<'self> {`
	`20`	`+ fn get_chowder() -> &'self int { return self.chowder; }`
`21`	`21`	`}`
`22`	`22`
`23`	`23`	`pub fn main() {`