Commit graph

4297 commits

Author SHA1 Message Date
rchaser53
c2534f5324 fix "internal error: left behind trailing whitespace" with long lines 2019-02-01 19:58:38 +09:00
Seiichi Uchida
7c0f59bee3
Merge pull request #3306 from topecongiro/issue-2841
Do not force trailing comma when using mixed layout
2019-02-01 00:23:15 +09:00
topecongiro
0142e961ad Prioritize single_line_fn and empty_item_single_line over brace_style
When either one of these two options are set to `true`, each should take
precedence over the brace_style option.

This commit does not introduce any formatting change to the default
configuration, so no version gate is required.
2019-02-01 00:22:47 +09:00
topecongiro
154ccf6a02 Do not force trailing comma when using mixed layout 2019-01-31 23:44:58 +09:00
Seiichi Uchida
923da60f72
Merge pull request #3298 from topecongiro/issue-3272
Use the same rule between function and macro
2019-01-30 00:36:55 +09:00
topecongiro
181ca427dc Use the same rule with macro and function calls with a single chain 2019-01-28 23:05:42 +09:00
topecongiro
5df0a18849 Avoid putting a long macro call in a single line 2019-01-28 23:05:39 +09:00
Seiichi Uchida
36c9dc646c
Merge pull request #3293 from scampi/issue-3241
Keep leading colons for global paths
2019-01-27 23:14:57 +09:00
Seiichi Uchida
5b6f6431a3
Merge pull request #3280 from m-ou-se/global-config
Look for a global rustfmt.toml.
2019-01-27 23:02:54 +09:00
Mara Bos
635a4cdcdc Also look in home directory for global config. 2019-01-27 13:22:25 +01:00
Mara Bos
13db34fb95 Document the global rustfmt.toml feature. 2019-01-27 13:22:25 +01:00
Mara Bos
24daa174ca Look for a global rustfmt.toml.
If no rustfmt.toml is found in the usual way, the directory 'rustfmt' in
the user's config directory is checked.

 - $XDG_CONFIG_HOME/rustfmt/ (or $HOME/.config/rustfmt/), or
 - $HOME/Library/Preferences/rustfmt/ on Mac, or
 - %AppData%\rustfmt\ on Windows.
