removed comment with default: rustfmt-normalize_comments

[rust.git] / README.md

diff --git a/README.md b/README.md
index 6dc437fd27f59a580eb0243074b5d67e2f090b8e..3d976e01f04bb722aa2d573ef3616173c5c70302 100644 (file)
--- a/README.md
+++ b/README.md
@@ -126,7 +126,7 @@ completed without error (whether or not changes were made).
 ## Checking style on a CI server
 
 To keep your code base consistently formatted, it can be helpful to fail the CI build
-when a pull request contains unformatted code. Using `--write-mode=check` instructs
+when a pull request contains unformatted code. Using `--check` instructs
 rustfmt to exit with an error code if the input is not formatted correctly.
 It will also print any found differences.
 
@@ -134,10 +134,12 @@ A minimal Travis setup could look like this (requires Rust 1.24.0 or greater):
 
 ```yaml
 language: rust
+rust:
+- nightly
 before_script:
 - rustup component add rustfmt-preview
 script:
-- cargo fmt --all -- --write-mode=check
+- cargo fmt --all -- --check
 - cargo build
 - cargo test
 ```
@@ -174,7 +176,7 @@ See [Configurations.md](Configurations.md) for details.
 * For things you do not want rustfmt to mangle, use one of
 
     ```rust
-    #[rustfmt_skip]  // requires nightly and #![feature(custom_attribute)] in crate root
+    #[rustfmt::skip]  // requires nightly Rust and #![feature(tool_attributes)] in crate root
     #[cfg_attr(rustfmt, rustfmt_skip)]  // works in stable
     ```
 * When you run rustfmt, place a file named `rustfmt.toml` or `.rustfmt.toml` in