]>
git.lizzy.rs Git - rust.git/log
mrBliss [Tue, 19 Apr 2016 18:19:14 +0000 (20:19 +0200)]
Format visibility of associated consts (#953)
Fixes #951.
Nick Cameron [Mon, 18 Apr 2016 19:44:25 +0000 (07:44 +1200)]
Merge pull request #950 from marcusklaas/extern-abi
Add option to force explicit extern ABI's
Marcus Klaas [Mon, 18 Apr 2016 16:39:40 +0000 (18:39 +0200)]
Add option to force explicit extern ABI's
Marcus Klaas de Vries [Sun, 17 Apr 2016 21:15:37 +0000 (23:15 +0200)]
Merge pull request #948 from flutterhash/master
Added option to configure if/else brace style
Thia Wyrod [Sun, 17 Apr 2016 17:01:16 +0000 (11:01 -0600)]
Added loop/match brace style control option
This adds Allman style loop/match braces as an alternative to the current
default style.
Thia Wyrod [Sat, 16 Apr 2016 23:33:17 +0000 (17:33 -0600)]
Added option to configure if/else brace style
Nick Cameron [Sat, 16 Apr 2016 22:23:48 +0000 (10:23 +1200)]
Merge pull request #947 from marcusklaas/match-pattern-limit
Fix off-by-one error in pattern formatting
Marcus Klaas [Sat, 16 Apr 2016 20:42:15 +0000 (22:42 +0200)]
Fix off-by-one error in pattern formatting
Kamal Marhubi [Sat, 16 Apr 2016 20:34:15 +0000 (16:34 -0400)]
rustfmt: Parse options once instead of once per file argument (#944)
`update_config()` was parsing the `write-mode` option once for each file
argument. This commit parses them once up front into a `CliOptions`
struct, which is then applied to the config before calling `run()`.
Nick Cameron [Sat, 16 Apr 2016 04:42:56 +0000 (16:42 +1200)]
Merge pull request #941 from marcusklaas/type-ascription
Format type ascription
Nick Cameron [Sat, 16 Apr 2016 04:42:17 +0000 (16:42 +1200)]
Merge pull request #942 from marcusklaas/break-continue-fix
Check length of break and continue expressions
Nick Cameron [Sat, 16 Apr 2016 04:41:21 +0000 (16:41 +1200)]
Merge pull request #938 from kamalmarhubi/rename-doc-hint
config: Rename get_variant_names to doc_hint
Marcus Klaas [Fri, 15 Apr 2016 16:11:20 +0000 (18:11 +0200)]
Check length of break and continue expressions
Marcus Klaas [Fri, 15 Apr 2016 15:56:08 +0000 (17:56 +0200)]
Format type ascription
Aleksey Kladov [Fri, 15 Apr 2016 14:52:21 +0000 (17:52 +0300)]
Don't print empty lines to stderr (#940)
Nick Cameron [Fri, 15 Apr 2016 08:52:08 +0000 (20:52 +1200)]
Fix closures again (#937)
* Fix closures again
Closes #934
Oh god, the rules for parsing closures are even more messed up than I thought - whether or not there is an inner block or depends not only on if there are braces, but also if there is a return type for the closure (!) and if there are statements in the block.
* Fix overflow
Kamal Marhubi [Fri, 15 Apr 2016 05:11:04 +0000 (01:11 -0400)]
config: Rename get_variant_names to doc_hint
The `ConfigType` trait is implemented for non-enum types, so the name no
longer makes perfect sense.
Nick Cameron [Fri, 15 Apr 2016 01:50:10 +0000 (13:50 +1200)]
Merge pull request #923 from matklad/proper-exit-code
return non-zero exit code if there are errors
Aleksey Kladov [Thu, 14 Apr 2016 23:51:50 +0000 (02:51 +0300)]
return non-zero exit code if there were errors
Nick Cameron [Thu, 14 Apr 2016 20:13:55 +0000 (08:13 +1200)]
Merge pull request #936 from marcusklaas/licenses
Add license stuff
Nick Cameron [Thu, 14 Apr 2016 20:13:26 +0000 (08:13 +1200)]
Merge pull request #935 from marcusklaas/issue-770
Add regression test for issue 770
Marcus Klaas [Thu, 14 Apr 2016 18:48:21 +0000 (20:48 +0200)]
Add license stuff
Marcus Klaas de Vries [Thu, 14 Apr 2016 18:42:38 +0000 (20:42 +0200)]
Fix brace indentation for impl items (#927)
Marcus Klaas [Thu, 14 Apr 2016 18:41:23 +0000 (20:41 +0200)]
Add regression test for issue 770
Nick Cameron [Wed, 13 Apr 2016 23:42:25 +0000 (11:42 +1200)]
Merge pull request #928 from matklad/patch-1
don't silence error unnecessary
Aleksey Kladov [Wed, 13 Apr 2016 22:39:39 +0000 (01:39 +0300)]
don't silence error unnecessary
This `if` was used to separate error output from the formatting output, when they both used stdout. It was useful for integration with tools, which can submit input to stdin and read pretty printed result from stdout without worrying about errors intermingled with the actual result.
But now we write errors to `stderr`, so the problem disappears and we can safely remove this `if`.
Errors should never pass silently, unless explicitly silenced.
Nick Cameron [Wed, 13 Apr 2016 21:32:30 +0000 (09:32 +1200)]
Merge pull request #926 from rust-lang-nursery/closures
Be careful about where we change braces in closures
Nick Cameron [Wed, 13 Apr 2016 20:36:59 +0000 (08:36 +1200)]
Be careful about where we change braces in closures
And some general refactoring of closure code.
Fixes #863
Nick Cameron [Wed, 13 Apr 2016 20:40:55 +0000 (08:40 +1200)]
Merge pull request #914 from kamalmarhubi/invalid-operation-result
rustfmt: Make error handling more idiomatic
Srinivas Reddy Thatiparthy [Wed, 13 Apr 2016 19:22:45 +0000 (00:52 +0530)]
Change stdout to stderr (#925)
Nick Cameron [Mon, 11 Apr 2016 23:05:06 +0000 (11:05 +1200)]
Merge pull request #921 from matklad/more-unification
unify format_string and format_file
Nick Cameron [Mon, 11 Apr 2016 23:04:33 +0000 (11:04 +1200)]
Fix the build
Nick Cameron [Mon, 11 Apr 2016 22:48:08 +0000 (10:48 +1200)]
Merge pull request #918 from rust-lang-nursery/ty-variadic
Handle variadic function types
Nick Cameron [Mon, 11 Apr 2016 09:20:03 +0000 (21:20 +1200)]
Handle variadic function types
Closes #842
Nick Cameron [Mon, 11 Apr 2016 22:47:08 +0000 (10:47 +1200)]
Merge pull request #912 from rust-lang-nursery/pat-simple-mixed
Change the logic around breaking multiple patterns in match arms
Nick Cameron [Mon, 11 Apr 2016 22:44:01 +0000 (10:44 +1200)]
Merge pull request #896 from erikjohnston/fn_arg_one_line
Add fn_arg_one_line option
Nick Cameron [Mon, 11 Apr 2016 22:30:57 +0000 (10:30 +1200)]
Reviewer comments - mostly fix rewrite_guard
Nick Cameron [Sat, 9 Apr 2016 06:40:00 +0000 (18:40 +1200)]
Change the logic around breaking multiple patterns in match arms
Refactor to use the list code, don't preserve original stacking-ness, base vertical vs mixed formatting on complexity of the patterns.
Closes #386
Aleksey Kladov [Mon, 11 Apr 2016 16:49:56 +0000 (19:49 +0300)]
unify format_string and format_file
Nick Cameron [Mon, 11 Apr 2016 19:05:54 +0000 (07:05 +1200)]
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.
Nick Cameron [Mon, 11 Apr 2016 18:45:47 +0000 (06:45 +1200)]
Don't be so aggressie about line-breaking strings (#911)
We will no longer break in the middle of words, only at whitespace or punctuation.
This means we sometimes over-run, but that seems better than some of the bad splits we see.
Closes #369
Kamal Marhubi [Sun, 10 Apr 2016 22:29:25 +0000 (18:29 -0400)]
rustfmt: Simplify match in project file lookup loop
This commit changes the match in `lookup_project_file` to use pattern
guards.
Kamal Marhubi [Sat, 9 Apr 2016 20:15:36 +0000 (16:15 -0400)]
rustfmt: Make error handling more idiomatic
This commit replaces the `Operation::InvalidInput` variant with
`Result`, and uses the `try!()` macro instead of explicit matching.
Kamal Marhubi [Sun, 10 Apr 2016 21:57:44 +0000 (17:57 -0400)]
rustfmt: Move getopts::Options creation to its own function
Nick Cameron [Fri, 8 Apr 2016 03:51:06 +0000 (15:51 +1200)]
Update the world
Nick Cameron [Fri, 8 Apr 2016 03:41:04 +0000 (15:41 +1200)]
Merge pull request #910 from kamalmarhubi/cancel-errors
macros: Cancel DiagnosticBuilder when not emitting error
Kamal Marhubi [Thu, 7 Apr 2016 20:29:05 +0000 (16:29 -0400)]
macros: Cancel DiagnosticBuilder when not emitting error
The error handling in libsyntax changed to use a `DiagnosticBuilder`
type in the `Err` variant of `PResult`. This type has `emit()` and
`cancel()` methods. Once created, errors must be emitted or canceled; if
not, the `Drop` impl on `DiagnosticBuilder` will panic.
The first syntex_syntax release to include this change was v0.25.0. The
bump from v0.23.0 to v0.29.1 in #847 did not add any `cancel()` calls,
even though at least one was required. There may be others not caught in
this commit.
Erik Johnston [Thu, 7 Apr 2016 19:47:43 +0000 (20:47 +0100)]
Tidy up
Erik Johnston [Thu, 7 Apr 2016 19:24:30 +0000 (20:24 +0100)]
Fix long generic indent
Erik Johnston [Thu, 7 Apr 2016 19:01:16 +0000 (20:01 +0100)]
Add variant to fn_args_layout
Erik Johnston [Thu, 7 Apr 2016 18:53:19 +0000 (19:53 +0100)]
Merge branch 'master' of github.com:nrc/rustfmt into fn_arg_one_line
Nick Cameron [Wed, 6 Apr 2016 20:31:23 +0000 (08:31 +1200)]
Merge pull request #909 from srinivasreddy/refactor
Refactoring so that we write some error messages to stderr rather than stdout.
Srinivas Reddy Thatiparthy [Wed, 6 Apr 2016 04:34:29 +0000 (10:04 +0530)]
use std::error instead std::out
Nick Cameron [Tue, 5 Apr 2016 04:53:37 +0000 (16:53 +1200)]
Merge pull request #908 from matklad/simplify-tests
simplify tests
Aleksey Kladov [Mon, 4 Apr 2016 23:02:22 +0000 (02:02 +0300)]
simplify tests
* change layout so that test group `foo` has source files in
`test/foo/source` and target files in `test/foo/target`.
* use significant comments to specify write mode instead of threading
Option<WriteMode>
Nick Cameron [Mon, 4 Apr 2016 23:25:13 +0000 (11:25 +1200)]
Merge pull request #897 from matklad/refactor-run
Refactor run family of functions
Aleksey Kladov [Mon, 4 Apr 2016 22:20:14 +0000 (01:20 +0300)]
make naming more consistent
0x0G [Mon, 4 Apr 2016 10:49:16 +0000 (13:49 +0300)]
Fix. rustfmt write to stderr instead stdout
Fix. rustfmt write to stderr instead stdout
Nick Cameron [Sun, 3 Apr 2016 10:43:20 +0000 (22:43 +1200)]
Merge pull request #898 from srinivasreddy/spell
Correct spelling of 'style'
Aleksey Kladov [Sat, 2 Apr 2016 21:45:04 +0000 (00:45 +0300)]
make format_string and fmt_lines private
Aleksey Kladov [Sat, 2 Apr 2016 21:32:24 +0000 (00:32 +0300)]
use format_input function in tests
Aleksey Kladov [Sat, 2 Apr 2016 20:41:25 +0000 (23:41 +0300)]
don't read config twice during tests
Srinivas Reddy Thatiparthy [Sat, 2 Apr 2016 19:38:25 +0000 (01:08 +0530)]
Correct spelling of 'style'
Aleksey Kladov [Sat, 2 Apr 2016 18:56:37 +0000 (21:56 +0300)]
refactor: unify run and run_from_stdin
Aleksey Kladov [Sat, 2 Apr 2016 16:36:56 +0000 (19:36 +0300)]
minor: use &mut ref instead of by value argument
This also unifies `write_all_files` and `write_file` functions
Erik Johnston [Fri, 1 Apr 2016 23:25:35 +0000 (00:25 +0100)]
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`.
Nick Cameron [Fri, 1 Apr 2016 22:10:06 +0000 (11:10 +1300)]
Merge pull request #895 from erikjohnston/fn_arg_block_incorrect_indent
Fix incorrect indent with fn_args_layout: Block
Erik Johnston [Fri, 1 Apr 2016 21:59:35 +0000 (22:59 +0100)]
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.
Nick Cameron [Thu, 31 Mar 2016 00:47:09 +0000 (13:47 +1300)]
Merge pull request #892 from marcusklaas/closed-ranges
Format closed ranges
Nick Cameron [Wed, 30 Mar 2016 02:19:46 +0000 (15:19 +1300)]
Version bump - v0.4
closes #870
Marcus Klaas de Vries [Wed, 30 Mar 2016 00:03:28 +0000 (02:03 +0200)]
Merge pull request #883 from marcusklaas/macro-with-name
Properly format macro's with an extra ident
Marcus Klaas [Tue, 29 Mar 2016 22:01:54 +0000 (00:01 +0200)]
Do not panic on type ascription or try shorthand
Instead, simply format expressions involving these unstable features
as they were found.
Marcus Klaas [Tue, 29 Mar 2016 21:46:55 +0000 (23:46 +0200)]
Format closed ranges
Marcus Klaas [Sun, 27 Mar 2016 12:45:55 +0000 (14:45 +0200)]
Properly format macro's with an extra ident
Nick Cameron [Tue, 29 Mar 2016 08:00:31 +0000 (21:00 +1300)]
Merge pull request #889 from kamalmarhubi/next-power-of-two
Use checked_next_power_of_two from std instead of custom method
Nick Cameron [Tue, 29 Mar 2016 07:58:57 +0000 (20:58 +1300)]
Merge pull request #891 from kamalmarhubi/update-syntex-syntax
deps: Update syntex_syntax to 0.30.0
Nick Cameron [Tue, 29 Mar 2016 07:57:16 +0000 (20:57 +1300)]
Merge pull request #886 from matklad/make-illegal-states-unrepresentable
Introduce verbosity enum
Kamal Marhubi [Tue, 29 Mar 2016 04:04:44 +0000 (00:04 -0400)]
deps: Update syntex_syntax to 0.30.0
This bump includes ability to parse inclusive ranges (`a...b`) and the
question mark operator.
Refs #867, #890
Kamal Marhubi [Tue, 29 Mar 2016 03:30:08 +0000 (23:30 -0400)]
Use checked_next_power_of_two from std instead of custom method
NB The custom method returned 0 on an input of 0, which is arguably
incorrect: 0 is not a power of two; the method in `std` returns 1 in
that case.
Nick Cameron [Tue, 29 Mar 2016 00:56:00 +0000 (13:56 +1300)]
Merge pull request #879 from matklad/proper-exit-code
cargo-fmt: don't return zero on failure
Aleksey Kladov [Mon, 28 Mar 2016 23:37:43 +0000 (02:37 +0300)]
minor: use enum instead of pair of booleans
This is a bit more typing, but statically forbids using both verbose and
quiet
Aleksey Kladov [Fri, 25 Mar 2016 13:11:33 +0000 (16:11 +0300)]
cargo-fmt: don't return zero on failure
Nick Cameron [Mon, 28 Mar 2016 19:17:52 +0000 (08:17 +1300)]
Merge pull request #885 from marcusklaas/empty-trait-type-params
Remove trailing whitespace for fn types /w non-unit return
Nick Cameron [Mon, 28 Mar 2016 19:14:27 +0000 (08:14 +1300)]
Merge pull request #882 from marcusklaas/empty-makro-issues
Fix issues with empty macros with curly braces
Nick Cameron [Mon, 28 Mar 2016 19:03:57 +0000 (08:03 +1300)]
Merge pull request #881 from marcusklaas/nightly-update
Fix tuple destructuring in impl fns
Marcus Klaas [Sun, 27 Mar 2016 18:20:51 +0000 (20:20 +0200)]
Remove trailing whitespace for fn types /w non-unit return
Marcus Klaas [Sun, 27 Mar 2016 11:44:08 +0000 (13:44 +0200)]
Fix issues with empty macros with curly braces
Marcus Klaas [Sun, 27 Mar 2016 11:07:28 +0000 (13:07 +0200)]
Fix tuple destructuring in impl fns
Marcus Klaas de Vries [Thu, 24 Mar 2016 13:57:24 +0000 (14:57 +0100)]
Merge pull request #868 from rust-lang-nursery/tuple-wide
Don't apply the function args heuristic to tuple lits.
Marcus Klaas de Vries [Tue, 22 Mar 2016 09:14:04 +0000 (10:14 +0100)]
Merge pull request #864 from Venti-/fn-density
Add option for vertical function argument list
Marcus Klaas de Vries [Thu, 17 Mar 2016 08:32:25 +0000 (09:32 +0100)]
Merge pull request #874 from kamalmarhubi/rustfmt_skip-clarification
readme: Clarify the ways of specifying rustfmt_skip
Kamal Marhubi [Thu, 17 Mar 2016 04:51:16 +0000 (00:51 -0400)]
readme: Clarify the ways of specifying rustfmt_skip
It was previously unclear that the `cfg_attr` version works in stable
Rust.
Marcus Klaas de Vries [Wed, 16 Mar 2016 17:06:25 +0000 (18:06 +0100)]
Merge pull request #866 from rust-lang-nursery/empty-extern
Keep empty extern blocks on one line
Nick Cameron [Tue, 15 Mar 2016 22:24:26 +0000 (11:24 +1300)]
Merge pull request #869 from ConnorGBrewster/add-trait-formatting
Add trait formatting
Connor Brewster [Tue, 15 Mar 2016 20:08:12 +0000 (14:08 -0600)]
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
Connor Brewster [Tue, 15 Mar 2016 02:51:41 +0000 (20:51 -0600)]
Fixed span_after issue
Connor Brewster [Tue, 15 Mar 2016 02:49:14 +0000 (20:49 -0600)]
Merge branch 'master' of https://github.com/rust-lang-nursery/rustfmt into add-trait-formatting
Connor Brewster [Tue, 15 Mar 2016 02:11:39 +0000 (20:11 -0600)]
Readded spaces to source test
Connor Brewster [Tue, 15 Mar 2016 02:05:20 +0000 (20:05 -0600)]
Added tests
Connor Brewster [Tue, 15 Mar 2016 01:52:07 +0000 (19:52 -0600)]
Finished implementing impl and trait type/const