2019-01-27 13:22:25 +01:00
Stéphane Campinas
2125ad272e
fix glob and nested global imports 2019-01-27 12:46:14 +01:00
Seiichi Uchida
203e6d265d
Merge pull request #3294 from rchaser53/issue-3278
change new line point in the case of no args
2019-01-27 16:28:28 +09:00
Seiichi Uchida
35d5ef7828
Apply rustfmt::skip on imports (#3289) 2019-01-27 16:26:09 +09:00
rchaser53
f92f3e3bda add the version gate to the code and test 2019-01-27 14:38:57 +09:00
Stéphane Campinas
4e7eda420c
Merge pull request #3297 from matthiaskrgr/deps
update dependencies
2019-01-27 02:23:59 +01:00
Matthias Krüger
d44ee75438 update dependencies
update itertools from 0.7 to 0.8
update env_logger from 0.5 to 0.6
update cargo_metadata from 0.6 to 0.7
update bytecount from 0.4 to 0.5
2019-01-27 00:58:46 +01:00
rchaser53
7b996542cc change new line point in the case of no args 2019-01-26 00:16:51 +09:00
Stéphane Campinas
a2bfc026e5
keep leading double-colon to respect the 2018 edition of rust's paths 2019-01-23 00:01:53 +01:00
Stéphane Campinas
78d4fca2d7
indicate in the readme that edition may need to be written in rustfmt.toml 2019-01-21 00:53:31 +01:00
Nick Cameron
d2e91b5b68
Merge pull request #3284 from scampi/issue-3270
recognize strings inside comments in order to avoid indenting them
2019-01-17 20:22:36 +13:00
Stéphane Campinas
083a20fb1a
version-gate the formatting of commented strings 2019-01-16 23:06:28 +01:00
wada314
a01990c4d0 Use Unicode-standard char width to wrap comments or strings. (#3275) 2019-01-15 08:41:09 +09:00
Stéphane Campinas
503cddeb0f
Merge pull request #3225 from scampi/issue-3224
rewrite_comment: fix block fallback when failing to rewrite an itemized block
2019-01-14 14:41:00 +01:00
Stéphane Campinas
a1bbf58965
Merge pull request #3285 from arnavb/patch-1
Fix incorrect documentation for `unstable_features`
2019-01-10 21:10:34 +01:00
Stéphane Campinas
baa62c609e
recognize strings inside comments in order to avoid indenting them
Close #3270
2019-01-10 21:04:16 +01:00
Arnav Borborah
4d87ef76d8
Fix incorrect documentation for unstable_features 2019-01-10 14:54:06 -05:00
Nick Cameron
2c204c11d1
Merge pull request #3260 from topecongiro/issue-3004
Do not modify original source code inside macro call
2019-01-07 17:39:05 +13:00
Nick Cameron
c357eee8bb
Merge pull request #3276 from dten/allow-p
allow specifying package with -p
2019-01-07 17:28:13 +13:00
David Hewson
a8d2591f0c allow specifying package with -p
currently `cargo fmt -p blah` is rejected but `cargo fmt --package blah` is allowed. both should be allowed
2019-01-01 17:49:55 +00:00
Stéphane Campinas
3b18238009
simplify function to create a string from the itemized block 2018-12-25 23:15:52 +01:00
Seiichi Uchida
996d5e8d6c
Fix shape when formatting return or break expr on statement position (#3259) 2018-12-25 18:20:29 +09:00
wada314
09c9cd4125 Fix issue #3263 (#3264) 2018-12-25 18:03:48 +09:00
Seiichi Uchida
84702bc289
Merge pull request #3266 from wada314/fix-2973
Fix issue #3265
2018-12-25 18:00:45 +09:00
Seiichi Uchida
e60f4bbea6
Merge pull request #3269 from wada314/lc-unreachable
Remove a trivial redundant code.
2018-12-25 17:58:27 +09:00
Shohei Wada
d504a66076 Remove a trivial redundant code.
self.base.peek().is_none() case is already catched by the line above.
2018-12-24 17:48:42 +09:00
Shohei Wada
e37f468b21 Change \r detection much simpler. 2018-12-24 07:25:15 +09:00
Shohei Wada
6a316e3ac7 Add test cases. 2018-12-24 06:18:00 +09:00
Shohei Wada
f3f511af1b Fix #2973 in Windows CRLF env. 2018-12-24 06:12:28 +09:00
Seiichi Uchida
a1ee7e9565
Merge pull request #3258 from scampi/version-gate
Clarify version gate used for #3229
2018-12-20 13:30:58 +09:00
topecongiro
49568d7f76 Do not modify original source code inside macro call 2018-12-20 01:14:14 +09:00
topecongiro
30cda580bd Add a test for #3004 2018-12-20 01:13:18 +09:00
Stéphane Campinas
e305262493
clarify the version-gate used for the #3229 change 2018-12-19 09:36:47 +01:00
Stéphane Campinas
36e2cb0456
add a section to the Contributing.md file about version-gating formatting changes 2018-12-19 09:31:13 +01:00
Seiichi Uchida
3f6ea7788b
Merge pull request #3240 from Xanewok/parser-panic
Catch possible tokenizer panics
2018-12-18 11:30:08 +09:00
Seiichi Uchida
d1c7afe080
Merge pull request #3250 from scampi/issue3229
version-gate the trailing semicolon change of return statements inside a match arm
2018-12-18 11:22:45 +09:00
Philipp Hansch
d0785954c8 Fix trim_right/trim_left deprecation warnings (#3252) 2018-12-18 11:21:31 +09:00
Nick Cameron
16c292dcf8
Merge pull request #3249 from andjo403/assert_cli
remove deprecated dependency assert_cli
2018-12-17 20:52:18 +13:00
Andreas Jonson
653f3ae636 use the rustfmt function to find the bin
makes it possible to execute the test after a release build
2018-12-14 23:32:25 +01:00