]>
git.lizzy.rs Git - rust.git/log
Nick Cameron [Sun, 29 Apr 2018 23:06:33 +0000 (11:06 +1200)]
Merge pull request #2656 from topecongiro/issue-2594
Use consistent formatting for empty enum and struct
Ryan Leung [Sat, 28 Apr 2018 07:08:58 +0000 (15:08 +0800)]
add rustc_target to dependencies (#2660)
topecongiro [Sat, 28 Apr 2018 05:07:10 +0000 (14:07 +0900)]
Temporarily fix tests
cc #2655.
topecongiro [Sat, 28 Apr 2018 05:03:14 +0000 (14:03 +0900)]
Use format_empty_struct_or_tuple over format_missing_no_indent
Closes #2594.
topecongiro [Sat, 28 Apr 2018 04:59:54 +0000 (13:59 +0900)]
Use format_empty_struct_or_tuple
topecongiro [Sat, 28 Apr 2018 04:59:03 +0000 (13:59 +0900)]
Factor out a formatting routine for empty struct and tuple
topecongiro [Sat, 28 Apr 2018 04:24:05 +0000 (13:24 +0900)]
Use a glob import for import utils
topecongiro [Sat, 28 Apr 2018 04:23:50 +0000 (13:23 +0900)]
Add tests for #2594
Nick Cameron [Fri, 27 Apr 2018 03:14:47 +0000 (15:14 +1200)]
Merge pull request #2650 from thibaultdelor/useFailureCrate
Use failure crate
Nick Cameron [Thu, 26 Apr 2018 23:12:25 +0000 (11:12 +1200)]
Harden tests to not rely on CWD
Nick Cameron [Thu, 26 Apr 2018 22:41:29 +0000 (10:41 +1200)]
Merge pull request #2653 from Xanewok/dont-rerun-on-git
Ignore checking inexistent .git/HEAD in build.rs
Igor Matuszewski [Thu, 26 Apr 2018 22:09:01 +0000 (00:09 +0200)]
Ignore checking inexistent .git/HEAD in build.rs
Tibo [Thu, 26 Apr 2018 04:20:06 +0000 (14:20 +1000)]
Allow `io::Error` to live longer before being wrapped in a `failure::Error`
Tibo [Thu, 26 Apr 2018 03:48:48 +0000 (13:48 +1000)]
Replace completely std::error with failure crate
Tibo [Tue, 24 Apr 2018 08:10:09 +0000 (18:10 +1000)]
Use failure for FormattingError
Tibo [Tue, 24 Apr 2018 05:45:28 +0000 (15:45 +1000)]
Replace std::Error with failure for FormatDiff
Seiichi Uchida [Tue, 24 Apr 2018 22:21:23 +0000 (07:21 +0900)]
Cargo update and clippy (#2643)
Nick Cameron [Mon, 23 Apr 2018 04:32:36 +0000 (16:32 +1200)]
Merge pull request #2640 from rizakrko/master
keep auto trait
Roman Stoliar [Sun, 22 Apr 2018 22:31:21 +0000 (01:31 +0300)]
added test for #2637
Roman Stoliar [Fri, 20 Apr 2018 14:31:31 +0000 (17:31 +0300)]
keep auto trait
Nick Cameron [Fri, 20 Apr 2018 10:10:48 +0000 (22:10 +1200)]
Make some more stuff private
0.6
Nick Cameron [Fri, 20 Apr 2018 09:08:20 +0000 (21:08 +1200)]
Refactor to make a sensible public API
0.5 - lots of breaking changes
cc #2639
Nick Cameron [Fri, 20 Apr 2018 02:17:56 +0000 (14:17 +1200)]
Get exit codes right
Nick Cameron [Fri, 20 Apr 2018 02:02:44 +0000 (14:02 +1200)]
Add a verbose-diff option
And don't print end of line characters by default in diffs
cc #2536
Nick Cameron [Fri, 20 Apr 2018 01:42:27 +0000 (13:42 +1200)]
Refactoring around write mode in main
Nick Cameron [Fri, 20 Apr 2018 01:24:45 +0000 (13:24 +1200)]
Trivial refactoring in bin
David Barsky [Thu, 19 Apr 2018 23:14:11 +0000 (19:14 -0400)]
Implemented rough draft of `check` write mode. (#2539)
* Add rough draft of `check` mode. Not unit tested.
* Added assert-cli; simple test case for `--write-mode=check`
* Lightly documented `check` WriteMode
* wrote clearer phrasing for config::options::WriteMode::Check
* Implemented default for WriteMode where default is Overwrite
* Simplified exit code handling
* updated README.md as per @nrc' comment
* collapsed exit-code handling
* Removed write_mode from Summary, introduced partial option parsing earlier
* Handle write-mode parsing in a slightly better way.
Nick Cameron [Thu, 19 Apr 2018 18:56:03 +0000 (06:56 +1200)]
Merge pull request #2632 from phansch/master
Link to official nightly documentation
Philipp Hansch [Thu, 19 Apr 2018 06:22:13 +0000 (08:22 +0200)]
Link to official nightly documentation
Since https://github.com/rust-lang/rust-central-station/pull/40 has been
merged, we have a stable location for the nightly docs.
Nick Cameron [Tue, 17 Apr 2018 20:19:57 +0000 (08:19 +1200)]
Update rustc_ap_syntax
Mateusz Mikuła [Tue, 17 Apr 2018 14:04:15 +0000 (16:04 +0200)]
Fix example for reorder_imports (#2628)
Default value changed in #2605
Nick Cameron [Tue, 17 Apr 2018 08:16:48 +0000 (20:16 +1200)]
Merge pull request #2624 from sinkuu/dots
Add spaces between consecutive `..` `..=`
Shotaro Yamada [Mon, 16 Apr 2018 08:11:50 +0000 (17:11 +0900)]
Add spaces between consecutive `..` `..=`
csmoe [Sun, 15 Apr 2018 09:49:47 +0000 (17:49 +0800)]
update rustc-ap-syntax (#2622)
* update rustc-ap-syntax-100.0.0
Nick Cameron [Fri, 13 Apr 2018 22:20:08 +0000 (10:20 +1200)]
Fix tests
Nick Cameron [Fri, 13 Apr 2018 22:15:39 +0000 (10:15 +1200)]
Fallout from removing TupField
Nick Cameron [Fri, 13 Apr 2018 21:47:13 +0000 (09:47 +1200)]
Update rustc-ap-syntax
Nick Cameron [Thu, 12 Apr 2018 22:34:23 +0000 (10:34 +1200)]
Update rustc_ap_syntax
Nick Cameron [Thu, 12 Apr 2018 05:06:30 +0000 (17:06 +1200)]
nightly-0.4.2
Nick Cameron [Thu, 12 Apr 2018 05:05:34 +0000 (17:05 +1200)]
Fix tests
Nick Cameron [Thu, 12 Apr 2018 04:56:00 +0000 (16:56 +1200)]
Merge pull request #2618 from topecongiro/issue-1174
Output xml header and footer only once
Seiichi Uchida [Thu, 12 Apr 2018 04:45:12 +0000 (13:45 +0900)]
Output xml header and footer only once
Nick Cameron [Thu, 12 Apr 2018 04:40:06 +0000 (16:40 +1200)]
Merge pull request #2603 from topecongiro/merge-nested-imports
Merge imports
Nick Cameron [Thu, 12 Apr 2018 04:38:52 +0000 (16:38 +1200)]
Merge pull request #2617 from topecongiro/issue-2616
Preserve trailing comma on macro call when using mixed layout
Seiichi Uchida [Thu, 12 Apr 2018 03:48:27 +0000 (12:48 +0900)]
Cargo update
Seiichi Uchida [Thu, 12 Apr 2018 00:54:00 +0000 (09:54 +0900)]
Preserve trailing comma on macro call when using mixed layout
Nick Cameron [Tue, 10 Apr 2018 22:57:16 +0000 (10:57 +1200)]
Merge pull request #2605 from nrc/import-squelch
Coalesce some of the import options
Nick Cameron [Tue, 10 Apr 2018 22:50:19 +0000 (10:50 +1200)]
Review changes
Nick Cameron [Fri, 6 Apr 2018 09:11:50 +0000 (21:11 +1200)]
rebasing
Nick Cameron [Fri, 16 Mar 2018 08:28:02 +0000 (21:28 +1300)]
Update tests
Nick Cameron [Mon, 12 Mar 2018 04:24:04 +0000 (17:24 +1300)]
Squash the various 'reorder imports' option into one
cc #2185
Seiichi Uchida [Tue, 10 Apr 2018 03:36:41 +0000 (12:36 +0900)]
Resolve review comments
Seiichi Uchida [Fri, 6 Apr 2018 14:03:11 +0000 (23:03 +0900)]
Simplify UseTree::has_comment
Seiichi Uchida [Fri, 6 Apr 2018 13:35:04 +0000 (22:35 +0900)]
Merge imports with the same prefix into a single nested import
Seiichi Uchida [Fri, 6 Apr 2018 13:34:41 +0000 (22:34 +0900)]
Add merge_imports config option
Seiichi Uchida [Fri, 6 Apr 2018 13:32:30 +0000 (22:32 +0900)]
Add tests for merge_imports config option
Nick Cameron [Tue, 10 Apr 2018 03:07:57 +0000 (15:07 +1200)]
Merge pull request #2612 from peterhuene/suppress-unstable-config-options
Suppress unstable config options by default.
Nick Cameron [Tue, 10 Apr 2018 02:15:26 +0000 (14:15 +1200)]
Merge pull request #2613 from dwijnand/patch-1
specify nightly required to install from source
Dale Wijnand [Mon, 9 Apr 2018 21:54:17 +0000 (22:54 +0100)]
specify nightly required to install from source
when using stable cargo install fails due to #![feature] usage:
error[E0554]: #![feature] may not be used on the stable release channel
--> /Users/dnw/.cargo/registry/src/github.com-
1ecc6299db9ec823 /rustc-ap-serialize-67.0.0/lib.rs:24:1
|
24 | #![feature(rustc_private, box_syntax)]
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
error[E0554]: #![feature] may not be used on the stable release channel
--> /Users/dnw/.cargo/registry/src/github.com-
1ecc6299db9ec823 /rustc-ap-serialize-67.0.0/lib.rs:25:1
|
25 | #![feature(core_intrinsics)]
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
error[E0554]: #![feature] may not be used on the stable release channel
--> /Users/dnw/.cargo/registry/src/github.com-
1ecc6299db9ec823 /rustc-ap-serialize-67.0.0/lib.rs:26:1
|
26 | #![feature(i128_type)]
| ^^^^^^^^^^^^^^^^^^^^^^
error[E0554]: #![feature] may not be used on the stable release channel
--> /Users/dnw/.cargo/registry/src/github.com-
1ecc6299db9ec823 /rustc-ap-serialize-67.0.0/lib.rs:27:1
|
27 | #![feature(specialization)]
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^
error: aborting due to 4 previous errors
error: Could not compile `rustc-ap-serialize`.
warning: build failed, waiting for other jobs to finish...
error: failed to compile `rustfmt-nightly v0.4.1 (file:///d/rustfmt)`, intermediate artifacts can be found at `/d/rustfmt/target`
Peter Huene [Mon, 9 Apr 2018 07:43:17 +0000 (00:43 -0700)]
Suppress unstable config options by default.
This commit suppresses the output of unstable config options by default.
Users can specify the `--unstable-features` option to show the config options
that are unstable.
Fixes #2611.
Nick Cameron [Mon, 9 Apr 2018 09:07:49 +0000 (21:07 +1200)]
Try to fix a build regression before it happens
Nick Cameron [Mon, 9 Apr 2018 04:47:55 +0000 (16:47 +1200)]
Make `error_on_line_overflow` false by default
And improve docs, the error message, etc.
I think false is the better default since such errors should only occur due to a bug in Rustfmt and therefore most users should not be notified of it happening (although to be clear, it might be a 'bug' which only occurs with pathological input and therefore we won't fix it). The error has proven to be confusing and annoying in the past.
Closes #1080
Nick Cameron [Mon, 9 Apr 2018 04:31:53 +0000 (16:31 +1200)]
Reorder config options
cc #1974
Nick Cameron [Sun, 8 Apr 2018 21:54:07 +0000 (09:54 +1200)]
Fix test
Nick Cameron [Sun, 8 Apr 2018 21:49:39 +0000 (09:49 +1200)]
Merge pull request #2609 from csmoe/update_rustc_syntax
update rustc_ap_syntax
csmoe [Sun, 8 Apr 2018 14:18:18 +0000 (22:18 +0800)]
update rustc syntax 91.0.0
Seiichi Uchida [Fri, 6 Apr 2018 14:09:45 +0000 (23:09 +0900)]
Cargo update (#2602)
Update `rustc-ap-syntax` to 89.0.0 and fix up breaking changes.
Nick Cameron [Fri, 6 Apr 2018 03:32:05 +0000 (15:32 +1200)]
Merge pull request #2601 from topecongiro/fix-merge-mess
Fix up merge mess
Seiichi Uchida [Fri, 6 Apr 2018 01:31:57 +0000 (10:31 +0900)]
Fix up merge mess
Nick Cameron [Fri, 6 Apr 2018 00:41:13 +0000 (12:41 +1200)]
Merge pull request #2600 from i1skn/error_on_unformatted
Fix error_on_unformatted and skip_children override
Nick Cameron [Thu, 5 Apr 2018 23:12:53 +0000 (11:12 +1200)]
Merge pull request #2599 from topecongiro/issue-2596
Use multiple lines for imports list which exceeds max width
Nick Cameron [Thu, 5 Apr 2018 23:12:11 +0000 (11:12 +1200)]
Merge pull request #2593 from topecongiro/issue-2455
Add reorder_impl_items config option
Ivan Sorokin [Sat, 31 Mar 2018 12:27:39 +0000 (14:27 +0200)]
Fix error_on_unformatted and skip_children override
Currently, error_on_unformatted and skip_children options
specified in the config file are discarded.
This happens because CLI options have a higher priority,
but we coerce an absence of a `bool` option to `false`.
In this scenario, an absence of a `bool` option is indistinguishable
from explicetely set as `false`. We should coerce it to `None` instead,
so it does not override the one in the config file.
Nick Cameron [Thu, 5 Apr 2018 05:39:22 +0000 (17:39 +1200)]
Merge pull request #2576 from topecongiro/merge-imports
Use normalized form to format use items
Nick Cameron [Thu, 5 Apr 2018 05:36:15 +0000 (17:36 +1200)]
Merge pull request #2589 from topecongiro/issue-2588
Do not indent or unindent inside string literal
Nick Cameron [Thu, 5 Apr 2018 05:35:52 +0000 (17:35 +1200)]
Merge pull request #2581 from sinkuu/build_script
Rerun build.rs only when .git/HEAD or CFG_RELEASE_CHANNEL is changed
Nick Cameron [Thu, 5 Apr 2018 05:34:53 +0000 (17:34 +1200)]
Merge pull request #2580 from remram44/improve-where_single_line-help
Improve `where_single_line` help
Seiichi Uchida [Thu, 5 Apr 2018 04:27:42 +0000 (13:27 +0900)]
Add trailing comma when using mixed layout with block indent
Seiichi Uchida [Thu, 5 Apr 2018 04:24:18 +0000 (13:24 +0900)]
Put imports list on the next line if it exceeds max width
Seiichi Uchida [Thu, 5 Apr 2018 04:23:48 +0000 (13:23 +0900)]
Add a test for #2569
Seiichi Uchida [Mon, 2 Apr 2018 14:10:37 +0000 (23:10 +0900)]
Do not indent or unindent inside string literal
Closes #2588.
Seiichi Uchida [Mon, 2 Apr 2018 13:53:16 +0000 (22:53 +0900)]
Implement LineClasses
Seiichi Uchida [Mon, 2 Apr 2018 13:52:39 +0000 (22:52 +0900)]
Add tests for #2588
Seiichi Uchida [Wed, 4 Apr 2018 05:57:55 +0000 (14:57 +0900)]
Reorder impl items based on its kind
The ordering is defined as follows:
type < cosnt < macro < method
Items that are same kind will not be reordered: that is, the item
that an user has put first comes first.
Seiichi Uchida [Wed, 4 Apr 2018 05:57:30 +0000 (14:57 +0900)]
Add reorder_impl_items config option
memoryleak47 [Thu, 5 Apr 2018 03:47:09 +0000 (05:47 +0200)]
typo (#2598)
* typo
* more typos
Ryan Leung [Wed, 4 Apr 2018 02:02:01 +0000 (10:02 +0800)]
add tests for macro!(/* comment */) (#2592)
* add tests
Russell Cohen [Tue, 3 Apr 2018 02:10:50 +0000 (19:10 -0700)]
Include instructions to install on nightly (#2590)
Marthog [Sun, 1 Apr 2018 14:15:25 +0000 (16:15 +0200)]
Let --dump-default-config default to stdout #2579 (#2586)
Seiichi Uchida [Sun, 1 Apr 2018 14:14:52 +0000 (23:14 +0900)]
Merge pull request #2584 from sinkuu/cleanup
Misc cleanups
Shotaro Yamada [Sun, 1 Apr 2018 14:09:53 +0000 (23:09 +0900)]
Do not turn spaces in the beginning of the file into a newline (#2583)
Shotaro Yamada [Sun, 1 Apr 2018 12:47:55 +0000 (21:47 +0900)]
Fix typo
Shotaro Yamada [Sun, 1 Apr 2018 12:43:01 +0000 (21:43 +0900)]
Use ListItem::has_comment
Shotaro Yamada [Sun, 1 Apr 2018 12:35:51 +0000 (21:35 +0900)]
Remove redudant parens
Shotaro Yamada [Sun, 1 Apr 2018 12:21:52 +0000 (21:21 +0900)]
Return String instead of always returing Cow::Owned
Shotaro Yamada [Sun, 1 Apr 2018 12:10:31 +0000 (21:10 +0900)]
Remove stray comment
Its pointee was removed in
04a6d16c7b68587f8e9fa8a1e6715f80408b023b
Shotaro Yamada [Sun, 1 Apr 2018 10:35:00 +0000 (19:35 +0900)]
Do not collect into a Vec by hand
Shotaro Yamada [Sun, 1 Apr 2018 09:12:50 +0000 (18:12 +0900)]
Remove unnecessary `[..]`s
Shotaro Yamada [Sun, 1 Apr 2018 09:43:52 +0000 (18:43 +0900)]
Use Iterator methods
Shotaro Yamada [Sun, 1 Apr 2018 07:20:46 +0000 (16:20 +0900)]
Use str::repeat