about summary refs log tree commit diff
path: root/src
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2014-09-30 20:27:16 +0000
committerbors <bors@rust-lang.org>2014-09-30 20:27:16 +0000
commit88d1a22f76a774b2df3c904ceb54c86e58a859c3 (patch)
treebe2e11d986b83faf6367446dd45658984ab57ca3 /src
parent823f10802fc8940aeb094185cecd5958c7f23d53 (diff)
parente543878f0f0896769bf239d9ccec0bd7e368d05e (diff)
auto merge of #17479 : gamazeps/rust/issue17478, r=alexcrichton
closes #17478
Diffstat (limited to 'src')
-rw-r--r--src/etc/emacs/rust-mode-tests.el2
-rw-r--r--src/etc/kate/rust.xml2
-rw-r--r--src/etc/vim/syntax/rust.vim2
3 files changed, 3 insertions, 3 deletions
diff --git a/src/etc/emacs/rust-mode-tests.el b/src/etc/emacs/rust-mode-tests.el
index 85800a6965d..1b6794e77f9 100644
--- a/src/etc/emacs/rust-mode-tests.el
+++ b/src/etc/emacs/rust-mode-tests.el
@@ -623,7 +623,7 @@ Convert the line-column information from that list into a buffer position value.
       (move-to-column column)
       (point))))
 
-;;; TODO: Maybe add an ERT explainer function (something that shows the
+;;; FIXME: Maybe add an ERT explainer function (something that shows the
 ;;; surrounding code of the final point, not just the position).
 (defun rust-test-motion (source-code init-pos final-pos manip-func &optional &rest args)
   "Test that MANIP-FUNC moves point from INIT-POS to FINAL-POS.
diff --git a/src/etc/kate/rust.xml b/src/etc/kate/rust.xml
index 2b80c0ff39f..1c48b9d4f0c 100644
--- a/src/etc/kate/rust.xml
+++ b/src/etc/kate/rust.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE language SYSTEM "language.dtd"
 [
-	<!-- TODO: Kate's regex engine has very limited support for
+	<!-- FIXME: Kate's regex engine has very limited support for
 	predefined char classes, so making rustIdent consistent with actual
 	Rust identifiers will be a bit difficult -->
 	<!ENTITY rustIdent "[a-zA-Z_][a-zA-Z_0-9]*">
diff --git a/src/etc/vim/syntax/rust.vim b/src/etc/vim/syntax/rust.vim
index 6ee610d9714..93931246a02 100644
--- a/src/etc/vim/syntax/rust.vim
+++ b/src/etc/vim/syntax/rust.vim
@@ -216,7 +216,7 @@ syn keyword rustTodo contained TODO FIXME XXX NB NOTE
 
 " Folding rules {{{2
 " Trivial folding rules to begin with.
-" TODO: use the AST to make really good folding
+" FIXME: use the AST to make really good folding
 syn region rustFoldBraces start="{" end="}" transparent fold
 
 " Default highlighting {{{1