mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,647 Commits 2 Branches 0 Tags
Commit Graph

158 Commits

Author SHA1 Message Date
Nick Cameron
6572874965 Update to latest Syntex 
As a side-effect of the Path changes, we are now a bit more aggressive about normalising paths.
 2017-01-20 08:20:49 +13:00
Nick Cameron
846d7ad387 make rustfmt-normalize_comments false by default 2017-01-16 14:50:27 +13:00
Nick Cameron
5349336192 Refactor if/else formatting 
Removes else_if_brace_style from config options. Use control_brace_style instead.
 2017-01-11 18:14:41 +13:00
Nick Cameron
21c085261b Remove self from use foo::bar::self; 
Also adds the `normalize_imports` config option.

Fixes #1252
 2017-01-06 17:02:56 +13:00
Wieland Hoffmann
2fc1a2d3cc Prevent an ugly linebreak in --config-helps description of condense_wildcard_suffices 2016-11-27 21:43:02 +01:00
Sébastien Santoro
0dffec8a5c Improve config::WriteMode comments 
- Fix typo
- Switch comments verbs to the the 3rd person to offer a better coherence among options
 2016-11-12 03:59:43 +00:00
Marcus Klaas
5fc9fa3770 Condense suffix strings of simple wildcards in patterns 2016-11-07 21:38:20 +01:00
Mikko Rantanen
4b1c669037 Add spaces_within_square_brackets config option. (#1191) 
* Add spaces_within_square_brackets config option.

Enabling the config enforces spaces within various array/slice brackets.

* Fixed budget-calculations for [] spacing
 2016-10-18 09:09:49 +13:00
Mikko Rantanen
636a828772 Add support for spaces_within_angle_brackets 
Enabling the config adds spaces within type arguments: <>
 2016-10-13 19:28:18 +03:00
Mikko Rantanen
7be202fa3c Add support for spaces_within_parens config (#1187) 
* Add support for spaces_within_parens config

* Changes based on review comments
 2016-10-13 14:34:08 +13:00
est31
efd3e5c091 Add three new options for spaces 2016-09-17 02:22:13 +02:00
Nathan Ridge
4b999a99c0 Add two new whitespace options (#1109) 
* An option to leave a space before the colon in a type annotation

* An option to leave a space before the colon in a trait or lifetime bound
 2016-08-03 01:11:39 -04:00
Stuart Dootson
78b52ec3e1 Add use declaration re-ordering (#1104) 
* Add config options for combinations of lines and items

* Reordering of import lines implemented.

* Changed nested matches to tuple pattern matching

* Added ordering of path list items to the ordering of use declarations

* Move `format_imports` and `format_import` methods to `imports.rs`

* Add comment to explain how `use` declarations are split off while walking through a module

* Change `ImportReordering` config option to separate boolean options
 2016-07-26 17:20:01 +12:00
Kamal Marhubi
66483017f6 Explain that FileLines cannot be given in rustfmt.toml 
This adds a note to both the `--config-help` output for `file_lines`,
and to the panic message on attempting to deserialize a `FileLines`
struct.
 2016-05-31 01:35:18 +02:00
Kamal Marhubi
c311b30cac Add type to represent collection of lines in files 
This commit adds a type to represent lines in files, and adds it to the
`Config` struct. It will be used for restricting formatting to specific
lines.

Refs #434
 2016-05-31 01:24:38 +02:00
Marcus Klaas
98c0570a28 Format non-statement if-else expressions on a single line 2016-05-29 17:58:38 +02:00
Nick Cameron
775de8a62b Optionally put short struct variants on one line (#997) 
Closes #418
 2016-05-18 22:38:49 +02:00
Srinivas Reddy Thatiparthy
952a6beb51 change normalise spelling to American version - normalize as American english is more common across programming community 2016-05-15 22:24:46 +05:30
Marcus Klaas
cd158cecc8 Add try macro to try shorthand conversion tests 2016-05-12 21:15:06 +02:00
Nick Cameron
a9c3108c9c Change defaults and update tests and source 
New defaults are `Tabbed` for `chain_indent` and `chain_base_indent`, and `5` for `closure_block_indent_threshold`.
 2016-04-22 19:18:48 +12:00
Nick Cameron
3d46532e72 refactor and document the chain reformatting code 2016-04-22 14:47:00 +12:00
Nick Cameron
4c3228530f block indent large closures 
somewhat rough around the edges
 2016-04-22 11:29:01 +12:00
Marcus Klaas
f364a7ec43 Add option to force explicit extern ABI's 2016-04-18 18:39:40 +02:00
Thia Wyrod
d773cc5327
Added loop/match brace style control option 
This adds Allman style loop/match braces as an alternative to the current
default style.
 2016-04-17 14:52:04 -06:00
Thia Wyrod
5bd6036218
Added option to configure if/else brace style 2016-04-17 14:48:51 -06:00
Kamal Marhubi
a2426a678d config: Rename get_variant_names to doc_hint 
The `ConfigType` trait is implemented for non-enum types, so the name no
longer makes perfect sense.
 2016-04-15 01:11:04 -04:00
Nick Cameron
2f5f0a454a Merge pull request #912 from rust-lang-nursery/pat-simple-mixed 
Change the logic around breaking multiple patterns in match arms
 2016-04-12 10:47:08 +12:00
Nick Cameron
afc8be1d79 Change the logic around breaking multiple patterns in match arms 
Refactor to use the list code, don't preserve original stacking-ness, base vertical vs mixed formatting on complexity of the patterns.

Closes #386
 2016-04-12 09:23:37 +12:00
Erik Johnston
4edc6f1a4e Add variant to fn_args_layout 2016-04-07 20:01:16 +01:00
Erik Johnston
615848339b Merge branch 'master' of github.com:nrc/rustfmt into fn_arg_one_line 2016-04-07 19:53:19 +01:00
Srinivas Reddy Thatiparthy
901c5b1a5d use std::error instead std::out 2016-04-06 23:23:02 +05:30
Srinivas Reddy Thatiparthy
bee9682a49 Correct spelling of 'style' 2016-04-03 01:08:25 +05:30
Erik Johnston
57847e451a Add fn_arg_one_line option 
If set, arguments will be kept on one line if they fit. Currently only
applies when `fn_args_layout` is set to `Block`.

This commit also fixes a bug where newlines were inserted inbetween
argument brackets when there were no arguments and `fn_args_layout` was
set to `Block`.
 2016-04-02 00:25:35 +01:00
Ari Koivula
db9d129025 Add Vertical fn_args_density 
This adds new option Vertical to fn_args_density, which formats the
list vertically no matter what.
 2016-03-14 02:00:21 +02:00
Nick Cameron
65bc5c242d Merge pull request #798 from kamalmarhubi/default-no-todo-warnings 
config: Disable report_todo by default
 2016-02-15 16:36:58 +13:00
Kamal Marhubi
14dbac5fd7 config: Use write_mode from config 
This commit tidies up handling of `write_mode` by setting it in the
config at the start, and removing the `write_mode` parameter threaded
throughout the formatting process.
 2016-02-08 22:52:44 -05:00
Marcus Klaas de Vries
9c969ca6fb Merge pull request #786 from rust-lang-nursery/str-leave 
Don't reformat strings if we don't have to.
 2016-02-03 06:11:01 +01:00
Kamal Marhubi
52f98c763b config: Disable report_todo by default 2016-02-01 20:29:44 -05:00
Kamal Marhubi
85d14617ce config: Make panic messages more useful 2016-02-01 18:40:32 -05:00
Nick Cameron
02302d2800 Don't reformat strings if we don't have to. 
Specifically if no line exceeds the allowed width and we aren't moving the string to a new offset
 2016-01-28 19:14:08 +13:00
Jeremy Wazny
d82d3b2cd1 Added where_trailing_comma option. 
The default is 'false', since a lot of the time there's only a single
predicate.
 2016-01-26 12:42:11 +11:00
Mark Story
0c9f27fe5e Start hacking checkstyle output in. 
checkstyle now shows up on the option parser, and the code still
compiles/passes tests. Next up will be outputing the XML to stdout.
 2016-01-13 20:59:18 -05:00
Victor M. Suarez
4f8938c616 Allow for setting of write-mode via config file. FIxes #215 
Also from @marcusklaas:
 Refactor code output functions

 Specifically, `write_all_files` no longer returns a HashMap. It would sometimes
 contain items, and sometimes be empty. When "fixed" newlines are required, this
 must now be done with a separate call. The tests use this strategy and should now pass!
 2016-01-12 18:12:48 -05:00
Marcus Klaas de Vries
ba465e0fc2 Merge pull request #766 from ConnorGBrewster/fix-#489 
Added option for tighter punctuation in types. fixes #489
 2016-01-12 22:52:34 +01:00
Connor Brewster
479b69266b Changed TypeDensity::WhiteSpace to TypeDensity::Wide 
Changed eq_str and plus_str assignments to use a match
 2016-01-12 13:42:53 -07:00
Connor Brewster
d7a3256d40 If where is on the same line as the impl, { is put on the same line fixes #650 
factored if clause into a separate function
 2016-01-11 21:26:45 -07:00
Connor Brewster
dba2d8afd5 Added option for tighter punctuation in types. fixes #489 2016-01-11 12:26:57 -07:00
Seo Sanghyeon
f9f7235c1b Trailing commas for wildcard arms 2016-01-06 11:02:01 +09:00
Aleksey Kladov
a70b621607 add option to ignore out of line modules 2015-12-23 17:25:49 +03:00
Nick Cameron
f8cb1baadd Add normalise_comments option. 
So block comments are not converted to line comments
 2015-12-10 09:29:03 +13:00