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

334 Commits

Author SHA1 Message Date
Nick Cameron
5436977bd5 Merge pull request #1017 from marcusklaas/tweak-if-else 
Format non-statement if-else expressions on a single line
 2016-05-31 01:57:29 +12:00
Kamal Marhubi
120e1a0b51 deps: Update syntex_syntax to 0.33 
This bump brings syntex_syntax support for `..` in tuple and tuple
struct patterns, which come from RFC 1492:
  https://github.com/rust-lang/rfcs/blob/master/text/1492-dotdot-in-patterns.md

These new patterns are not properly handled in this PR; instead #1021
tracks supporting them.

Refs #1021
 2016-05-30 14:53:04 +02:00
Marcus Klaas
98c0570a28 Format non-statement if-else expressions on a single line 2016-05-29 17:58:38 +02:00
Kamal Marhubi
66cac1f3e9 Handle pub(restricted) (#1013) 
* Handle pub(restricted)

This commit properly handles pub(restricted) as introduced in RFC 1422
[0]. The syntax support was added in #971, but they were not correctly
formatted.

[0] https://github.com/rust-lang/rfcs/blob/master/text/1422-pub-restricted.md

Fixes #970

* Drop #[inline] attribute on format_visibility

* Make newly non-failing functions return String

The change to `format_visibiilty` means that `format_header` and
`format_unit_struct` can no longer fail. Their return type is updated to
reflect that.
 2016-05-28 00:58:25 +02:00
Nick Cameron
882ef8cc82 Fix off by 2 error in function sigs 
Fixes #1000

This is a little conservative in some cases, but better than being wrong in others.
 2016-05-27 15:05:15 -07:00
Nick Cameron
775de8a62b Optionally put short struct variants on one line (#997) 
Closes #418
 2016-05-18 22:38:49 +02:00
Marcus Klaas
eae2921e14 Bootstrap it. Hard. 2016-05-12 21:50:43 +02:00
Kamal Marhubi
8309d1a74c deps: Update syntex_syntax to 0.32.0 2016-05-05 16:39:34 -04:00
Kamal Marhubi
6285d53885 Handle new visibility types more gracefully 2016-05-02 01:05:23 -04:00
Kamal Marhubi
fd38acb86f deps: Update syntex_syntax to 0.31.0 
Most of the churn on this bump comes from the `Visibility` enum changing
from

    pub enum Visibility {
        Public,
        Inherited,
    }

to

    pub enum Visibility {
        Public,
        Crate,
        Restricted { path: P<Path>, id: NodeId },
        Inherited,
    }

which require taking `Visibility` by reference in most places. The new
variants are not handled at this point.

Refs #970
 2016-05-01 23:06:58 -04: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
9761cf71d8 Tests 2016-04-22 18:53:39 +12:00
Marcus Klaas
f364a7ec43 Add option to force explicit extern ABI's 2016-04-18 18:39:40 +02:00
Marcus Klaas de Vries
320df84e96 Fix brace indentation for impl items (#927) 2016-04-14 20:42:38 +02:00
Nick Cameron
c6084cb29c Fix the build 2016-04-12 11:04:33 +12:00
Nick Cameron
ce97bc08be Merge pull request #896 from erikjohnston/fn_arg_one_line 
Add fn_arg_one_line option
 2016-04-12 10:44:01 +12:00
Nick Cameron
492b26cf04 Empty structs and struct lits (#920) 
* Handle empty struct lits

Closes #835

* Don't crash on empty struct defs.

Not a great fix, but better than crashing.
 2016-04-11 21:05:54 +02:00
Erik Johnston
6a82a5fb0e Tidy up 2016-04-07 20:47:43 +01:00
Erik Johnston
4c9dd747bf Fix long generic indent 2016-04-07 20:29:05 +01:00
Erik Johnston
4edc6f1a4e Add variant to fn_args_layout 2016-04-07 20:01:16 +01:00
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
Erik Johnston
8219d15291 Fix incorrect indent with fn_args_layout: Block 
The closing parenthesis for the arg list was written on a new line
without first applying the appropriate indent.
 2016-04-01 23:01:49 +01:00
Marcus Klaas
03bf1ceeb9 Fix tuple destructuring in impl fns 2016-03-27 13:07:28 +02:00
Marcus Klaas de Vries
8fd95df54a Merge pull request #868 from rust-lang-nursery/tuple-wide 
Don't apply the function args heuristic to tuple lits.
 2016-03-24 14:57:24 +01:00
Marcus Klaas de Vries
ca757183fe Merge pull request #864 from Venti-/fn-density 
Add option for vertical function argument list
 2016-03-22 10:14:04 +01:00
Marcus Klaas de Vries
6f2bb908bb Merge pull request #866 from rust-lang-nursery/empty-extern 
Keep empty extern blocks on one line
 2016-03-16 18:06:25 +01:00
Connor Brewster
0a665aaceb Fixed nitpicks 
Removed unneeded comment
Commented line wrapping conditions
Removed prefix param on `rewrite_associated_type`
Merged `rewrite_associated_static` into `rewrite_static`
Added extra tests
 2016-03-15 14:08:12 -06:00
Connor Brewster
a0a5335634 Fixed span_after issue 2016-03-14 20:51:41 -06:00
Connor Brewster
7a6eb2197e Merge branch 'master' of https://github.com/rust-lang-nursery/rustfmt into add-trait-formatting 2016-03-14 20:49:14 -06:00
Connor Brewster
2793b4090c Added tests 2016-03-14 20:05:20 -06:00
Connor Brewster
7ba43ff06e Finished implementing impl and trait type/const 2016-03-14 19:52:07 -06:00
Nick Cameron
9d8ce54428 Don't apply the function args heuristic to tuple lits. 
Closes #450
Closes #510
 2016-03-14 20:51:06 +13:00
Nick Cameron
96a2f25788 Keep empty extern blocks on one line 
Closes #462
 2016-03-14 18:55:55 +13:00
Nick Cameron
da65090050 Merge pull request #857 from kamalmarhubi/codemap-ext 
utils: Add CodeMapExt extension trait for span_* methods
 2016-03-14 18:00:51 +13:00
Ari Koivula
0c8640a84f Fix last comment turning into block comment 
This fixes the comment after the last argument in an argument list
being turned into a block comment when it's not necessary.
 2016-03-14 02:02:52 +02:00
Kamal Marhubi
d82d9fc808 utils: Add CodeMapSpanUtils trait for span_* methods 
This commit adds a CodeMapSpanUtils extension trait on CodeMap, and
moves some functions to methods there:
  - span_after
  - span_after_last
  - span_before

This better reflects them being lookup methods on the codemap.
 2016-03-13 18:14:07 -04:00
Connor Brewster
3163071c75 Updated to latest rustfmt 2016-03-12 11:09:27 -07:00
Connor Brewster
34651c4f78 Fixed formatting 2016-03-11 22:41:22 -07:00
Connor Brewster
d24c31f74c Added support for associated type rewriting 2016-03-11 22:32:08 -07:00
Connor Brewster
9e583ce7a7 Added where clause formatting 2016-03-11 14:49:11 -07:00
Connor Brewster
35dfcc0078 Adding trait formatting 
trait header formatting finished
generic formatting finished
added basic trait bounds formatting
 2016-03-11 14:18:30 -07:00
Amanieu d'Antras
698027c4c4 Fix ordering of "const unsafe fn" 2016-03-09 02:44:01 -08:00
Kamal Marhubi
589dabda2f deps: Update syntex_syntax to 0.29.1 2016-03-02 13:08:21 -05: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
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
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
Marcus Klaas de Vries
b99e8eda29 Merge pull request #757 from ConnorGBrewster/fix-#650 
Fix for #650
 2016-01-12 21:17:45 +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
Connor Brewster
749697d845 Changed is_block_empty to has_body 2016-01-11 14:47:56 -07:00