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

551 Commits

Author SHA1 Message Date
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
Nick Cameron
a6d70547e0 Merge pull request #799 from kamalmarhubi/const-instead-of-static 
cleanup: Use const instead of static
 2016-02-03 19:26:38 +13:00
Marcus Klaas de Vries
586f525cf1 Merge pull request #780 from sidred/config_path 
Add support for the config-path option
 2016-02-03 06:12:27 +01: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
Marcus Klaas de Vries
e2c8c1cab5 Merge pull request #797 from kamalmarhubi/config-expect 
config: Make panic messages more useful
 2016-02-03 06:08:34 +01:00
Kamal Marhubi
70c9b55ecb cleanup: Remove documentation of deleted parameter 
The `args` parameter was removed in 579fb34.
 2016-02-02 12:37:38 -05:00
sid
46242ed10e Add support for the config-path option 
Adds a config-path option for rustfmt. If this argument is provided,
it recursively searches the config-path for a rustfmt.toml file.
If file is not found, reverts to searching the file input path for the
config file or uses default options.
 2016-02-02 15:08:44 +05:30
Kamal Marhubi
8b601812a6 cleanup: Use const instead of static 2016-02-01 23:40:45 -05:00
Kamal Marhubi
85d14617ce config: Make panic messages more useful 2016-02-01 18:40:32 -05:00
Kamal Marhubi
0f254bb343 docs: Clarify return type of lookup_project_file 2016-02-01 12:55:12 -05:00
Kamal Marhubi
98726d0a53 bin: Improve error handling in project file lookup 
Previously errors were being silently ignored. Eg, if `rustfmt` did not
have permission to read a `rustfmt.toml` file, the default configuration
was used without informing the user.
 2016-01-31 10:28:47 -05:00
Marcus Klaas de Vries
edcc4ec6c0 Merge pull request #787 from rust-lang-nursery/mod-empty 
Put empty modules on one line
 2016-01-31 11:33:49 +01:00
Marcus Klaas de Vries
1d216e1829 Merge pull request #791 from kamalmarhubi/canonicalize-path 
bin: Canonicalize path before looking for project file
 2016-01-31 11:33:05 +01:00
Kamal Marhubi
7a0d8be405 bin: Canonicalize path before looking for project file 2016-01-31 02:01:54 -05:00
Kamal Marhubi
bd9ad6b0a0 bin: Properly handle a directories named rustfmt.toml 
`lookup_project_file` could erroneously find a *directory* named
`rustmfmt.toml` if there was one in its lookup path, and so ignore any
configuration file it should have found further up. The error handling
resulted in this silently using the default configuration.
 2016-01-31 01:49:29 -05:00
Nick Cameron
a0e85f9a5f Put empty modules on one line 
Fixes #463
 2016-01-28 19:53:41 +13: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
DarkDrek
feb09a42f5 Fix #784 2016-01-27 02:18:05 +01:00
Nick Cameron
4344c51c80 Merge pull request #783 from jwazny/issue-588 
Added where_trailing_comma option.
 2016-01-26 22:23:05 +13:00
Jeremy Wazny
7297bc320f Limit when we emit a trailing where clause comma. 2016-01-26 16:39:00 +11: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
Kevin Yeh
f01ed6f507 Format item macros 2016-01-22 13:43:18 -06:00
Nick Cameron
81516fe8ca Merge pull request #745 from markstory/checkstyle-output 
RFC implementation of checkstyle output
 2016-01-22 17:48:39 +13:00
Mark Story
d8c6f5954a Update checkstyle write mode to take Write arguments. 
By accepting Write traits we can write tests using StringBuffer.
 2016-01-19 00:23:38 -05:00
Mark Story
5632831bd1 Clean up function names for checkstyle output. 2016-01-14 22:04:24 -05:00
Nick Cameron
f0ca7aec24 Fix an off-by-one error due to the comma in a struct lit field 
Also allows splitting the field expression on a new line after the field name.

Fixes #698
 2016-01-14 20:26:15 +13:00
Mark Story
add80569ff Use PartialEq/Eq implementation instead of match. 
Also cleanup from rebasing onto master.
 2016-01-13 21:07:38 -05:00
Mark Story
58410ddd93 Extract checkstyle output into a separate module. 
Rename functions a bit now that they are specific to checkstyle output.
 2016-01-13 21:03:25 -05:00
Mark Story
3c968e1e38 Update based on pull request feedback. 
* Extract duplicated logic.
* Make checkstyle errors into warnings.
 2016-01-13 21:02:50 -05:00
Mark Story
de10545906 Encode XML entities. 2016-01-13 21:02:50 -05:00
Mark Story
c3632befb5 Remove unused argument. 2016-01-13 21:02:05 -05:00
Mark Story
309f284dfb Fix formatting errors. 2016-01-13 21:01:27 -05:00
Mark Story
d188854e13 Hack together checkstyle output that compiles. 
I'm not sure it does something useful yet though.
 2016-01-13 21:01:26 -05: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
Marcus Klaas de Vries
4cefecb495 Merge pull request #768 from DarkDrek/amend-to-fix-#447 
fixes parsing issue #767
 2016-01-12 21:53:19 +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
Marcus Klaas de Vries
b99e8eda29 Merge pull request #757 from ConnorGBrewster/fix-#650 
Fix for #650
 2016-01-12 21:17:45 +01:00
DarkDrek
937e26d4e1 fixes parsing issue #767 2016-01-12 21:13:59 +01: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
DarkDrek
4da91e7df2 Handle more possible comment position for if else 
Extended the test with the new possiblecomment positions
 2016-01-12 03:08:48 +01:00
DarkDrek
b0eb0f5daa Keep comments between if and else blocks. Fixes #447 2016-01-12 03:08:16 +01:00
Connor Brewster
749697d845 Changed is_block_empty to has_body 2016-01-11 14:47:56 -07:00
Connor Brewster
dba2d8afd5 Added option for tighter punctuation in types. fixes #489 2016-01-11 12:26:57 -07:00
Connor Brewster
6b741a7194 Where clause is on same line as fn if fn is empty fix-#760 
only applies if fn_empty_single_line is set to true
 2016-01-10 22:06:06 -07:00
cassiersg
b236819f72 Merge pull request #756 from cassiersg/missed-comments 
Detect (and recover) when comments disappear
 2016-01-11 01:16:52 +01:00
Nick Cameron
0badc128f7 Merge pull request #740 from svmnotn/less_tmp_files 
stop creating bk files if there are no changes. Fixes #733
 2016-01-11 10:45:51 +13:00
Victor M. Suarez
56a3aac2b5 stop creating bk files if there are no changes. Fixes #733 2016-01-10 16:37:13 -05:00
Gaëtan Cassiers
b117d7b2b8 Document comment::*CodeCharKind 2016-01-10 22:04:30 +01:00