Commit Graph

2217 Commits

Author SHA1 Message Date
topecongiro
daf4789b76 Add a test for #2087 2017-10-27 16:35:40 +09:00
Nick Cameron
0a59654b41 Merge pull request #2084 from topecongiro/issue-2081
Use rewrite_assign_rhs when rewriting unit variant
2017-10-27 02:15:22 +05:30
Nick Cameron
038f711c6e Merge pull request #2083 from topecongiro/issue-2082
Use a correct span for fn with pub(crate) syntax
2017-10-27 02:14:29 +05:30
Nick Cameron
adbe98e522 Merge pull request #2069 from SingingTree/log_path_str_if_after_file_errors
Return a more verbose error when formatting a file fails
2017-10-27 01:39:43 +05:30
Nick Cameron
4386fc218b Merge pull request #2068 from topecongiro/issue-2067
Fix a subtle bug in rewriting chain
2017-10-27 01:38:10 +05:30
Nick Cameron
73b079d3f6 Merge pull request #2079 from SingingTree/issue-1979-errors-go-to-stdout
Use stderr for various errors and warnings.
2017-10-27 01:02:44 +05:30
Nick Cameron
36ed1566ea Merge pull request #2072 from matthew-mcallister/mod-inner-skip
Handle `#![rustfmt_skip]` in more places
2017-10-27 00:55:48 +05:30
Nick Cameron
985aa2b884 Merge pull request #2070 from jugglerchris/diff_zero_context
Fix make_diff with zero context requested
2017-10-27 00:39:21 +05:30
Bryce Van Dyk
adac9fb43c Use stderr for various errors and warnings.
Adjusts several error and warning report cases to output using eprintln!
instead of println! so that messages are sent to stderr.
2017-10-25 22:18:19 +13:00
topecongiro
a67b8b0bbb Use rewrite_assign_rhs when rewriting unit variant 2017-10-25 01:08:32 +09:00
topecongiro
7b9a4e6a06 Use a correct span for fn with pub(crate) syntax 2017-10-25 00:51:04 +09:00
Seiichi Uchida
e48dd81a2b Merge pull request #2077 from djanderson/patch-1
Fix typo in --config-help "funciton" -> "function"
2017-10-24 23:48:36 +09:00
Douglas Anderson
ac33472d36 Fix typo in --config-help "funciton" -> "function" 2017-10-22 00:47:45 -06:00
Matthew McAllister
1853d02ea9 Handle #![rustfmt_skip] in block statements 2017-10-20 02:37:52 -07:00
Matthew McAllister
108e2cd776 Handle #![rustfmt_skip] at file top level 2017-10-20 00:22:23 -07:00
Nick Cameron
9754bcb535 Merge pull request #2048 from japaric/required-version
add `required-version` option to rustfmt.toml
2017-10-20 11:23:27 +05:30
Bryce Van Dyk
47a0bef91c Return a more verbose error when formatting a file fails
Expands the error message returned if the after_file function fails to
also include path_str. This allows users to better identify files that are
not being formatted.
2017-10-20 15:27:35 +13:00
Chris Emerson
2a84352d1d Run rustfmt on the new changes. 2017-10-19 23:32:27 +01:00
Chris Emerson
f9bcb58eb3 Add a couple of special cases which fix the zero-context diff case. 2017-10-19 23:14:20 +01:00
Chris Emerson
6c1c81bbce Add a test for two nearby chunks (with context). 2017-10-19 23:03:27 +01:00
Chris Emerson
6282c970cf Add a failing test of zero context. 2017-10-19 20:55:20 +01:00
Chris Emerson
88f02975a1 Add a simple passing test for diffs. 2017-10-19 20:50:55 +01:00
topecongiro
8b7defdb19 Add a test for #2067 2017-10-18 22:23:25 +09:00
topecongiro
0d359eacd7 Cargo fmt 2017-10-18 22:23:25 +09:00
topecongiro
142fc45dbb Take the width of trailing '?'s into account 2017-10-18 22:23:25 +09:00
topecongiro
ad47a71012 Do not distinguish between a single-child chain from others
`last_shape` is used when rewriting the last child on its own line.
2017-10-18 22:23:25 +09:00
topecongiro
51d230ead3 Use trimmed_last_line_width() 2017-10-18 22:23:25 +09:00
Nick Cameron
560b054147 Merge pull request #2064 from topecongiro/issue-2063
Take width of return type into account for body shape of closure
2017-10-17 15:10:54 +05:30
Seiichi Uchida
043ddf146d Fix a typo 2017-10-17 11:13:20 +09:00
Nick Cameron
34cb29a26d Merge pull request #2060 from tamird/doc-dump-default-config
Document `--dump-default-config` in README.md
2017-10-16 22:29:30 +07:00
Nick Cameron
96c9a90de0 Merge pull request #2058 from BenjaminGill-Metaswitch/patch-1
Add crates.io version shield
2017-10-16 22:26:10 +07:00
Seiichi Uchida
7cbdf35f63 Add a test for #2063 2017-10-17 00:12:22 +09:00
Seiichi Uchida
2bf4747c47 Take width of return type into account 2017-10-17 00:10:19 +09:00
Seiichi Uchida
40e6c26b8b nightly-0.2.9 2017-10-16 12:24:18 +09:00
Seiichi Uchida
474c1935d6 Cargo update 2017-10-16 12:24:15 +09:00
Tamir Duberstein
f00c556263
correct --dump-default-config usage string 2017-10-14 08:08:52 -04:00
Saulo Silva
50a138a5ab
Document --dump-default-config in README.md
Fixes #317.
2017-10-14 07:51:57 -04:00
Nick Cameron
23be63fbba Merge pull request #2047 from japaric/dump-default-config-2
output --dump-default-config to stdout if no path is given
2017-10-13 22:06:15 +08:00
Nick Cameron
fc15e9f838 Merge pull request #2042 from topecongiro/refactoring
Refactorings
2017-10-13 22:00:10 +08:00
Nick Cameron
5798fe6e13 Merge pull request #2045 from topecongiro/issue-2044
Simplify multiline case in rewrite_struct_field()
2017-10-13 21:59:13 +08:00
Benjamin Gill
ee33cdf120 Add crates.io version shield 2017-10-13 11:46:00 +01:00
Seiichi Uchida
0950502151 Merge pull request #2051 from petrochenkov/dyn
Fix breakage from `dyn Trait`
2017-10-13 19:18:05 +09:00
Jorge Aparicio
77584e507c default required-version to the current rustfmt version 2017-10-10 22:37:47 +02:00
Jorge Aparicio
d2bf5b8068 run cargo fmt 2017-10-10 22:36:41 +02:00
Vadim Petrochenkov
16a478368c Fix breakage from dyn Trait 2017-10-10 21:20:57 +03:00
Seiichi Uchida
505439048f Merge pull request #2049 from SingingTree/issue-1211-test
Add a test for issue 1211, showing it's no longer an issue.
2017-10-10 16:16:09 +09:00
Bryce Van Dyk
f3ceb54d3a Add a test for issue 1211, showing it's no longer an issue.
Since rustfmt has moved away from syntex the overflow seen in issue 1211
is no longer a problem. This commit adds a test to verify that.
2017-10-10 18:51:44 +13:00
Jorge Aparicio
0c36c59175 add required-version option to rustfmt.toml
This option specifies the rustfmt version that *must* be used to format the code. Trying to use a
different version raises an error.

closes #1505
2017-10-09 23:07:53 +02:00
Jorge Aparicio
a1cfacdb12 output --dump-default-config to stdout if no path is given
closes #1988
2017-10-09 21:10:20 +02:00
Seiichi Uchida
c7250d18b1 Fix a typo 2017-10-09 22:44:00 +09:00