---

jbclements · jbclements · commit 224aef9fac65 · 2014-07-08T16:28:23.000-07:00
yaml --- r: 123693 b: refs/heads/try c: 4c312b6 h: refs/heads/master i: 123691: a4ecf19 v: v3
diff --git a/[refs] b/[refs]
@@ -2,7 +2,7 @@
 refs/heads/master: da4e4e4e0a7778a85748aa4a303b13f603e96b4b
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 8ddd286ea4ba4384a0dc9eae393ed515460a986e
-refs/heads/try: 19e718b34def6c3f98372a40352ab9c889ff9f7a
+refs/heads/try: 4c312b6d0ddc4de7e00176d5099dad299473aabd
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c
diff --git a/branches/try/src/test/run-pass/issue-7911.rs b/branches/try/src/test/run-pass/issue-7911.rs
@@ -27,19 +27,19 @@ trait Test {
     fn get_mut<'r>(&'r mut self) -> &'r mut FooBar;
 }
 
-macro_rules! generate_test(($type_:path, $field:expr) => (
+macro_rules! generate_test(($type_:path, $slf:ident, $field:expr) => (
     impl Test for $type_ {
-        fn get_immut<'r>(&'r self) -> &'r FooBar {
+        fn get_immut<'r>(&'r $slf) -> &'r FooBar {
             &$field as &FooBar
         }
 
-        fn get_mut<'r>(&'r mut self) -> &'r mut FooBar {
+        fn get_mut<'r>(&'r mut $slf) -> &'r mut FooBar {
             &mut $field as &mut FooBar
         }
     }
 ))
 
-generate_test!(Foo, self.bar)
+generate_test!(Foo, self, self.bar)
 
 pub fn main() {
     let mut foo: Foo = Foo { bar: Bar(42) };

Original file line number	Diff line number	Diff line change
`@@ -27,19 +27,19 @@ trait Test {`
`27`	`27`	`fn get_mut<'r>(&'r mut self) -> &'r mut FooBar;`
`28`	`28`	`}`
`29`	`29`
`30`		`-macro_rules! generate_test(($type_:path, $field:expr) => (`
	`30`	`+macro_rules! generate_test(($type_:path, $slf:ident, $field:expr) => (`
`31`	`31`	`impl Test for $type_ {`
`32`		`- fn get_immut<'r>(&'r self) -> &'r FooBar {`
	`32`	`+ fn get_immut<'r>(&'r $slf) -> &'r FooBar {`
`33`	`33`	`&$field as &FooBar`
`34`	`34`	`}`
`35`	`35`
`36`		`- fn get_mut<'r>(&'r mut self) -> &'r mut FooBar {`
	`36`	`+ fn get_mut<'r>(&'r mut $slf) -> &'r mut FooBar {`
`37`	`37`	`&mut $field as &mut FooBar`
`38`	`38`	`}`
`39`	`39`	`}`
`40`	`40`	`))`
`41`	`41`
`42`		`-generate_test!(Foo, self.bar)`
	`42`	`+generate_test!(Foo, self, self.bar)`
`43`	`43`
`44`	`44`	`pub fn main() {`
`45`	`45`	`let mut foo: Foo = Foo { bar: Bar(42) };`