---

bstrie · bstrie · commit f353bf75cb3e · 2013-01-30T23:16:56.000-05:00
yaml --- r: 52705 b: refs/heads/dist-snap c: 097c8ae h: refs/heads/master i: 52703: 3e0efd7 v: v3
diff --git a/[refs] b/[refs]
@@ -7,7 +7,7 @@ refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c
 refs/heads/incoming: 44d4d6de762f3f9aae1fedcf454c66b79b3ad58d
-refs/heads/dist-snap: a8ff91a630880fabc047d3d3d9383da2a9d59378
+refs/heads/dist-snap: 097c8aefea1feca5c3f5ff93025e9477cc6fbb0e
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
 refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0
diff --git a/branches/dist-snap/src/test/compile-fail/assign-super.rs b/branches/dist-snap/src/test/compile-fail/assign-super.rs
@@ -9,7 +9,7 @@
 // except according to those terms.
 
 fn main() {
-    let mut x: ~[mut int] = ~[3];
+    let mut x: ~[int] = ~[3];
     let y: ~[int] = ~[3];
     x = y; //~ ERROR values differ in mutability
 }
diff --git a/branches/dist-snap/src/test/compile-fail/issue-3243.rs b/branches/dist-snap/src/test/compile-fail/issue-3243.rs
@@ -10,7 +10,7 @@
 
 // xfail-test
 fn function() -> &[mut int] {
-    let mut x: &static/[mut int] = &[1,2,3];
+    let mut x: &static/[int] = &[1,2,3];
     x[0] = 12345;
     x //~ ERROR bad
 }

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@`
`9`	`9`	`// except according to those terms.`
`10`	`10`
`11`	`11`	`fn main() {`
`12`		`- let mut x: ~[mut int] = ~[3];`
	`12`	`+ let mut x: ~[int] = ~[3];`
`13`	`13`	`let y: ~[int] = ~[3];`
`14`	`14`	`x = y; //~ ERROR values differ in mutability`
`15`	`15`	`}`