Commit Graph

1178 Commits

Author SHA1 Message Date
Edward Yang
1c83c76015 Stop extra newlines from being added after block comments (#1185) 2016-10-25 08:45:15 +13: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
Nick Cameron
23f01eddac Merge pull request #1188 from Rantanen/master
Add support for spaces_within_angle_brackets
2016-10-14 11:38:39 +13:00
Nick Cameron
171d917888 Merge pull request #1189 from Pursuit92/master
Quick fix for "impl Trait"
2016-10-14 10:10:18 +13:00
Josh Chase
903e30b503 Quick fix for "impl Trait"
* Remove "TODO" conversion
* Add a couple of simple test cases

Fix courtesy of @signaraiona
2016-10-13 12:30:16 -07:00
Mikko Rantanen
d68d43c0a5 Added test for for< 'a > 2016-10-13 22:28:58 +03: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
Nick Cameron
724f75eaa5 Merge pull request #1182 from philipc/issue-1149
Preserve macro formatting if we can't rewrite it
2016-10-12 17:48:20 +13:00
Nick Cameron
8ffb581563 Merge pull request #1186 from woshilapin/vim-doc
Update link towards vim documentation
2016-10-11 14:46:37 +13:00
Jean SIMARD
091d96f6fa
Update link towards vim documentation 2016-10-10 21:35:07 -04:00
Nick Cameron
f1df5c1aa9 cargo update 2016-10-07 12:58:18 +13:00
Nick Cameron
49598f6efd Merge pull request #1183 from oylenshpeegul/patch-1
Link to rust-mode.el instead of rustfmt.el
2016-10-06 07:17:00 +13:00
Tim Heaney
7deeee1160 Link to rust-mode.el instead of rustfmt.el
Link directly to rust-mode.el, since rustfmt.el is marked obsolete.
2016-10-05 09:19:21 -04:00
Philip Craig
c4a7a7108e Preserve macro formatting if we can't rewrite it 2016-10-03 14:14:56 +10:00
Florian Gilcher
b8f7ec3dcc Add custom comments (#1179)
* Add custom comments

This allows users to use custom comments such as

```
//@ this is a custom comment
//@ with multiple lines
```

without having them destroyed by rustfmt.

* Fix issues with empty lines

* Check non-whitespace right after custom comments
2016-09-30 08:34:46 +13:00
Nick Cameron
3e14af0eeb Merge pull request #1175 from nokaa/master
Fix broken import
2016-09-28 06:52:17 +13:00
nokaa
8a9dfc5ede Fix broken import 2016-09-27 12:38:17 -05:00
Nick Cameron
77ceba2bc0 Write to the supplied buffer if one is supplied to format_input 2016-09-27 17:25:54 +13:00
Nick Cameron
17c5d389f5 Merge pull request #1166 from sinkuu/fix_775
Fix #775: Off-by-one overrun in deeply nested function call
2016-09-20 17:55:25 +12:00
sinkuu
2dfa96bc9a Fix #775
rewrite_tuple referring config.max_width where given width should be
used
2016-09-20 14:06:28 +09:00
Nick Cameron
3ff7e83457 Merge pull request #1156 from sinkuu/break_if_let
Prefer line break at `=`/`in`
2016-09-19 18:51:21 +12:00
Nick Cameron
8d606bbfc6 Merge pull request #1165 from sinkuu/fix_self_tests
Fix self test
2016-09-19 15:17:47 +12:00
sinkuu
114a3e287a Fix self test 2016-09-19 11:48:56 +09:00
Nick Cameron
e1d7b8ea01 Merge pull request #1162 from sinkuu/fix1040
Fix #1040
2016-09-19 14:35:42 +12:00
Nick Cameron
fb8a1903cf Merge pull request #1161 from sinkuu/fix550
Fix #550: `if` nested in tuple is indented oddly
2016-09-19 08:49:38 +12:00
Nick Cameron
d0e8322d7f Merge pull request #1160 from est31/master
Two improvements
2016-09-18 11:36:08 +12:00
sinkuu
b6bffa6596 Prevent line breaking at = or in after trivial patterns 2016-09-17 13:03:14 +09:00
sinkuu
079f39d07f Fix #550: if nested in tuple is indented oddly 2016-09-17 10:46:20 +09:00
est31
c6243c950e Improve comment rewriting with normalize_comments == false
Only change multiline comments of the form

```rust
/*
 * Text
 */
```

while not affecting comments of the form

```rust
/*
Text
*/
```

when normalize_comments is off. In the first case,
we have a known character we can align against, while
we don't have one in the second case.

Before, we have converted the second form into the first,
but this is against the spirit of normalize_comments being
turned off.

Fixes #956
2016-09-17 03:41:11 +02:00
est31
efd3e5c091 Add three new options for spaces 2016-09-17 02:22:13 +02:00
Nick Cameron
4418fab4f2 Update to latest Syntex
+ Cargo update
+ 0.6.2 release
2016-09-16 15:28:02 +12:00
Nick Cameron
f9712b075e Merge pull request #1151 from sinkuu/issue1021
Fix #1021: Handle `..` in tuple / tuple struct patterns
2016-09-13 15:32:03 -07:00
sinkuu
b446e31739 Fix #1040 2016-09-10 13:08:32 +09:00
sinkuu
bf078566d7 Fix #1021: Handle .. in tuple / tuple struct patterns 2016-09-09 19:56:34 +09:00
dawirstejeck
a5d7073bf5 Split impl at 'for' if a line break is needed (#1148)
* Split impl at 'for' if a line break is needed

* Fix formatting

* Improve comments

* Skip second try if there is no 'for'

* Restore intentional trailing whitespace

* Change test source to be incorrectly formatted

* Restore more missing trailing whitespace

* Remove too much whitespace...

Really should learn how to use git revert.
2016-09-06 17:11:56 +12:00
Nick Cameron
df173c2885 Merge pull request #1147 from brettcannon/patch-1
Put rustfmt on PATH so `cargo fmt` works on Travis
2016-09-05 16:05:58 +12:00
Brett Cannon
3c7e11e810 Put rustfmt on PATH so cargo fmt works on Travis
Closes #1143
2016-09-03 17:30:02 -07:00
Nick Cameron
c9819ceda2 Merge pull request #1135 from sinkuu/clippy
Run clippy
2016-08-29 15:01:48 +12:00
sinkuu
a3c63fdef9 Run clippy 2016-08-29 08:57:27 +09:00
Nick Cameron
bce26d51bd Merge pull request #1134 from sinkuu/issue977
Fix #977
2016-08-29 07:07:48 +12:00
sinkuu
130c593544 Fix #977 2016-08-28 16:40:03 +09:00
Nick Cameron
35624c54e5 Merge pull request #1142 from kamalmarhubi/fix-1140
Check term supports colour before printing fancy diffs
2016-08-28 17:48:31 +12:00
Kamal Marhubi
05882314f5 Check term supports colour before printing fancy diffs
For a terminal like DUMB, we were still attempting to print colourful
diffs, which failed with a `NotSupported` error.

Fixes #1140
2016-08-26 17:08:47 -04:00
Nick Cameron
59e199b439 Merge pull request #1138 from johannhof/travis-docs
Add instructions on how to run rustfmt on Travis
2016-08-25 17:30:03 +12:00
Johann Hofmann
c8e871fb4d
Add instructions on how to run rustfmt on Travis
This adds very simplistic instructions on how to run rustfmt on CI.

I also wrote a blog post for more details: http://johannh.me/blog/rustfmt-ci.html
2016-08-24 23:51:36 +02:00
Stuart Dootson
61042e6e4d Fix issue 1124 - detect start of output rather than start of input file when writing output source file (#1133)
* Change required to prevent a trailing space at the end of a separate module being propagated

* Detect the start of the output file rather than the start of the input file when deciding whether to output preceding snippets - this stops unnecessary whitespace and blank lines from being inserted when spans and statements are output in an order other than that from the input file.

* Add code to prevent space from being added with the prefix snippet if a) the snippet is entirely horizontal whitespace, or b) the snippet contains whitespace  followed by a newline. This prevents trailing spaces at the end of a line from being added.

* Tests for this issue

* Tidy up `match` statements

* Add test with blank lines between `use` statements
2016-08-25 08:32:04 +12:00
Nick Cameron
d022f05f34 v0.6.0 2016-08-11 10:08:59 +12:00
Nick Cameron
e1759ae295 Merge pull request #1123 from juicejitsu/807
Don't emit filename in diff mode, add filename to diff metadata
2016-08-10 21:52:46 +12:00
Stuart Dootson
4029b0e704 Fix #1120 - rework how the use list prefix is determined. (#1121)
* Fix #1120 - rework how the use list prefix is determined.

* Added test commentary & another test case
2016-08-10 18:13:27 +12:00