---

pcwalton · pcwalton · commit 8be92093efa3 · 2013-03-05T10:18:36.000-08:00
yaml --- r: 46746 b: refs/heads/auto c: c407549 h: refs/heads/master v: v3
diff --git a/[refs] b/[refs]
@@ -14,4 +14,4 @@ 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: 6d4ed5283c53d975af9ff8f1a21fbc27eac9d4c1
+refs/heads/auto: c4075492ad46a343bd99d6f258e38ed9c2320418
diff --git a/branches/auto/src/librustc/middle/typeck/astconv.rs b/branches/auto/src/librustc/middle/typeck/astconv.rs
@@ -214,7 +214,7 @@ pub fn ast_ty_to_ty<AC:AstConv, RS:region_scope + Copy + Durable>(
                 let mut mt = ast_mt_to_mt(self, rscope, mt);
                 if a_seq_ty.mutbl == ast::m_mutbl ||
                         a_seq_ty.mutbl == ast::m_const {
-                    mt = ty::mt { ty: mt.ty, mutbl: ast::m_mutbl };
+                    mt = ty::mt { ty: mt.ty, mutbl: a_seq_ty.mutbl };
                 }
                 return ty::mk_evec(tcx, mt, vst);
             }
diff --git a/branches/auto/src/test/run-pass/const-vec-syntax.rs b/branches/auto/src/test/run-pass/const-vec-syntax.rs
@@ -0,0 +1,7 @@
+fn f(_: &const [int]) {}
+
+fn main() {
+    let v = [ 1, 2, 3 ];
+    f(v);
+}
+

Original file line number	Diff line number	Diff line change
`@@ -214,7 +214,7 @@ pub fn ast_ty_to_ty<AC:AstConv, RS:region_scope + Copy + Durable>(`
`214`	`214`	`let mut mt = ast_mt_to_mt(self, rscope, mt);`
`215`	`215`	`if a_seq_ty.mutbl == ast::m_mutbl \|\|`
`216`	`216`	`a_seq_ty.mutbl == ast::m_const {`
`217`		`- mt = ty::mt { ty: mt.ty, mutbl: ast::m_mutbl };`
	`217`	`+ mt = ty::mt { ty: mt.ty, mutbl: a_seq_ty.mutbl };`
`218`	`218`	`}`
`219`	`219`	`return ty::mk_evec(tcx, mt, vst);`
`220`	`220`	`}`