From bcc37ff4cebce018e04604743a86fd0a9b0209d9 Mon Sep 17 00:00:00 2001 From: Ziad Hatahet Date: Sat, 14 Jul 2012 15:28:02 -0700 Subject: [PATCH 1/2] Changed `cont` to `again` in compiler error string. --- src/rustc/middle/check_loop.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/rustc/middle/check_loop.rs b/src/rustc/middle/check_loop.rs index e8e2c57a8b227..524e88fc49ec0 100644 --- a/src/rustc/middle/check_loop.rs +++ b/src/rustc/middle/check_loop.rs @@ -35,7 +35,7 @@ fn check_crate(tcx: ty::ctxt, crate: @crate) { } expr_again { if !cx.in_loop { - tcx.sess.span_err(e.span, "`cont` outside of loop"); + tcx.sess.span_err(e.span, "`again` outside of loop"); } } expr_ret(oe) { @@ -49,4 +49,4 @@ fn check_crate(tcx: ty::ctxt, crate: @crate) { } with *visit::default_visitor() })); -} \ No newline at end of file +} From b18383dbd81244e642f4f6f45b52bf326444211e Mon Sep 17 00:00:00 2001 From: Ziad Hatahet Date: Sat, 14 Jul 2012 15:28:56 -0700 Subject: [PATCH 2/2] Added `again` keyword and removed `cont` in Vim syntax file. --- src/etc/vim/syntax/rust.vim | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/etc/vim/syntax/rust.vim b/src/etc/vim/syntax/rust.vim index 02cdae07c04c7..51bff827cc7d6 100644 --- a/src/etc/vim/syntax/rust.vim +++ b/src/etc/vim/syntax/rust.vim @@ -12,8 +12,8 @@ endif syn keyword rustAssert assert syn match rustAssert "assert\(\w\)*" -syn keyword rustKeyword alt as break -syn keyword rustKeyword check claim cont const copy do drop else export extern fail +syn keyword rustKeyword again alt as break +syn keyword rustKeyword check claim const copy do drop else export extern fail syn keyword rustKeyword for if impl import in let log syn keyword rustKeyword loop mod mut new of pure syn keyword rustKeyword ret self to unchecked