diff --git a/rustfmt.toml b/rustfmt.toml
index 1b1f6c9c29..be811934fd 100644
--- a/rustfmt.toml
+++ b/rustfmt.toml
@@ -1,15 +1,9 @@
-# Run `rustfmt --config-help` to see available config options.
+# Get help on options with `rustfmt --help=config`
 # Please keep these in alphabetical order.
-condense_wildcard_suffixes = true
-error_on_line_overflow = false
-error_on_unformatted = false
-# Too many derives can cause line length limits to be exceeded. rustfmt-nightly
-# 0.2.5 doesn't appear to pay attention to this.
+# Prefer to keep builtin and custom derives separate
 merge_derives = false
-reorder_imported_names = true
 reorder_imports = true
-reorder_imports_in_group = true
-# Override the Nuclide/Atom default tab spacing.
+reorder_modules = true
 tab_spaces = 4
+use_field_init_shorthand = true
 use_try_shorthand = true
-write_mode = "replace"