]> git.lizzy.rs Git - rust.git/log
rust.git
8 years agoreturn non-zero exit code if there were errors
Aleksey Kladov [Thu, 14 Apr 2016 23:51:50 +0000 (02:51 +0300)]
return non-zero exit code if there were errors

8 years agoMerge pull request #928 from matklad/patch-1
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

8 years agodon'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.

8 years agoMerge pull request #926 from rust-lang-nursery/closures
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

8 years agoBe 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

8 years agoMerge pull request #914 from kamalmarhubi/invalid-operation-result
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

8 years agoChange stdout to stderr (#925)
Srinivas Reddy Thatiparthy [Wed, 13 Apr 2016 19:22:45 +0000 (00:52 +0530)]
Change stdout to stderr (#925)

8 years agoMerge pull request #921 from matklad/more-unification
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

8 years agoFix the build
Nick Cameron [Mon, 11 Apr 2016 23:04:33 +0000 (11:04 +1200)]
Fix the build

8 years agoMerge pull request #918 from rust-lang-nursery/ty-variadic
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

8 years agoHandle variadic function types
Nick Cameron [Mon, 11 Apr 2016 09:20:03 +0000 (21:20 +1200)]
Handle variadic function types

Closes #842

8 years agoMerge pull request #912 from rust-lang-nursery/pat-simple-mixed
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

8 years agoMerge pull request #896 from erikjohnston/fn_arg_one_line
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

8 years agoReviewer comments - mostly fix rewrite_guard
Nick Cameron [Mon, 11 Apr 2016 22:30:57 +0000 (10:30 +1200)]
Reviewer comments - mostly fix rewrite_guard

8 years agoChange the logic around breaking multiple patterns in match arms
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

8 years agounify format_string and format_file
Aleksey Kladov [Mon, 11 Apr 2016 16:49:56 +0000 (19:49 +0300)]
unify format_string and format_file

8 years agoEmpty structs and struct lits (#920)
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.

8 years agoDon't be so aggressie about line-breaking strings (#911)
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

8 years agorustfmt: Simplify match in project file lookup loop
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.

8 years agorustfmt: Make error handling more idiomatic
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.

8 years agorustfmt: Move getopts::Options creation to its own function
Kamal Marhubi [Sun, 10 Apr 2016 21:57:44 +0000 (17:57 -0400)]
rustfmt: Move getopts::Options creation to its own function

8 years agoUpdate the world
Nick Cameron [Fri, 8 Apr 2016 03:51:06 +0000 (15:51 +1200)]
Update the world

8 years agoMerge pull request #910 from kamalmarhubi/cancel-errors
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

8 years agomacros: 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.

8 years agoTidy up
Erik Johnston [Thu, 7 Apr 2016 19:47:43 +0000 (20:47 +0100)]
Tidy up

8 years agoFix long generic indent
Erik Johnston [Thu, 7 Apr 2016 19:24:30 +0000 (20:24 +0100)]
Fix long generic indent

8 years agoAdd variant to fn_args_layout
Erik Johnston [Thu, 7 Apr 2016 19:01:16 +0000 (20:01 +0100)]
Add variant to fn_args_layout

8 years agoMerge branch 'master' of github.com:nrc/rustfmt into fn_arg_one_line
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

8 years agoMerge pull request #909 from srinivasreddy/refactor
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.

8 years agouse std::error instead std::out
Srinivas Reddy Thatiparthy [Wed, 6 Apr 2016 04:34:29 +0000 (10:04 +0530)]
use std::error instead std::out

8 years agoMerge pull request #908 from matklad/simplify-tests
Nick Cameron [Tue, 5 Apr 2016 04:53:37 +0000 (16:53 +1200)]
Merge pull request #908 from matklad/simplify-tests

simplify tests

8 years agosimplify 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>

8 years agoMerge pull request #897 from matklad/refactor-run
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

8 years agomake naming more consistent
Aleksey Kladov [Mon, 4 Apr 2016 22:20:14 +0000 (01:20 +0300)]
make naming more consistent

8 years agoFix. rustfmt write to stderr instead stdout
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

8 years agoMerge pull request #898 from srinivasreddy/spell
Nick Cameron [Sun, 3 Apr 2016 10:43:20 +0000 (22:43 +1200)]
Merge pull request #898 from srinivasreddy/spell

Correct spelling of 'style'

8 years agomake format_string and fmt_lines private
Aleksey Kladov [Sat, 2 Apr 2016 21:45:04 +0000 (00:45 +0300)]
make format_string and fmt_lines private

8 years agouse format_input function in tests
Aleksey Kladov [Sat, 2 Apr 2016 21:32:24 +0000 (00:32 +0300)]
use format_input function in tests

8 years agodon't read config twice during tests
Aleksey Kladov [Sat, 2 Apr 2016 20:41:25 +0000 (23:41 +0300)]
don't read config twice during tests

8 years agoCorrect spelling of 'style'
Srinivas Reddy Thatiparthy [Sat, 2 Apr 2016 19:38:25 +0000 (01:08 +0530)]
Correct spelling of 'style'

8 years agorefactor: unify run and run_from_stdin
Aleksey Kladov [Sat, 2 Apr 2016 18:56:37 +0000 (21:56 +0300)]
refactor: unify run and run_from_stdin

8 years agominor: use &mut ref instead of by value argument
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

8 years agoAdd fn_arg_one_line option
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`.

8 years agoMerge pull request #895 from erikjohnston/fn_arg_block_incorrect_indent
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

8 years agoFix 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.

8 years agoMerge pull request #892 from marcusklaas/closed-ranges
Nick Cameron [Thu, 31 Mar 2016 00:47:09 +0000 (13:47 +1300)]
Merge pull request #892 from marcusklaas/closed-ranges

Format closed ranges

8 years agoVersion bump - v0.4
Nick Cameron [Wed, 30 Mar 2016 02:19:46 +0000 (15:19 +1300)]
Version bump - v0.4

closes #870

8 years agoMerge pull request #883 from marcusklaas/macro-with-name
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

8 years agoDo not panic on type ascription or try shorthand
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.

8 years agoFormat closed ranges
Marcus Klaas [Tue, 29 Mar 2016 21:46:55 +0000 (23:46 +0200)]
Format closed ranges

8 years agoProperly format macro's with an extra ident
Marcus Klaas [Sun, 27 Mar 2016 12:45:55 +0000 (14:45 +0200)]
Properly format macro's with an extra ident

8 years agoMerge pull request #889 from kamalmarhubi/next-power-of-two
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

8 years agoMerge pull request #891 from kamalmarhubi/update-syntex-syntax
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

8 years agoMerge pull request #886 from matklad/make-illegal-states-unrepresentable
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

8 years agodeps: Update syntex_syntax to 0.30.0
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

8 years agoUse checked_next_power_of_two from std instead of custom method
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.

8 years agoMerge pull request #879 from matklad/proper-exit-code
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

8 years agominor: use enum instead of pair of booleans
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

8 years agocargo-fmt: don't return zero on failure
Aleksey Kladov [Fri, 25 Mar 2016 13:11:33 +0000 (16:11 +0300)]
cargo-fmt: don't return zero on failure

8 years agoMerge pull request #885 from marcusklaas/empty-trait-type-params
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

8 years agoMerge pull request #882 from marcusklaas/empty-makro-issues
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

8 years agoMerge pull request #881 from marcusklaas/nightly-update
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

8 years agoRemove trailing whitespace for fn types /w non-unit return
Marcus Klaas [Sun, 27 Mar 2016 18:20:51 +0000 (20:20 +0200)]
Remove trailing whitespace for fn types /w non-unit return

8 years agoFix issues with empty macros with curly braces
Marcus Klaas [Sun, 27 Mar 2016 11:44:08 +0000 (13:44 +0200)]
Fix issues with empty macros with curly braces

8 years agoFix tuple destructuring in impl fns
Marcus Klaas [Sun, 27 Mar 2016 11:07:28 +0000 (13:07 +0200)]
Fix tuple destructuring in impl fns

8 years agoMerge pull request #868 from rust-lang-nursery/tuple-wide
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.

8 years agoMerge pull request #864 from Venti-/fn-density
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

8 years agoMerge pull request #874 from kamalmarhubi/rustfmt_skip-clarification
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

8 years agoreadme: 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.

8 years agoMerge pull request #866 from rust-lang-nursery/empty-extern
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

8 years agoMerge pull request #869 from ConnorGBrewster/add-trait-formatting
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

8 years agoFixed nitpicks
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

8 years agoFixed span_after issue
Connor Brewster [Tue, 15 Mar 2016 02:51:41 +0000 (20:51 -0600)]
Fixed span_after issue

8 years agoMerge branch 'master' of https://github.com/rust-lang-nursery/rustfmt into add-trait...
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

8 years agoReadded spaces to source test
Connor Brewster [Tue, 15 Mar 2016 02:11:39 +0000 (20:11 -0600)]
Readded spaces to source test

8 years agoAdded tests
Connor Brewster [Tue, 15 Mar 2016 02:05:20 +0000 (20:05 -0600)]
Added tests

8 years agoFinished implementing impl and trait type/const
Connor Brewster [Tue, 15 Mar 2016 01:52:07 +0000 (19:52 -0600)]
Finished implementing impl and trait type/const

8 years agoDon't apply the function args heuristic to tuple lits.
Nick Cameron [Mon, 14 Mar 2016 07:51:06 +0000 (20:51 +1300)]
Don't apply the function args heuristic to tuple lits.

Closes #450
Closes #510

8 years agoKeep empty extern blocks on one line
Nick Cameron [Mon, 14 Mar 2016 05:55:55 +0000 (18:55 +1300)]
Keep empty extern blocks on one line

Closes #462

8 years agocargo update
Nick Cameron [Mon, 14 Mar 2016 05:19:57 +0000 (18:19 +1300)]
cargo update

8 years agoMerge pull request #857 from kamalmarhubi/codemap-ext
Nick Cameron [Mon, 14 Mar 2016 05:00:51 +0000 (18:00 +1300)]
Merge pull request #857 from kamalmarhubi/codemap-ext

utils: Add CodeMapExt extension trait for span_* methods

8 years agoAdd independent test for Vertical rustfmt-fn_args_density
Ari Koivula [Mon, 14 Mar 2016 01:53:26 +0000 (03:53 +0200)]
Add independent test for Vertical rustfmt-fn_args_density

8 years agoFix last comment turning into block comment
Ari Koivula [Sun, 13 Mar 2016 21:27:13 +0000 (23:27 +0200)]
Fix last comment turning into block comment

This fixes the comment after the last argument in an argument list
being turned into a block comment when it's not necessary.

8 years agoAdd test for vertical fn_args_density
Ari Koivula [Sun, 13 Mar 2016 21:02:03 +0000 (23:02 +0200)]
Add test for vertical fn_args_density

8 years agoAdd Vertical fn_args_density
Ari Koivula [Sun, 13 Mar 2016 20:57:03 +0000 (22:57 +0200)]
Add Vertical fn_args_density

This adds new option Vertical to fn_args_density, which formats the
list vertically no matter what.

8 years agoutils: Add CodeMapSpanUtils trait for span_* methods
Kamal Marhubi [Mon, 7 Mar 2016 18:41:32 +0000 (13:41 -0500)]
utils: Add CodeMapSpanUtils trait for span_* methods

This commit adds a CodeMapSpanUtils extension trait on CodeMap, and
moves some functions to methods there:
  - span_after
  - span_after_last
  - span_before

This better reflects them being lookup methods on the codemap.

8 years agoMerge pull request #859 from solidsnack/master
Nick Cameron [Sun, 13 Mar 2016 22:13:46 +0000 (11:13 +1300)]
Merge pull request #859 from solidsnack/master

Write non-output to stderr when there is output

8 years agoUpdated to latest rustfmt
Connor Brewster [Sat, 12 Mar 2016 18:09:27 +0000 (11:09 -0700)]
Updated to latest rustfmt

8 years agoUncommented missed spans check
Connor Brewster [Sat, 12 Mar 2016 17:53:47 +0000 (10:53 -0700)]
Uncommented missed spans check

8 years agoRemoved unneeded pattern matching
Connor Brewster [Sat, 12 Mar 2016 05:50:30 +0000 (22:50 -0700)]
Removed unneeded pattern matching

8 years agoFixed formatting
Connor Brewster [Sat, 12 Mar 2016 05:41:22 +0000 (22:41 -0700)]
Fixed formatting

8 years agoAdded support for associated type rewriting
Connor Brewster [Sat, 12 Mar 2016 05:32:08 +0000 (22:32 -0700)]
Added support for associated type rewriting

8 years agoAdded where clause formatting
Connor Brewster [Fri, 11 Mar 2016 21:49:11 +0000 (14:49 -0700)]
Added where clause formatting

8 years agoAdding trait formatting
Connor Brewster [Fri, 11 Mar 2016 21:18:30 +0000 (14:18 -0700)]
Adding trait formatting
trait header formatting finished
generic formatting finished
added basic trait bounds formatting

8 years agoMerge pull request #851 from Amanieu/const_unsafe
Marcus Klaas de Vries [Fri, 11 Mar 2016 09:50:14 +0000 (10:50 +0100)]
Merge pull request #851 from Amanieu/const_unsafe

Fix ordering of "const unsafe fn"

8 years agoUse braces, not parens, for macro def
Jason Dusek [Fri, 11 Mar 2016 08:41:11 +0000 (00:41 -0800)]
Use braces, not parens, for macro def

8 years agoAlign arguments
Jason Dusek [Wed, 9 Mar 2016 19:03:57 +0000 (11:03 -0800)]
Align arguments

8 years agoWrite non-output to stderr when there is output
Jason Dusek [Wed, 9 Mar 2016 05:52:58 +0000 (21:52 -0800)]
Write non-output to stderr when there is output

8 years agoAdd a test for #850
Amanieu d'Antras [Thu, 3 Mar 2016 04:45:47 +0000 (04:45 +0000)]
Add a test for #850

8 years agoFix ordering of "const unsafe fn"
Amanieu d'Antras [Wed, 2 Mar 2016 15:37:20 +0000 (15:37 +0000)]
Fix ordering of "const unsafe fn"