---

XuefengWu · XuefengWu · commit 9c4c77d382c6 · 2015-05-16T21:39:48.000+08:00
yaml --- r: 208597 b: refs/heads/snap-stage3 c: 7fe60c1 h: refs/heads/master i: 208595: e2c0049 v: v3
diff --git a/[refs] b/[refs]
@@ -1,7 +1,7 @@
 ---
 refs/heads/master: 38a97becdf3e6a6157f6f7ec2d98ade8d8edc193
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
-refs/heads/snap-stage3: 574a8cd8cc65f9a32051d475cfe1ac6be28a1cdd
+refs/heads/snap-stage3: 7fe60c16362a0c07c1305d9b4ee9ba1288482138
 refs/heads/try: 7b4ef47b7805a402d756fb8157101f64880a522f
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
diff --git a/branches/snap-stage3/src/test/compile-fail/issue-12796.rs b/branches/snap-stage3/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`	`}`