Merge pull request #2303 from topecongiro/issue-2296

[rust.git] / README.md

diff --git a/README.md b/README.md
index 8416a654829b556fdff5888029bf69bd480de5bd..6604725ba76cf6d7430cadf0731a4002c3b4a43e 100644 (file)
--- a/README.md
+++ b/README.md
@@ -162,7 +162,7 @@ language: rust
 cache: cargo
 before_script:
 - export PATH="$PATH:$HOME/.cargo/bin"
-- which rustfmt || cargo install rustfmt
+- which rustfmt || cargo install rustfmt-nightly
 script:
 - cargo fmt -- --write-mode=diff
 - cargo build
@@ -193,6 +193,10 @@ By default, Rustfmt uses a style which conforms to the [Rust style guide][style
 guide] that has been formalized through the [style RFC
 process][fmt rfcs].
 
+Configuration options are either stable or unstable. Stable options can always
+be used, while unstable ones are only available on a nightly toolchain, and opt-in.
+See [Configurations.md](Configurations.md) for details.
+
 
 ## Tips