---

jbclements · jbclements · commit 055df8fc129d · 2014-07-08T16:28:23.000-07:00
yaml --- r: 123438 b: refs/heads/auto c: 4c312b6 h: refs/heads/master v: v3
diff --git a/[refs] b/[refs]
@@ -13,7 +13,7 @@ refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0
 refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
 refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
 refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
-refs/heads/auto: 19e718b34def6c3f98372a40352ab9c889ff9f7a
+refs/heads/auto: 4c312b6d0ddc4de7e00176d5099dad299473aabd
 refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167
 refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c
 refs/tags/0.1: b19db808c2793fe2976759b85a355c3ad8c8b336
diff --git a/branches/auto/src/test/run-pass/issue-7911.rs b/branches/auto/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) };`