---

nikomatsakis · nikomatsakis · commit f2d46c510e30 · 2015-01-03T07:01:21.000-05:00
yaml --- r: 167855 b: refs/heads/master c: cbeff8b h: refs/heads/master i: 167853: ca394b6 167851: 69dad69 167847: 559432f 167839: ba12064 v: v3
diff --git a/[refs] b/[refs]
@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 09a7bc55dbd2bd4e05253b2bd72e5ecfb5cf7dd2
+refs/heads/master: cbeff8b8b3bd28e99a3a034a41c8bdcd830fa884
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: c89417130f042c58adc60012e7cddc4ef70b70b9
 refs/heads/try: 5204084bd2e46af7cc6e0147430e44dd0d657bbb
diff --git a/trunk/src/test/compile-fail/borrowck-closures-mut-of-imm.rs b/trunk/src/test/compile-fail/borrowck-closures-mut-of-imm.rs
@@ -24,6 +24,7 @@ fn a(x: &int) {
     //~^ ERROR cannot borrow
     let c2 = || set(&mut *x);
     //~^ ERROR cannot borrow
+    //~| ERROR closure requires unique access
 }
 
 fn main() {
diff --git a/trunk/src/test/compile-fail/issue-17551.rs b/trunk/src/test/compile-fail/issue-17551.rs
@@ -13,6 +13,6 @@
 struct B<T>;
 
 fn main() {
-    let foo = B; //~ ERROR unable to infer enough type information
-    let closure = |:| foo;
+    let foo = B;
+    let closure = |:| foo; //~ ERROR unable to infer enough type information
 }

Original file line number	Diff line number	Diff line change
`@@ -24,6 +24,7 @@ fn a(x: &int) {`
`24`	`24`	`//~^ ERROR cannot borrow`
`25`	`25`	`let c2 = \|\| set(&mut *x);`
`26`	`26`	`//~^ ERROR cannot borrow`
	`27`	`+ //~\| ERROR closure requires unique access`
`27`	`28`	`}`
`28`	`29`
`29`	`30`	`fn main() {`
Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,6 @@`
`13`	`13`	`struct B<T>;`
`14`	`14`
`15`	`15`	`fn main() {`
`16`		`- let foo = B; //~ ERROR unable to infer enough type information`
`17`		`- let closure = \|:\| foo;`
	`16`	`+ let foo = B;`
	`17`	`+ let closure = \|:\| foo; //~ ERROR unable to infer enough type information`
`18`	`18`	`}`