---

XuefengWu · XuefengWu · commit aa822bdf3061 · 2015-05-16T21:39:48.000+08:00
yaml --- r: 210883 b: refs/heads/try c: 7fe60c1 h: refs/heads/master i: 210881: 0ed42f8 210879: f0572be v: v3
diff --git a/[refs] b/[refs]
@@ -2,7 +2,7 @@
 refs/heads/master: 3e561f05c00cd180ec02db4ccab2840a4aba93d2
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: ba0e1cd8147d452c356aacb29fb87568ca26f111
-refs/heads/try: 574a8cd8cc65f9a32051d475cfe1ac6be28a1cdd
+refs/heads/try: 7fe60c16362a0c07c1305d9b4ee9ba1288482138
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
diff --git a/branches/try/src/test/compile-fail/issue-12796.rs b/branches/try/src/test/compile-fail/issue-12796.rs
@@ -12,7 +12,7 @@ trait Trait {
     fn outer(self) {
         fn inner(_: Self) {
             //~^ ERROR can't use type parameters from outer function
-            //~^^ ERROR use of undeclared type name `Self`
+            //~^^ ERROR use of `Self` outside of an impl or trait
         }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ trait Trait {`
`12`	`12`	`fn outer(self) {`
`13`	`13`	`fn inner(_: Self) {`
`14`	`14`	`//~^ ERROR can't use type parameters from outer function`
`15`		- //~^^ ERROR use of undeclared type name `Self`
	`15`	+ //~^^ ERROR use of `Self` outside of an impl or trait
`16`	`16`	`}`
`17`	`17`	`}`
`18`	`18`	`}`