rollup merge of #18526 : mprobinson/vector-error-msg

alexcrichton · alexcrichton · commit 6f00bee168e8 · 2014-11-03T08:31:46.000-08:00
diff --git a/src/librustc/middle/typeck/astconv.rs b/src/librustc/middle/typeck/astconv.rs
@@ -998,14 +998,14 @@ pub fn ast_ty_to_ty<'tcx, AC: AstConv<'tcx>, RS: RegionScope>(
                                            Some(i as uint)),
                             _ => {
                                 tcx.sess.span_fatal(
-                                    ast_ty.span, "expected constant expr for vector length");
+                                    ast_ty.span, "expected constant expr for array length");
                             }
                         }
                     }
                     Err(ref r) => {
                         tcx.sess.span_fatal(
                             ast_ty.span,
-                            format!("expected constant expr for vector \
+                            format!("expected constant expr for array \
                                      length: {}",
                                     *r).as_slice());
                     }

Original file line number	Diff line number	Diff line change
`@@ -998,14 +998,14 @@ pub fn ast_ty_to_ty<'tcx, AC: AstConv<'tcx>, RS: RegionScope>(`
`998`	`998`	`Some(i as uint)),`
`999`	`999`	`_ => {`
`1000`	`1000`	`tcx.sess.span_fatal(`
`1001`		`- ast_ty.span, "expected constant expr for vector length");`
	`1001`	`+ ast_ty.span, "expected constant expr for array length");`
`1002`	`1002`	`}`
`1003`	`1003`	`}`
`1004`	`1004`	`}`
`1005`	`1005`	`Err(ref r) => {`
`1006`	`1006`	`tcx.sess.span_fatal(`
`1007`	`1007`	`ast_ty.span,`
`1008`		`- format!("expected constant expr for vector \`
	`1008`	`+ format!("expected constant expr for array \`
`1009`	`1009`	`length: {}",`
`1010`	`1010`	`*r).as_slice());`
`1011`	`1011`	`}`