Commit Graph

2181 Commits

Author SHA1 Message Date
Seiichi Uchida 1b1eccc553 Fix build failure (#2699) 2018-05-12 10:36:34 +09:00
Nick Cameron eca7796fb1 Replace --dump-minimal-config and --dump-default-config with --print-config
cc #1976
2018-05-11 20:43:08 +12:00
Nick Cameron 4d9de48e06 Add --check flag.
cc #1976
2018-05-11 20:26:00 +12:00
Nick Cameron 798bffb8b1 --help options
cc #1976
2018-05-11 20:12:16 +12:00
Nick Cameron 1869888b1a Remove --verbose-diff
Use `--verbose` instead

cc #1976
2018-05-11 13:58:34 +12:00
Nick Cameron 55ac062da0 Add --quiet flag, remove Plain write mode
cc #1976
2018-05-11 13:50:30 +12:00
Nick Cameron 5dba81bbbf Merge pull request #2687 from Marwes/issue_2641
fix: Don't insert an extra brace in macros with native newlines
2018-05-09 13:18:27 +12:00
Nick Cameron 659d0c9741 Merge pull request #2684 from topecongiro/issue-2175
Apply small parent heuristic only when the chain is at the beginning of the line
2018-05-09 13:16:26 +12:00
Alex Crichton 47742807f7 Ensure tests pass on the beta compiler
Also add a travis matrix entry for emulating the beta tests
2018-05-08 18:05:08 -07:00
Markus Westerlind 4c9ef93df7 fix: Don't insert an extra brace in macros with native newlines
Due to `format_snippet` formatting the input with \r\n the subtraction
would wouldn't give a length that removed the }

Fixes #2641
2018-05-08 20:34:44 +02:00
Alex Crichton a72be170d7 Fix rustfmt tests in the Rust repo
Two tests were executing `cargo run` but `cargo` is not ambiently available to
execute. Instead it's best to execute the rustfmt binary directly, which is
always assembled as part of `cargo test`.
2018-05-08 07:32:00 -07:00
topecongiro bd25c7d0f7 Cargo fmt 2018-05-08 06:25:48 +09:00
topecongiro 0ec311ee07 Apply small parent rule only when there is small offset 2018-05-08 06:25:06 +09:00
Nick Cameron f46f4b5f66 Merge pull request #2675 from flodiebold/non-modrs-mods
Fix handling of modules in non_modrs_mods style
2018-05-07 11:23:14 +12:00
Nick Cameron bd7ae5e89b Merge pull request #2682 from topecongiro/issue-2670
Do not duplicate attributes on use items
2018-05-07 11:21:02 +12:00
Nick Cameron 4bbd5c4ae5 Merge pull request #2681 from topecongiro/issue-2680
Error on self_tests when there are lines that exceed max width
2018-05-07 11:20:33 +12:00
Florian Diebold e65aa302d3 Turn the nonmodrs-mods test into a standard idempotence test
We need to skip children on foo.rs, since the parser will not find bar from that
file, but with that, the test works fine.
2018-05-06 13:08:43 +02:00
topecongiro e59ceaf954 Do not duplicate attributes on use items 2018-05-06 17:01:14 +09:00
Florian Diebold 215baae223 Add a test for non-mod.rs mods 2018-05-06 09:58:03 +02:00
Florian Diebold cf573e8157 Fix handling of modules in non_modrs_mods style
We need to keep track of the module relative to which we're resolving paths,
instead of always passing None.

Fixes #2673.
2018-05-06 09:58:03 +02:00
topecongiro 51c07f4335 Fix up lines exceeding max width 2018-05-06 16:17:09 +09:00
topecongiro 5f05987211 Use rustfmt.toml when running self_tests 2018-05-06 16:16:58 +09:00
topecongiro 1f738ea208 Cargo fmt 2018-05-06 15:22:29 +09:00
topecongiro f8439ce8fe Put operands on its own line when each fits in a single line 2018-05-06 15:22:17 +09:00
topecongiro f885039e6c Do not overflow a long item
Take the first line's width of a single item into account when
trying to overflow something.

Closes #2676.
2018-05-06 12:12:16 +09:00
Nick Cameron 17b04f181d Merge pull request #2677 from csmoe/remove_nested_parens_opt
Add remove nested parens option
2018-05-06 14:01:17 +12:00
Nick Cameron 0cc4a8d848 Update rustc_ap_syntax 2018-05-06 09:57:26 +12:00
Nick Cameron 0f8029f251 Use a different env var for the test directory 2018-05-06 08:23:26 +12:00
csmoe 7c246344f8 remove nested parens option 2018-05-05 23:13:49 +08:00
Nick Cameron 4a57e79469 Merge pull request #2667 from tspiteri/width-heuristics
Do not scale WidthHeuristics when max_width less than 100
2018-05-04 11:46:28 +12:00
Nick Cameron b6cd17f28a Fix test bug (again) 2018-05-04 09:35:56 +12:00
Nick Cameron a06caf6b17 Merge pull request #2671 from csmoe/merge_mix
Make imports_layout = "Mixed" addressed
2018-05-03 20:08:16 +12:00
csmoe 8c8676cd30 fix merge_mix 2018-05-03 10:26:53 +08:00
Nick Cameron 4a4916920f Make test temp files in the Cargo target directory, if known 2018-05-03 11:14:01 +12:00
Trevor Spiteri 48df8f8dc0 Add test for width heuristics 2018-05-02 11:38:23 +02:00
Trevor Spiteri 9b36156020 Do not scale WidthHeuristics when max_width less than 100 2018-05-02 10:38:02 +02:00
Nick Cameron 36c49d703a Merge pull request #2666 from topecongiro/issue-2634
Avoid flip-flopping impl items when reordering them
2018-05-02 10:28:46 +12:00
Nick Cameron c3bdd3aa90 Merge pull request #2665 from topecongiro/issue-2647
Use correct one line width for list attribute
2018-05-02 10:26:49 +12:00
Nick Cameron d8982e5efe Suppress warning about unused attribute 2018-05-02 10:18:14 +12:00
topecongiro 43df7dcb0e Run cargo fmt with reorder_impl_items set to true 2018-04-30 16:24:01 +09:00
topecongiro 37c216c50f Use bytepos to compare impl items 2018-04-30 16:19:52 +09:00
topecongiro 48e193c7f6 Factor out visit_impl_items 2018-04-30 16:13:51 +09:00
topecongiro 61a401ae51 Use correct one line width for list attribute
Closes #2647.
2018-04-30 15:49:32 +09:00
Nick Cameron e554d8617d Merge branch 'master' into imports_indent 2018-04-30 11:50:53 +12:00
Nick Cameron 1b7195695a Merge pull request #2663 from csmoe/config_curr
set stdin default config path to current dir
2018-04-30 11:20:04 +12:00
Nick Cameron ffaa6fcb0c Merge pull request #2661 from topecongiro/issue-2645
Preserve comments between attribute and use item
2018-04-30 11:10:48 +12:00
Nick Cameron af5976cf1e Merge pull request #2659 from topecongiro/issue-2652
Do not add a trailing comma on array inside macro
2018-04-30 11:07:33 +12:00
Nick Cameron dae9fb64b6 Merge pull request #2656 from topecongiro/issue-2594
Use consistent formatting for empty enum and struct
2018-04-30 11:06:33 +12:00
csmoe be3be582cc set stdin default config path to curr 2018-04-29 21:40:37 +08:00
csmoe f7415bcea2 update self format 2018-04-29 20:53:31 +08:00