diff --git a/src/filemap.rs b/src/filemap.rs
index 507e85f2086..f64e428c221 100644
--- a/src/filemap.rs
+++ b/src/filemap.rs
@@ -8,8 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// TODO: add tests
-
 use std::fs;
 use std::io::{self, Write};
 
diff --git a/src/format-diff/main.rs b/src/format-diff/main.rs
index fe528a6c0ea..37ad4f35a1d 100644
--- a/src/format-diff/main.rs
+++ b/src/format-diff/main.rs
@@ -175,7 +175,7 @@ fn scan_diff<R>(
             None => continue,
         };
 
-        // TODO(emilio): We could avoid this most of the time if needed, but
+        // FIXME(emilio): We could avoid this most of the time if needed, but
         // it's not clear it's worth it.
         if !file_filter.is_match(file) {
             continue;
diff --git a/src/items.rs b/src/items.rs
index 843d5839de9..507ea09a8fe 100644
--- a/src/items.rs
+++ b/src/items.rs
@@ -125,8 +125,8 @@ fn rewrite(&self, context: &RewriteContext, shape: Shape) -> Option<String> {
     }
 }
 
-// TODO convert to using rewrite style rather than visitor
-// TODO format modules in this style
+// FIXME convert to using rewrite style rather than visitor
+// FIXME format modules in this style
 #[allow(dead_code)]
 struct Item<'a> {
     keyword: &'static str,
diff --git a/src/lists.rs b/src/lists.rs
index 97dd093b4f9..3b49a27ccef 100644
--- a/src/lists.rs
+++ b/src/lists.rs
@@ -212,7 +212,6 @@ pub fn definitive_tactic<I, T>(
 }
 
 // Format a list of commented items into a string.
-// TODO: add unit tests
 pub fn write_list<I, T>(items: I, formatting: &ListFormatting) -> Option<String>
 where
     I: IntoIterator<Item = T> + Clone,
diff --git a/src/macros.rs b/src/macros.rs
index 801e04baad0..512c3ac1c56 100644
--- a/src/macros.rs
+++ b/src/macros.rs
@@ -192,7 +192,6 @@ pub fn rewrite_macro_inner(
         };
     }
     // Format well-known macros which cannot be parsed as a valid AST.
-    // TODO: Maybe add more macros?
     if macro_name == "lazy_static!" && !has_comment {
         if let success @ Some(..) = format_lazy_static(context, shape, &ts) {
             return success;
diff --git a/src/missed_spans.rs b/src/missed_spans.rs
index 7e558d308b7..70d4c66d7fb 100644
--- a/src/missed_spans.rs
+++ b/src/missed_spans.rs
@@ -43,8 +43,6 @@ fn output_at_start(&self) -> bool {
         self.buffer.is_empty()
     }
 
-    // TODO these format_missing methods are ugly. Refactor and add unit tests
-    // for the central whitespace stripping loop.
     pub fn format_missing(&mut self, end: BytePos) {
         // HACK(topecongiro)
         // We use `format_missing()` to extract a missing comment between a macro
diff --git a/src/reorder.rs b/src/reorder.rs
index ecad2c25652..3d2b098781d 100644
--- a/src/reorder.rs
+++ b/src/reorder.rs
@@ -14,7 +14,7 @@
 //! order. Trait items are reordered in pre-determined order (associated types
 //! and constants comes before methods).
 
-// TODO(#2455): Reorder trait items.
+// FIXME(#2455): Reorder trait items.
 
 use config::{lists::*, Config};
 use syntax::{ast, attr, codemap::Span};
diff --git a/src/types.rs b/src/types.rs
index 44fdbee6efd..6e550594680 100644
--- a/src/types.rs
+++ b/src/types.rs
@@ -418,7 +418,7 @@ fn type_bound_colon(context: &RewriteContext) -> &'static str {
 
 impl Rewrite for ast::WherePredicate {
     fn rewrite(&self, context: &RewriteContext, shape: Shape) -> Option<String> {
-        // TODO: dead spans?
+        // FIXME: dead spans?
         let result = match *self {
             ast::WherePredicate::BoundPredicate(ast::WhereBoundPredicate {
                 ref bound_generic_params,