Commit Graph

3342 Commits

Author SHA1 Message Date
Seiichi Uchida
a7060f9fdf Remove excessive block() and block_only()
Since we now use the same indent style for every expressions, these safe guards
can be removed.
2017-12-10 23:39:09 +09:00
Seiichi Uchida
b749aa0699 Add a test fot #2264 2017-12-10 23:38:30 +09:00
Seiichi Uchida
e3d2f2c2b1 Cargo fmt 2017-12-10 21:54:26 +09:00
Seiichi Uchida
90383d7426 Do not set inside_macro flag when converting try!() to '?'
This will keep rustfmt idempotent when using 'use_try_shorthand' config option.
2017-12-10 21:53:01 +09:00
Seiichi Uchida
42726906f7 Allow struct to be multi-lined in closure's body without block 2017-12-10 21:52:23 +09:00
Seiichi Uchida
bd6bef8cfa Move macro check to is_block_closure_forced() 2017-12-10 21:49:59 +09:00
Seiichi Uchida
812fc4ca56 Remove and_one_line() 2017-12-10 21:30:12 +09:00
Seiichi Uchida
5871967312 Verify whether adding block is safe in rewrite_closure_with_block()
Also ensure that the expression is nested to avoid false-positive.
2017-12-10 21:27:28 +09:00
Seiichi Uchida
4110c7b8c5 Add a test for #2262 2017-12-10 21:19:51 +09:00
Christopher Durham
7e2c3cb857 unstable_features without CFG_RELEASE_CHANNEL
Per discussion in #2228

https://github.com/rust-lang-nursery/rustfmt/pull/2228#issuecomment-348893294
https://github.com/rust-lang-nursery/rustfmt/pull/2228#issuecomment-349799548

Inline comment should explain the reasoning.
2017-12-10 01:01:36 -05:00
Seiichi Uchida
5624175574 Format macro in pattern position 2017-12-10 00:22:00 +09:00
Seiichi Uchida
0909ecbac7 Add tests for macro in pattern position 2017-12-10 00:21:49 +09:00
Seiichi Uchida
234c7da871 Handle nested imports 2017-12-09 16:45:25 +09:00
Seiichi Uchida
d4a569848e Add tests for nested imports 2017-12-09 16:45:20 +09:00
topecongiro
adc3b12ad4 Remove println! debug :( 2017-12-08 17:48:49 +09:00
topecongiro
821d04b2a4 Do not report errors on skipped items or statements 2017-12-08 17:46:43 +09:00
topecongiro
5e6bb3edb0 Keep track of line number in visitor 2017-12-08 16:59:04 +09:00
Nick Cameron
97fd517593
Merge pull request #2247 from topecongiro/optimize-snippet
Optimize snippet()
2017-12-08 20:39:01 +13:00
Nick Cameron
5f50f42368
Merge pull request #2229 from CAD97/patch-2
[Travis] Fix python/travis-cargo on macOS
2017-12-08 17:28:01 +13:00
Seiichi Uchida
3ebe054362 Replace into() on &str with to_owned() 2017-12-08 13:07:42 +09:00
Seiichi Uchida
c776443981 Remove unused lifetime 2017-12-08 13:07:28 +09:00
Seiichi Uchida
23fa0bc3ef
Merge pull request #2240 from davidalber/revisit-2219
Adding `print!` to the list of specially-formatted `format!`-like macros
2017-12-07 17:37:01 +09:00
Seiichi Uchida
d6d8d86e94 Replace &Rc<String> with &str 2017-12-07 17:32:19 +09:00
David Alber
9a25458179 Adding tests for assert!, write!, and writeln! 2017-12-06 22:42:33 -08:00
David Alber
0f561a1447 Moving panic! into the list of macros from the Standard Library 2017-12-06 22:23:02 -08:00
Seiichi Uchida
c0eb8c3212 Add FmtVisitor::from_context() 2017-12-07 13:57:54 +09:00
Seiichi Uchida
1d9a10e00e Use explicit lifetime to get rid of unsafe code
at least this is why we use Rust
2017-12-07 13:57:54 +09:00
Seiichi Uchida
7c4a84751f Convert '&str' into 'String' whenever necessary 2017-12-07 13:57:52 +09:00
Christopher Durham
ba4832a14a
Remove excess trailing && 2017-12-06 17:47:48 -05:00
Nick Cameron
e65ceb2062
Merge pull request #2248 from alexheretic/master
Fix config warnings leaking into stdout
2017-12-07 08:47:58 +13:00
Alex Butler
db0a72318a Fix config warnings leaking into stdout 2017-12-06 16:23:18 +00:00
Seiichi Uchida
69a15b2eee Update FmtVisitor::from_codemap() 2017-12-06 22:51:52 +09:00
Seiichi Uchida
0928762562 Use SnippetProvider in FmtVisitor and RewriteContext 2017-12-06 22:49:49 +09:00
Seiichi Uchida
98860ab890 Add SnippetProvider 2017-12-06 22:48:48 +09:00
Seiichi Uchida
004f7837f0
Merge pull request #2246 from divarvel/patch-1
Fix format for `spaces_around_ranges` example
2017-12-06 21:38:22 +09:00
Clément Delafargue
3be1cb64a8
Fix format for spaces_around_ranges example 2017-12-06 11:19:23 +01:00
Christopher Durham
0a6ce8f187
Chain commands by &&
See https://github.com/rust-lang-nursery/rustfmt/pull/2229/files#r155177741 for reasoning
2017-12-06 04:12:34 -05:00
Nick Cameron
0432d4db35
Merge pull request #2243 from topecongiro/issue-2241
Use package name instead of target name for --package filter
2017-12-06 17:36:59 +13:00
Seiichi Uchida
b8448f6223 Use package name instead of target name for --package filter 2017-12-06 12:41:04 +09:00
Nick Cameron
b07e4339f0
Merge pull request #2221 from topecongiro/rfc/blank-lines
Keep vertical spaces between items or statements within range
2017-12-06 15:52:19 +13:00
Christopher Durham
0145ba7082
Only export path for linux
as per [@davidalber's advice](https://github.com/rust-lang-nursery/rustfmt/pull/2229#discussion_r155129274)
2017-12-05 21:42:00 -05:00
David Alber
eb42956e84 Adding print! specially-formatted format!-like macros list
This commit corrects what appears to be an accidental inclusion of
`panic!` twice in the list resulting from the union of ffbe52e and
aeb3398.
2017-12-05 16:56:56 -08:00
David Alber
8c51122f54 Adding tests for all specially-formatted format!-like macros 2017-12-05 16:56:36 -08:00
Seiichi Uchida
9ed05410a3 Add more tests 2017-12-05 17:45:19 +09:00
Seiichi Uchida
04449c6622 Handle cases when bound changed from the default 2017-12-05 17:38:27 +09:00
Seiichi Uchida
2302e904e9 Add a test for 'blank_lines_lower_bound = 1' 2017-12-05 17:38:07 +09:00
Seiichi Uchida
39a304f529 Update tests 2017-12-05 17:16:04 +09:00
Seiichi Uchida
454c85e359 Cargo fmt 2017-12-05 17:15:58 +09:00
Seiichi Uchida
1d1305eef8 Take into account a trailing newline in buffer 2017-12-05 17:15:42 +09:00
Seiichi Uchida
5632a7c075 Process blank lines if only they're within file lines range 2017-12-05 17:14:57 +09:00