Nick Cameron
593ac525ae
Merge pull request #3138 from topecongiro/issue-3137
...
Simplify handling of parens around generic bound trait
2018-10-26 21:26:26 +13:00
Seiichi Uchida
7093bbe2ff
Simplify handling parens on generic bound trait
2018-10-26 16:39:35 +09:00
Seiichi Uchida
2d0487164f
Add a test for #3137
2018-10-26 16:36:01 +09:00
Nick Cameron
284583fade
Merge pull request #3134 from otavio/issue-3104
...
Stabilize `edition` configuration option
2018-10-25 15:03:59 +13:00
Otavio Salvador
9c3ae2d951
Stabilize edition
configuration option
...
Refs: #3104 .
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
2018-10-24 22:49:17 -03:00
Nick Cameron
faac101984
Merge pull request #3133 from otavio/rework-readme
...
README: remove old requirement for Rust 2018 edition use
2018-10-25 14:35:42 +13:00
Otavio Salvador
b18935047c
README: remove old requirement for Rust 2018 edition use
...
From now on, the `Cargo.toml` is taken into account when triggering
formatting using `cargo fmt`.
It is considered editor's duty to pass the proper `--edition` argument
for `rustfmt` if it is being called manually.
Refs: #3104 .
Refs: #3129 .
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
2018-10-24 21:59:43 -03:00
Nick Cameron
6739dbe77d
Merge pull request #3129 from otavio/issue-3104
...
cargo-fmt: detect Rust edition in use
2018-10-25 13:39:40 +13:00
Nick Cameron
fbeabe9547
Merge pull request #3113 from scampi/issue3105
...
Fix handling of code that is annotated with rustfmt::skip.
2018-10-25 12:09:12 +13:00
Otavio Salvador
de0b661bfa
cargo-fmt: Take into account the edition for each target
...
When formatting the crate, with `cargo fmt`, it parses each target
with the specific Rust edition.
Fixes : #3104 .
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
2018-10-24 10:01:08 -03:00
Stéphane Campinas
2f5d864c08
keep track of lines which formatting was disabled in order to prevent indentation which would cause code right-shifting
2018-10-24 12:11:11 +02:00
Stéphane Campinas
9c75a15f4c
Fix handling of code that is annotated with rustfmt::skip.
...
A rustfmt::skip'ed block is indented although original lines are
returned. In order to resolve this, the leading whitespaces are trimmed
on each line while retaining the layout; this leaves the skipped code
to be indented as necessary by the caller.
2018-10-24 12:11:11 +02:00
Nick Cameron
4789f65041
Merge pull request #3130 from JoshBrudnak/master
...
Added crates to the non-alphabetical treated imports
2018-10-24 18:13:42 +13:00
Nick Cameron
c3ad58c381
Remove the source test file
2018-10-24 18:13:26 +13:00
Nick Cameron
19d60f8137
Revert "Use width_heuristics
in the options docs"
...
This reverts commit fa3cadf62c
.
2018-10-24 15:07:09 +13:00
Nick Cameron
fe50729b6f
Merge pull request #3116 from kellerkindt/patch-1
...
Add howto for CLion / IntelliJ IDE integration
2018-10-24 15:01:14 +13:00
JoshBrudnak
ce54aea4c8
Added test for crate non-alphabetizing
2018-10-23 19:00:42 -04:00
kellerkindt
cb99316c8a
Add howto for CLion / IntelliJ IDE integration
2018-10-24 00:34:01 +02:00
JoshBrudnak
799005f6ae
Treat crates non-alphabetically Fixes : #3118
2018-10-23 07:10:00 -04:00
Otavio Salvador
e41fcb137c
rustfmt: add support to specify the Rust edition as argument
...
The new `--edition` command line argument allow the setting of the
desired Rust edition to be used.
Refs: #3104 .
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
2018-10-23 02:33:38 -03:00
Otavio Salvador
2eab9714e4
lib: export config::Edition so it can be used externally
...
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
2018-10-23 02:33:36 -03:00
Otavio Salvador
584d871494
config: use 2015 as default Edition
...
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
2018-10-23 02:33:33 -03:00
Otavio Salvador
38e7f249d2
Cargo.lock: update cargo_metadata
to 0.6.1 release
...
The update is especially important as it adds support for the
`edition` field handling, when parsing `cargo` metadata.
Refs: #3104 .
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
2018-10-23 02:33:30 -03:00
Otavio Salvador
e9fa99d8b8
rustfmt: avoid duplicating the error handling for --emit
...
There is no need to produce the error message again as it is already
produced by the helper method that does the emit mode validation.
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
2018-10-23 02:33:25 -03:00
Nick Cameron
fa3cadf62c
Use width_heuristics
in the options docs
...
It was using an older name
2018-10-23 14:59:14 +13:00
Nick Cameron
825207dd2e
Merge pull request #3126 from topecongiro/issue-3117
...
Use correct width when formatting type on local statement
2018-10-23 10:35:32 +13:00
Seiichi Uchida
a8d687499e
Merge pull request #3114 from matthiaskrgr/typos
...
fix a few typos found via codespell.
2018-10-22 22:22:31 +09:00
Seiichi Uchida
086c183447
Use correct width when formatting type on local statement
2018-10-22 22:20:51 +09:00
Seiichi Uchida
cf44c079c1
Add a test for #3117
2018-10-22 22:20:48 +09:00
Matthias Krüger
b25f974c0d
fix a few typos found via codespell.
2018-10-19 12:28:00 +02:00
Seiichi Uchida
7d713a2827
Merge pull request #3115 from matthiaskrgr/clippy
...
fix a couple of clippy lint warnings
2018-10-19 17:05:33 +09:00
Matthias Krüger
8c996331cc
fix a couple of clippy lint warnings
...
simplify a comparison with "true"
fn can_be_overflowed: remove unused lifetime
fn rewrite_pairs_one_line: pass "list" by reference (it is not consumed in the function)
fn span_for_token_stream: pass "token_stream" by reference since it is not consumed
use tool lints for clippy suppressions
2018-10-19 01:11:28 +02:00
Nick Cameron
e633f2b3f5
Merge pull request #3109 from scampi/issue-3038
...
force a newline after the `if` condition if there is a different indentation level
2018-10-18 19:56:17 +13:00
Nick Cameron
750b252613
Update rustc-ap-syntax
2018-10-18 15:44:31 +13:00
Nick Cameron
4bb84f6002
Remove NLL feature
...
And do some refactoring in comments.rs
Closes #3107
2018-10-18 15:39:11 +13:00
Nick Cameron
613dfcc521
Remove various feature flags
2018-10-18 15:38:57 +13:00
Alex Crichton
3d07646858
Add rustc-workspace-hack
workaround like RLS/Cargo
2018-10-17 12:47:21 -07:00
Seiichi Uchida
8c4e92a14e
Catch parser panic in format_snippet ( #3103 )
2018-10-17 14:21:04 +09:00
Stéphane Campinas
30c06da781
force a newline after the if
condition if there is a different
...
indentation level
2018-10-15 23:24:35 +02:00
Nick Cameron
c09d7ef088
Merge pull request #3106 from sinkuu/clippy
...
Clippy and cleanups
2018-10-16 09:09:56 +13:00
Nick Cameron
5f02be6294
Merge pull request #3102 from nrc/arm-guard-newline
...
Only put `{` on a newline in a match arm where necessary
2018-10-16 09:06:15 +13:00
Nick Cameron
bc4414e53c
Merge pull request #3101 from nrc/pair-newline
...
Simplify multi-lining binop exprs
2018-10-16 09:01:40 +13:00
Shotaro Yamada
e64a6d371b
Cargo.lock
2018-10-15 23:59:24 +09:00
Shotaro Yamada
6c964fd030
Reduce allocations
2018-10-15 23:59:08 +09:00
Shotaro Yamada
6fb188bd43
Use concat() instead of join("")
2018-10-15 23:59:08 +09:00
Shotaro Yamada
6380f88527
Cleanup
2018-10-15 23:59:08 +09:00
Shotaro Yamada
751bcf5fa0
Clippy
2018-10-15 23:59:08 +09:00
Shotaro Yamada
d55729987f
Use UnOp::to_string
2018-10-15 23:59:08 +09:00
Shotaro Yamada
094e687e42
Remove an unsafe code
2018-10-15 23:58:59 +09:00
Daniele D'Orazio
075aa909cd
try to fix comment bad wrapping ( #3099 )
2018-10-15 11:18:37 +09:00