From 50a138a5ab92537d19e50a3696717331ae62c4ed Mon Sep 17 00:00:00 2001
From: Saulo Silva <pensador1982@yahoo.ca>
Date: Mon, 18 Sep 2017 22:56:49 -0400
Subject: [PATCH 1/2] Document `--dump-default-config` in README.md
Fixes #317.
---
README.md | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/README.md b/README.md
index 1fc7275dd96..c854dc4e21b 100644
--- a/README.md
+++ b/README.md
@@ -208,7 +208,8 @@ options covering different styles. File an issue, or even better, submit a PR.
```
* When you run rustfmt, place a file named `rustfmt.toml` or `.rustfmt.toml` in
target file directory or its parents to override the default settings of
- rustfmt.
+ rustfmt. You can generate a file containing the default configuration with
+ `rustfm --dump-default-config rustfmt.toml` and customize as needed.
* After successful compilation, a `rustfmt` executable can be found in the
target directory.
* If you're having issues compiling Rustfmt (or compile errors when trying to
From f00c556263d66ee49a933b006188176153c6aa6a Mon Sep 17 00:00:00 2001
From: Tamir Duberstein <tamird@gmail.com>
Date: Sat, 14 Oct 2017 08:08:52 -0400
Subject: [PATCH 2/2] correct --dump-default-config usage string
---
src/bin/rustfmt.rs | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/src/bin/rustfmt.rs b/src/bin/rustfmt.rs
index d1c04de8323..40ee8e70e94 100644
--- a/src/bin/rustfmt.rs
+++ b/src/bin/rustfmt.rs
@@ -128,8 +128,7 @@ fn make_opts() -> Options {
opts.opt(
"",
"dump-default-config",
- "Dumps the default configuration to a file and exits. PATH defaults to rustfmt.toml if \
- omitted.",
+ "Dumps default configuration to PATH. PATH defaults to stdout, if omitted."
"PATH",
HasArg::Maybe,
Occur::Optional,