]>
git.lizzy.rs Git - rust.git/log
Seiichi Uchida [Sun, 25 Mar 2018 22:34:17 +0000 (07:34 +0900)]
Factor out default_tactic and fix indentation
rustfmt fails to handle binary expressions with comments in-between.
Seiichi Uchida [Sun, 25 Mar 2018 22:32:48 +0000 (07:32 +0900)]
Replace MacroStyle with ast::DelimToken
Seiichi Uchida [Sun, 25 Mar 2018 11:20:50 +0000 (20:20 +0900)]
Avoid cloning RewriteContext
Nick Cameron [Thu, 22 Mar 2018 21:51:47 +0000 (10:51 +1300)]
Merge pull request #2549 from topecongiro/macro-def-spaces-around-colon
Add config option to control spaces around colon in macro def
Nick Cameron [Thu, 22 Mar 2018 21:50:41 +0000 (10:50 +1300)]
Merge pull request #2553 from topecongiro/rustc-ap-syntax
Update rustc-ap-syntax to 73.0.0
topecongiro [Thu, 22 Mar 2018 07:09:21 +0000 (16:09 +0900)]
Cargo fmt and update tests
topecongiro [Thu, 22 Mar 2018 07:08:57 +0000 (16:08 +0900)]
Remove a space after a colon of metavariable def in macro def
topecongiro [Thu, 22 Mar 2018 07:01:41 +0000 (16:01 +0900)]
Update a test
topecongiro [Thu, 22 Mar 2018 06:56:51 +0000 (15:56 +0900)]
Use `UseSegment::Slf` or `UseSegment::Super` when appropriate
Currently we `UseSegment::Ident` for all of the segments except the last.
E.g. `use super::foo::bar::self;` will be
`[Ident("super"), Ident("foo"), Ident("bar"), Self(None)]`.
in the current implementation. I think that this should be
`[Super(None), Ident("foo"), Ident("bar"), Self(None)]`.
instead.
I noticed this because some tests failed after updating
`rustc-ap-syntax` to 73.0.0.
topecongiro [Thu, 22 Mar 2018 06:55:14 +0000 (15:55 +0900)]
Fix libsyntax updates
`ast::UseTreeKind::Simple` now takes `Option<ast::Ident>`
instead of `ast::Ident`.
topecongiro [Thu, 22 Mar 2018 06:53:43 +0000 (15:53 +0900)]
Fix libsyntax update
Underscore is now one of keywords.
topecongiro [Thu, 22 Mar 2018 06:53:08 +0000 (15:53 +0900)]
Cargo update
Update rustc-ap-syntax to 73.0.0.
Nick Cameron [Thu, 22 Mar 2018 05:04:31 +0000 (18:04 +1300)]
Merge pull request #2552 from alanhdu/master
Close #2551
Alan Du [Thu, 22 Mar 2018 04:57:22 +0000 (00:57 -0400)]
Close #2551
Alan Du [Thu, 22 Mar 2018 04:01:09 +0000 (00:01 -0400)]
Fix build
Nick Cameron [Thu, 22 Mar 2018 03:26:48 +0000 (16:26 +1300)]
Merge pull request #2550 from sinkuu/chars_count_index
Don't index a string with chars().count()/position()
Nick Cameron [Thu, 22 Mar 2018 02:40:36 +0000 (15:40 +1300)]
Merge pull request #2548 from topecongiro/match-mod
Do not collapse block around expr with condition on match arm
Nick Cameron [Thu, 22 Mar 2018 02:08:01 +0000 (15:08 +1300)]
Merge pull request #2535 from nrc/import-ord
Import ordering
Shotaro Yamada [Wed, 21 Mar 2018 14:58:23 +0000 (23:58 +0900)]
Omit unnecessary UTF-8 decoding
Shotaro Yamada [Wed, 21 Mar 2018 23:34:36 +0000 (08:34 +0900)]
Use take_while
Shotaro Yamada [Wed, 21 Mar 2018 23:32:42 +0000 (08:32 +0900)]
Don't index a string with `chars().count()`
Seiichi Uchida [Wed, 21 Mar 2018 13:20:03 +0000 (22:20 +0900)]
Do not collapse block around expr with condition on match arm
Closes #2376.
Seiichi Uchida [Wed, 21 Mar 2018 13:02:18 +0000 (22:02 +0900)]
Add matches module
`matches` module contains `rewrite_match` and related stuffs.
Nick Cameron [Mon, 19 Mar 2018 20:54:00 +0000 (09:54 +1300)]
Return grouping `extern crate` to true by default
Nick Cameron [Fri, 16 Mar 2018 07:57:35 +0000 (20:57 +1300)]
reviewer comments and rebase fallout
Nick Cameron [Thu, 15 Mar 2018 19:18:56 +0000 (08:18 +1300)]
Better handle comments and newlines around erased imports
Nick Cameron [Thu, 15 Mar 2018 01:06:54 +0000 (14:06 +1300)]
fixup tests
Nick Cameron [Wed, 14 Mar 2018 07:43:01 +0000 (20:43 +1300)]
cargo fmt
Nick Cameron [Mon, 12 Mar 2018 07:56:02 +0000 (20:56 +1300)]
Reimplement import reordering.
Nick Cameron [Mon, 12 Mar 2018 04:24:04 +0000 (17:24 +1300)]
format code and tests
Nick Cameron [Mon, 12 Mar 2018 03:53:06 +0000 (16:53 +1300)]
Reorder imports by default
Nick Cameron [Mon, 19 Mar 2018 02:13:47 +0000 (15:13 +1300)]
Merge pull request #2542 from topecongiro/macro-2.0
Handle macro arguments which exceeds max width
Seiichi Uchida [Sun, 18 Mar 2018 05:29:36 +0000 (14:29 +0900)]
Put a space before colon that appears after a meta variable
Closes #2534.
Seiichi Uchida [Sun, 18 Mar 2018 05:08:24 +0000 (14:08 +0900)]
Put spaces around braces
Seiichi Uchida [Sun, 18 Mar 2018 04:49:06 +0000 (13:49 +0900)]
Add some doc comments and factor out add_repeat and add_delimited
Seiichi Uchida [Sun, 18 Mar 2018 04:12:16 +0000 (13:12 +0900)]
Handle binary operators and lifetimes
Seiichi Uchida [Sun, 18 Mar 2018 03:33:59 +0000 (12:33 +0900)]
Break before meta variables when using multiple lines
Seiichi Uchida [Sun, 18 Mar 2018 03:33:30 +0000 (12:33 +0900)]
Remove has_prefix_space
Seiichi Uchida [Sat, 17 Mar 2018 16:08:18 +0000 (01:08 +0900)]
Format macro arguments with vertical layout
Seiichi Uchida [Sat, 17 Mar 2018 16:08:10 +0000 (01:08 +0900)]
Remove unit tests
Seiichi Uchida [Sat, 17 Mar 2018 16:08:02 +0000 (01:08 +0900)]
Update tests
Nick Cameron [Sun, 18 Mar 2018 19:55:35 +0000 (08:55 +1300)]
Merge pull request #2541 from topecongiro/issue-2358
Skip name replacement in comments and strings
Nick Cameron [Sun, 18 Mar 2018 19:53:31 +0000 (08:53 +1300)]
Merge pull request #2540 from topecongiro/version
Fix print_version
Seiichi Uchida [Sat, 17 Mar 2018 05:59:39 +0000 (14:59 +0900)]
Remove FIXME about duplicated code
Seiichi Uchida [Sat, 17 Mar 2018 05:59:26 +0000 (14:59 +0900)]
Skip name replacement in comments and strings
Seiichi Uchida [Sat, 17 Mar 2018 05:58:56 +0000 (14:58 +0900)]
Add a test for #2538
Seiichi Uchida [Sat, 17 Mar 2018 03:16:15 +0000 (12:16 +0900)]
Fix print_version
topecongiro [Thu, 15 Mar 2018 23:58:25 +0000 (08:58 +0900)]
0.4.1
topecongiro [Thu, 15 Mar 2018 23:52:30 +0000 (08:52 +0900)]
Cargo update
Remove `rustc-ap-rustc_errors` from dependencies since it
is re-exported from `rustc-ap-syntax`.
Nick Cameron [Thu, 15 Mar 2018 18:30:30 +0000 (07:30 +1300)]
Merge pull request #2509 from topecongiro/issue-2493
Overflow the last rhs of a binary expression
Nick Cameron [Thu, 15 Mar 2018 18:26:50 +0000 (07:26 +1300)]
Merge pull request #2533 from topecongiro/rustc-ap-syntax
Update to the latest rustc-ap-syntax
Seiichi Uchida [Thu, 15 Mar 2018 09:55:52 +0000 (18:55 +0900)]
Call syntax::with_globals before using a parser
Seiichi Uchida [Thu, 15 Mar 2018 09:55:31 +0000 (18:55 +0900)]
Cargo update
Update `rustc-ap-syntax` to `67.0.0`.
Seiichi Uchida [Tue, 13 Mar 2018 16:16:57 +0000 (01:16 +0900)]
Merge branch 'matthew-mcallister-attrib-block-expr'
Matthew McAllister [Sat, 21 Oct 2017 05:09:45 +0000 (22:09 -0700)]
Format attributes on block expressions
Seiichi Uchida [Tue, 13 Mar 2018 15:38:42 +0000 (00:38 +0900)]
Update CHANGELOG
Nick Cameron [Mon, 12 Mar 2018 03:25:31 +0000 (16:25 +1300)]
Merge pull request #2522 from topecongiro/ignore-config-option
Add ignore config option
Nick Cameron [Mon, 12 Mar 2018 03:25:12 +0000 (16:25 +1300)]
Merge pull request #2528 from topecongiro/rfc/trait-impl-where
Implement RFC style for trait
topecongiro [Sun, 11 Mar 2018 23:41:19 +0000 (08:41 +0900)]
Simplify IgnoreList
Seiichi Uchida [Sat, 10 Mar 2018 06:23:42 +0000 (15:23 +0900)]
Simplify join_bounds()
Seiichi Uchida [Sat, 10 Mar 2018 06:11:49 +0000 (15:11 +0900)]
Add a test for #2497
Closes #2497.
Seiichi Uchida [Sat, 10 Mar 2018 05:57:31 +0000 (14:57 +0900)]
Update tests
This is an unintentional side effect of this PR. Nonetheless the diff looks
harmless to me, and it is only relevant when `indent_style = Visual`.
So I think this is ok.
Seiichi Uchida [Sat, 10 Mar 2018 05:55:30 +0000 (14:55 +0900)]
Modify the placement of the opening brace of trait
Put the opening brace on the next line if
1. putting it one the current line exceeds max width.
2. trait bounds uses multiple lines.
Seiichi Uchida [Sat, 10 Mar 2018 05:54:13 +0000 (14:54 +0900)]
Use rewrite_assign_rhs for rewriting bounds
Seiichi Uchida [Sat, 10 Mar 2018 05:35:53 +0000 (14:35 +0900)]
Add rewrite_assign_rhs_with
It is like `rewrite_assign_rhs` but lets us force to put the rhs on the next
line if it uses multiple lines.
This lets us avoid duplicating logic for choosing whether to put stuff on the
same line or the next line.
Seiichi Uchida [Sat, 10 Mar 2018 05:30:47 +0000 (14:30 +0900)]
Update tests for traits with long bounds
The colon should be next to the ident instead of on the next line.
Seiichi Uchida [Sat, 10 Mar 2018 05:29:01 +0000 (14:29 +0900)]
Update tests for braces on trait
Test that the opening brace of trait with long name or bounds with multiple
lines will be put on the next line.
Nick Cameron [Sun, 11 Mar 2018 22:26:12 +0000 (11:26 +1300)]
Merge pull request #2513 from rtsuk/master
Restore cargo fmt behavior in workspaces
Nick Cameron [Sun, 11 Mar 2018 22:25:40 +0000 (11:25 +1300)]
Merge pull request #2527 from topecongiro/issue-2526
Check whether '\\'' is char literal or lifetime
Nick Cameron [Sun, 11 Mar 2018 22:21:09 +0000 (11:21 +1300)]
Merge pull request #2524 from topecongiro/issue-2523
Do not unindent code block in comments with unformattable macro
Nick Cameron [Sun, 11 Mar 2018 22:18:14 +0000 (11:18 +1300)]
Merge pull request #2516 from topecongiro/issue-2510
Make rewrite_call_inner more generic
Seiichi Uchida [Sat, 10 Mar 2018 12:24:35 +0000 (21:24 +0900)]
Merge pull request #2529 from dlukes/feat/enable-doctests
Enable doctests
David Lukes [Sat, 10 Mar 2018 08:57:01 +0000 (09:57 +0100)]
Enable doctests
Doctests were disabled globally because up until #2456, they were just
formatting examples which were not supposed to compile. Now that there
is one runnable doctest, I disabled the other ones individually (by
adding the ignore directive).
I also added some empty lines around the code blocks to avoid the
following warning and instead ignore the code blocks cleanly:
WARNING: ... Code block is not currently run as a test, but will in
future versions of rustdoc. Please ensure this code block is a runnable
test, or use the `ignore` directive.
See rust-lang/rust#28712 for further details.
Seiichi Uchida [Sat, 10 Mar 2018 02:53:15 +0000 (11:53 +0900)]
Merge pull request #2525 from Eijebong/dedup
Dedupe syn/quote
Seiichi Uchida [Fri, 9 Mar 2018 16:19:38 +0000 (01:19 +0900)]
Check whether '\\'' is char literal or lifetime
Seiichi Uchida [Fri, 9 Mar 2018 16:19:26 +0000 (01:19 +0900)]
Add a test for #2526
Bastien Orivel [Fri, 9 Mar 2018 15:11:51 +0000 (16:11 +0100)]
Dedupe syn/quote
Rob Tsuk [Fri, 9 Mar 2018 14:40:39 +0000 (07:40 -0700)]
Specify required version of cargo_metadata
Rob Tsuk [Thu, 8 Mar 2018 14:26:03 +0000 (07:26 -0700)]
Canonicalise the paths
Rob Tsuk [Tue, 6 Mar 2018 14:28:08 +0000 (07:28 -0700)]
Restore cargo fmt behavior in workspaces
Previously, cargo fmt invoked without parameters would
only format the crate in the current directory, even if
the crate was part of a workspace. This patch restores
that behavior.
topecongiro [Fri, 9 Mar 2018 08:17:55 +0000 (17:17 +0900)]
Format macro call with item arguments
topecongiro [Fri, 9 Mar 2018 08:10:20 +0000 (17:10 +0900)]
Avoid unindenting code block in comment with unformattable macro
`format_code_block` formats the given `code_snippet` by enclosing it inside
`fn main` block. Previously we did not add indentation to the `code_snippet`
before formatting it. This works fine as long as we can format the given
`code_snippet`, but when the code block has unformattable macro, they gets
unindented. This commit fixes it by adding proper indentation before formatting
the `code_snippet`.
For example, when formatting the following code block,
```rust
some_macro!(pub fn foo() {
println!("Don't unindent me!");
});
```
previously we enclosed it like this:
```rust
fn main() {
some_macro!(pub fn foo() {
println!("Don't unindent me!");
});
}
```
with this PR, we will enclose it like this:
```rust
fn main() {
some_macro!(pub fn foo() {
println!("Don't unindent me!");
});
}
```
Closes #2523.
topecongiro [Fri, 9 Mar 2018 08:09:56 +0000 (17:09 +0900)]
Add a test for #2523
Seiichi Uchida [Wed, 7 Mar 2018 10:29:42 +0000 (19:29 +0900)]
Use Option<SeparatorTactic> over bool to control trailing comma
Seiichi Uchida [Wed, 7 Mar 2018 06:53:17 +0000 (15:53 +0900)]
Add a test for #2510
Closes #2510.
Seiichi Uchida [Wed, 7 Mar 2018 06:49:55 +0000 (15:49 +0900)]
Make INDENT_BUFFER longer
Avoid panicking when indent whose width is 80 called `to_string()`.
Seiichi Uchida [Wed, 7 Mar 2018 06:49:15 +0000 (15:49 +0900)]
Update tests
Seiichi Uchida [Wed, 7 Mar 2018 06:48:47 +0000 (15:48 +0900)]
Use overflow::rewrite_with_angle_brackets to rewrite generics
Seiichi Uchida [Wed, 7 Mar 2018 06:40:52 +0000 (15:40 +0900)]
Add overflow module
This commit adds `overflow` module. This module provides two APIs.
`rewrite_with_parens` is basically the same as `rewrite_call_inner`.
`rewrite_with_angle_brackets` is used for rewriting generics and types.
Seiichi Uchida [Wed, 7 Mar 2018 06:37:44 +0000 (15:37 +0900)]
Use RefCell for RewriteContext fields
Seiichi Uchida [Fri, 9 Mar 2018 04:27:43 +0000 (13:27 +0900)]
Add ignore config option
For example, with the following config file, rustfmt will ignore `src/types.rs`,
`src/foo/bar.rs` and every file under `examples/` directory.
```toml
[ignore]
files = [
"src/types.rs",
"src/foo/bar.rs",
]
directories = [
"examples",
]
```
Nick Cameron [Fri, 9 Mar 2018 02:18:53 +0000 (15:18 +1300)]
Merge pull request #2521 from topecongiro/issue-2520
Fix bugs when rewriting doc comments with code block
Nick Cameron [Fri, 9 Mar 2018 02:16:30 +0000 (15:16 +1300)]
Merge pull request #2519 from topecongiro/nested-parens
Remove nested parens
Nick Cameron [Fri, 9 Mar 2018 02:15:21 +0000 (15:15 +1300)]
Merge pull request #2518 from topecongiro/issue-2491
Disallow combining parens and brackets in impl
Nick Cameron [Fri, 9 Mar 2018 01:51:27 +0000 (14:51 +1300)]
Catch panics in the parser before they crash rustfmt
Closes #753
Seiichi Uchida [Fri, 9 Mar 2018 00:46:43 +0000 (09:46 +0900)]
Keep code block without correct backticks enclosing
Seiichi Uchida [Fri, 9 Mar 2018 00:30:47 +0000 (09:30 +0900)]
Restrict the width of doc comments with comment_width
See the diff in tests/target/enum.rs for an example.
Seiichi Uchida [Fri, 9 Mar 2018 00:29:08 +0000 (09:29 +0900)]
Fix a bug in attr::take_while_with_pred
Closes #2520.
Seiichi Uchida [Fri, 9 Mar 2018 00:28:49 +0000 (09:28 +0900)]
Add a test for #2520
Nick Cameron [Thu, 8 Mar 2018 22:15:16 +0000 (11:15 +1300)]
List limitations in the README
Closes #2109