]> git.lizzy.rs Git - rust.git/log
rust.git
8 years agoMerge pull request #218 from cassiersg/empty_file
cassiersg [Fri, 28 Aug 2015 21:03:14 +0000 (23:03 +0200)]
Merge pull request #218 from cassiersg/empty_file

Add unittest for #115

8 years agoAdd unittest for #115
Gaëtan Cassiers [Fri, 28 Aug 2015 20:59:36 +0000 (22:59 +0200)]
Add unittest for #115

8 years agoMerge pull request #207 from cassiersg/find-comments
cassiersg [Fri, 28 Aug 2015 12:34:25 +0000 (14:34 +0200)]
Merge pull request #207 from cassiersg/find-comments

Add a generic tool for searching comments in code

8 years agoAdd a generic tool for searching comments in code
Gaëtan Cassiers [Thu, 27 Aug 2015 12:07:15 +0000 (14:07 +0200)]
Add a generic tool for searching comments in code

This make a base for all functions searching for comments, or searching
code excluding comments, etc. These functions where too simple and
didn't handle complicated cases like nested comments or comment marks
inside string litterals ("/*").

8 years agoMerge pull request #211 from sinhpham/master
cassiersg [Fri, 28 Aug 2015 11:50:10 +0000 (13:50 +0200)]
Merge pull request #211 from sinhpham/master

Fix #201

8 years agoFix #201
Sinh Pham [Fri, 28 Aug 2015 03:15:21 +0000 (23:15 -0400)]
Fix #201

8 years agoMerge pull request #208 from cassiersg/rewrite-attrs
cassiersg [Thu, 27 Aug 2015 20:38:31 +0000 (22:38 +0200)]
Merge pull request #208 from cassiersg/rewrite-attrs

Implement Rewrite for [ast::Attribute]

8 years agoImplement Rewrite for [ast::Attribute]
Gaëtan Cassiers [Fri, 17 Jul 2015 21:10:15 +0000 (23:10 +0200)]
Implement Rewrite for [ast::Attribute]

8 years agoMerge pull request #206 from posix4e/usage
cassiersg [Wed, 26 Aug 2015 22:12:33 +0000 (00:12 +0200)]
Merge pull request #206 from posix4e/usage

Fix usage of the tool. Provide -h and --help

8 years agoFix usage of the tool. Provide -h and --help
Alex HotShot Newman [Wed, 26 Aug 2015 22:02:06 +0000 (15:02 -0700)]
Fix usage of the tool. Provide -h and --help

8 years agoMerge pull request #165 from SBSTP/config
cassiersg [Wed, 26 Aug 2015 20:23:43 +0000 (22:23 +0200)]
Merge pull request #165 from SBSTP/config

Add project-specific configuration file support.

8 years agoMerge pull request #204 from SBSTP/nightly
cassiersg [Wed, 26 Aug 2015 20:18:19 +0000 (22:18 +0200)]
Merge pull request #204 from SBSTP/nightly

Fix build on nightly

8 years agoDelete src/default.toml file
Simon Bernier St-Pierre [Wed, 26 Aug 2015 18:03:11 +0000 (14:03 -0400)]
Delete src/default.toml file

8 years agoAdd project-specific configuration file support
Simon Bernier St-Pierre [Fri, 31 Jul 2015 23:21:44 +0000 (19:21 -0400)]
Add project-specific configuration file support

8 years agoFix build on nightly
Simon Bernier St-Pierre [Tue, 25 Aug 2015 21:37:48 +0000 (17:37 -0400)]
Fix build on nightly

https://github.com/rust-lang/rust/pull/27857

8 years agoMerge pull request #196 from marcusklaas/if-else-single-line
Marcus Klaas de Vries [Tue, 25 Aug 2015 20:55:10 +0000 (22:55 +0200)]
Merge pull request #196 from marcusklaas/if-else-single-line

Implement single line if-else formatting

8 years agoPrevent nested if-else from being put on a single line.
Marcus Klaas [Tue, 25 Aug 2015 20:07:02 +0000 (22:07 +0200)]
Prevent nested if-else from being put on a single line.

This is done using a pretty terribad hack, introducing an extra function parameter and some code duplication. Unfortunately, there seem to be few alternatives.

8 years agoImplement single line if-else formatting
Marcus Klaas [Tue, 25 Aug 2015 19:46:58 +0000 (21:46 +0200)]
Implement single line if-else formatting

8 years agoMerge pull request #175 from marcusklaas/assignment
Marcus Klaas de Vries [Tue, 25 Aug 2015 19:45:25 +0000 (21:45 +0200)]
Merge pull request #175 from marcusklaas/assignment

Format assignment

8 years agoFormat assignment
Marcus Klaas [Fri, 21 Aug 2015 11:31:09 +0000 (13:31 +0200)]
Format assignment

8 years agoMerge pull request #191 from myromeu/is_empty
cassiersg [Mon, 24 Aug 2015 22:13:31 +0000 (00:13 +0200)]
Merge pull request #191 from myromeu/is_empty

Fixes nrc/rustfmt#187

8 years agoReplace uses of x.len() == 0 by x.is_empty() #187
Ivan Apachev [Mon, 24 Aug 2015 21:54:47 +0000 (00:54 +0300)]
Replace uses of x.len() == 0 by x.is_empty() #187

8 years agoMerge pull request #203 from cassiersg/fix-190
cassiersg [Mon, 24 Aug 2015 20:03:30 +0000 (22:03 +0200)]
Merge pull request #203 from cassiersg/fix-190

Fix #190 for submodules

8 years agoFix #190 for submodules
Gaëtan Cassiers [Mon, 24 Aug 2015 20:01:01 +0000 (22:01 +0200)]
Fix #190 for submodules

8 years agoMerge pull request #200 from sinhpham/master
cassiersg [Mon, 24 Aug 2015 17:06:02 +0000 (19:06 +0200)]
Merge pull request #200 from sinhpham/master

Fix https://github.com/nrc/rustfmt/issues/190

8 years agoFix https://github.com/nrc/rustfmt/issues/190
Sinh Pham [Sat, 22 Aug 2015 22:08:11 +0000 (18:08 -0400)]
Fix https://github.com/nrc/rustfmt/issues/190

8 years agoMerge pull request #198 from marcusklaas/parameterized-paths-matter
Nick Cameron [Sun, 23 Aug 2015 07:52:39 +0000 (19:52 +1200)]
Merge pull request #198 from marcusklaas/parameterized-paths-matter

Fix bug in path formatting

8 years agoMerge pull request #199 from ineol/raw_strings
Marcus Klaas de Vries [Sat, 22 Aug 2015 19:26:50 +0000 (21:26 +0200)]
Merge pull request #199 from ineol/raw_strings

Don't format raw strings

8 years agoAdd test for raw strings
Léo Stefanesco [Sat, 22 Aug 2015 19:20:31 +0000 (21:20 +0200)]
Add test for raw strings

8 years agoDon't format raw strings
Léo Stefanesco [Fri, 21 Aug 2015 17:13:46 +0000 (19:13 +0200)]
Don't format raw strings

8 years agoFix bug in path formatting
Marcus Klaas [Fri, 21 Aug 2015 14:28:32 +0000 (16:28 +0200)]
Fix bug in path formatting

8 years agoMerge pull request #186 from marcusklaas/closures
Marcus Klaas de Vries [Fri, 21 Aug 2015 10:59:05 +0000 (12:59 +0200)]
Merge pull request #186 from marcusklaas/closures

Format closures

8 years agoReduce code duplication for block indentation helpers
Marcus Klaas [Fri, 21 Aug 2015 10:57:17 +0000 (12:57 +0200)]
Reduce code duplication for block indentation helpers

8 years agoRefactor closure formatting routine
Marcus Klaas [Thu, 20 Aug 2015 21:05:41 +0000 (23:05 +0200)]
Refactor closure formatting routine

8 years agoAdd additional tests for closures
Marcus Klaas [Thu, 20 Aug 2015 20:08:51 +0000 (22:08 +0200)]
Add additional tests for closures

8 years agoFormat closures
Marcus Klaas [Wed, 19 Aug 2015 20:39:45 +0000 (22:39 +0200)]
Format closures

8 years agoMerge pull request #189 from nrc/match
Nick Cameron [Wed, 19 Aug 2015 20:20:43 +0000 (08:20 +1200)]
Merge pull request #189 from nrc/match

match expressions

8 years agoRe-jig binop formatting
Nick Cameron [Wed, 19 Aug 2015 03:15:54 +0000 (15:15 +1200)]
Re-jig binop formatting

and misc other fixes from the reviews.

8 years agoreformatting/rebasing
Nick Cameron [Sun, 16 Aug 2015 21:55:26 +0000 (09:55 +1200)]
reformatting/rebasing

8 years agoHandle span error with `continue`
Nick Cameron [Sun, 16 Aug 2015 04:43:59 +0000 (16:43 +1200)]
Handle span error with `continue`

This should be properly addressed by #184, but requires a change to the rustc parser, so this patch just works around the issue.

8 years agoRewrite match expressions (continued).
Nick Cameron [Sun, 16 Aug 2015 21:41:45 +0000 (09:41 +1200)]
Rewrite match expressions (continued).

8 years agoFormatting
Nick Cameron [Sun, 16 Aug 2015 03:58:17 +0000 (15:58 +1200)]
Formatting

8 years agoAllow `{}` to remain.
Nick Cameron [Sun, 16 Aug 2015 04:13:55 +0000 (16:13 +1200)]
Allow `{}` to remain.

8 years agoRewrite match expressions
Nick Cameron [Fri, 14 Aug 2015 08:00:22 +0000 (20:00 +1200)]
Rewrite match expressions

8 years agoMerge pull request #178 from marcusklaas/single-config-override
Marcus Klaas de Vries [Wed, 19 Aug 2015 19:53:02 +0000 (21:53 +0200)]
Merge pull request #178 from marcusklaas/single-config-override

Allow override of single configuration lines in tests

8 years agoAdd option to override single configuration lines for tests
Marcus Klaas [Wed, 19 Aug 2015 19:41:19 +0000 (21:41 +0200)]
Add option to override single configuration lines for tests

8 years agoMerge pull request #176 from marcusklaas/no-backup
Marcus Klaas de Vries [Wed, 19 Aug 2015 19:34:07 +0000 (21:34 +0200)]
Merge pull request #176 from marcusklaas/no-backup

Add an option to forgo backups

8 years agoAdd an option to forgo backups
Marcus Klaas [Tue, 18 Aug 2015 19:10:30 +0000 (21:10 +0200)]
Add an option to forgo backups

8 years agoMerge pull request #188 from marcusklaas/refactor-itemize-list
Marcus Klaas de Vries [Wed, 19 Aug 2015 16:43:53 +0000 (18:43 +0200)]
Merge pull request #188 from marcusklaas/refactor-itemize-list

Refactor itemize list so that it produces an iterator

8 years agoRefactor itemize list so that it produces an iterator
Marcus Klaas [Wed, 19 Aug 2015 16:12:05 +0000 (18:12 +0200)]
Refactor itemize list so that it produces an iterator

8 years agoMerge pull request #193 from posix4e/doc-defaulttoml
Marcus Klaas de Vries [Tue, 18 Aug 2015 18:39:54 +0000 (20:39 +0200)]
Merge pull request #193 from posix4e/doc-defaulttoml

Doc defaulttoml

8 years agoProvide information about default.toml
Alex Newman [Tue, 18 Aug 2015 18:04:58 +0000 (11:04 -0700)]
Provide information about default.toml

8 years agoMerge pull request #174 from marcusklaas/format-paths
Marcus Klaas de Vries [Sun, 16 Aug 2015 20:59:03 +0000 (22:59 +0200)]
Merge pull request #174 from marcusklaas/format-paths

Format paths

8 years agoFormat paths
Marcus Klaas [Fri, 14 Aug 2015 12:09:19 +0000 (14:09 +0200)]
Format paths

8 years agoMerge pull request #159 from marcusklaas/explicit-self
Marcus Klaas de Vries [Fri, 14 Aug 2015 09:58:30 +0000 (11:58 +0200)]
Merge pull request #159 from marcusklaas/explicit-self

Correctly format typed self in function arguments

8 years agoCorrectly format typed self in function arguments
Marcus Klaas [Fri, 24 Jul 2015 17:54:38 +0000 (19:54 +0200)]
Correctly format typed self in function arguments

8 years agoMerge pull request #162 from cassiersg/sep-mods
cassiersg [Sun, 2 Aug 2015 12:51:48 +0000 (14:51 +0200)]
Merge pull request #162 from cassiersg/sep-mods

Move modules listing outside of FmtVisitor

8 years agoFix nits for filemap
Gaëtan Cassiers [Sun, 2 Aug 2015 12:49:35 +0000 (14:49 +0200)]
Fix nits for filemap

8 years agoKill ChangeSet and replace remaining part by FileMap
Gaëtan Cassiers [Sat, 1 Aug 2015 13:02:59 +0000 (15:02 +0200)]
Kill ChangeSet and replace remaining part by FileMap

Also fix style issues
Cargo update to get fixes of strings.rs (was cause of a misformatted
function call).

8 years agoRemove ChangeSet of FmtVisitor
Gaëtan Cassiers [Sun, 26 Jul 2015 12:05:43 +0000 (14:05 +0200)]
Remove ChangeSet of FmtVisitor

8 years agoSeparate modules and files listing of reformatting
Gaëtan Cassiers [Sun, 26 Jul 2015 10:55:25 +0000 (12:55 +0200)]
Separate modules and files listing of reformatting

As suggested in #141
Closes #156

8 years agoMerge pull request #167 from marcusklaas/unsafe
Marcus Klaas de Vries [Sun, 2 Aug 2015 10:42:00 +0000 (12:42 +0200)]
Merge pull request #167 from marcusklaas/unsafe

Properly format unsafe blocks

8 years agoProperly format unsafe blocks
Marcus Klaas [Sat, 1 Aug 2015 12:22:31 +0000 (14:22 +0200)]
Properly format unsafe blocks

8 years agoMerge pull request #164 from marcusklaas/rustup
Nick Cameron [Fri, 31 Jul 2015 15:03:31 +0000 (08:03 -0700)]
Merge pull request #164 from marcusklaas/rustup

Rustup

8 years agoPhase out token::get_ident in favour of ToString
Marcus Klaas [Fri, 31 Jul 2015 11:06:28 +0000 (13:06 +0200)]
Phase out token::get_ident in favour of ToString

token::get_ident was removed in rust commit 00a5e66f818ad9d79cc4425f5564c7b07e3213a6

9 years agoMerge pull request #144 from marcusklaas/single-use
Nick Cameron [Sat, 25 Jul 2015 21:38:07 +0000 (09:38 +1200)]
Merge pull request #144 from marcusklaas/single-use

Format simple imports

9 years agoMerge pull request #161 from cassiersg/fix-bin-op-width
Nick Cameron [Sat, 25 Jul 2015 21:37:12 +0000 (09:37 +1200)]
Merge pull request #161 from cassiersg/fix-bin-op-width

Add regression tests for binOps

9 years agoAdd regression tests for binOps
Gaëtan Cassiers [Sat, 25 Jul 2015 21:28:31 +0000 (23:28 +0200)]
Add regression tests for binOps

9 years agoFormat simple imports
Marcus Klaas [Sat, 25 Jul 2015 21:10:48 +0000 (23:10 +0200)]
Format simple imports

9 years agoMerge pull request #142 from cassiersg/rewrite-imports
Nick Cameron [Sat, 25 Jul 2015 21:03:56 +0000 (09:03 +1200)]
Merge pull request #142 from cassiersg/rewrite-imports

Move 'use' to Rewrite

9 years agoAdd a helper method to format imports
cassiersg [Mon, 20 Jul 2015 19:33:23 +0000 (21:33 +0200)]
Add a helper method to format imports

9 years agoIndent fix
cassiersg [Mon, 20 Jul 2015 19:14:45 +0000 (21:14 +0200)]
Indent fix

9 years agoMove 'use' to Rewrite
Gaëtan Cassiers [Fri, 17 Jul 2015 13:58:47 +0000 (15:58 +0200)]
Move 'use' to Rewrite

Implements Rewrite for ViewPath

Behavior change: always use max_width instead of ideal_width for use
list rewrite. I think it looks better, was also suggested by @nrc in
https://github.com/nrc/rustfmt/issues/82#issuecomment-105314265

9 years agoFix width computation in rewrite_binary_op
Gaëtan Cassiers [Sat, 25 Jul 2015 16:58:16 +0000 (18:58 +0200)]
Fix width computation in rewrite_binary_op

Operator width was counted twice.

9 years agoMerge pull request #147 from marcusklaas/even-more-expr
Nick Cameron [Fri, 24 Jul 2015 21:51:59 +0000 (09:51 +1200)]
Merge pull request #147 from marcusklaas/even-more-expr

Format if expressions & loops

9 years agoMerge pull request #158 from marcusklaas/modules
Nick Cameron [Fri, 24 Jul 2015 21:48:58 +0000 (09:48 +1200)]
Merge pull request #158 from marcusklaas/modules

Use new module code from libsyntax

9 years agoUse new module code from libsyntax
Marcus Klaas [Fri, 24 Jul 2015 13:29:04 +0000 (15:29 +0200)]
Use new module code from libsyntax

9 years agoRefactor some things; add extra tests.
Marcus Klaas [Mon, 20 Jul 2015 21:29:25 +0000 (23:29 +0200)]
Refactor some things; add extra tests.

9 years agoMerge pull request #157 from marcusklaas/box-syntax
Nick Cameron [Thu, 23 Jul 2015 22:30:15 +0000 (10:30 +1200)]
Merge pull request #157 from marcusklaas/box-syntax

Preserve box syntax

9 years agoPreserve box syntax
Marcus Klaas [Thu, 23 Jul 2015 21:08:41 +0000 (23:08 +0200)]
Preserve box syntax

9 years agoMerge pull request #151 from marcusklaas/fix-for-servo
Nick Cameron [Wed, 22 Jul 2015 22:18:36 +0000 (10:18 +1200)]
Merge pull request #151 from marcusklaas/fix-for-servo

Fix underflow bug in rewrite_call

9 years agoFix underflow bug in rewrite_call
Marcus Klaas [Wed, 22 Jul 2015 21:39:37 +0000 (23:39 +0200)]
Fix underflow bug in rewrite_call

Fixes https://github.com/nrc/rustfmt/issues/148.
Now properly propagates the rewrite failure instead of panicking. Added regression test from servo code. This example will be properly rewritten when https://github.com/nrc/rustfmt/issues/17 is addressed.

9 years agoSimplify CompilerCalls impl
Nick Cameron [Wed, 22 Jul 2015 20:05:34 +0000 (08:05 +1200)]
Simplify CompilerCalls impl

9 years agoMerge pull request #146 from marcusklaas/fix-inverted-span
Nick Cameron [Mon, 20 Jul 2015 19:38:20 +0000 (07:38 +1200)]
Merge pull request #146 from marcusklaas/fix-inverted-span

Format unnamed function arguments

9 years agoFormat unnamed function arguments
Marcus Klaas [Sun, 19 Jul 2015 12:33:02 +0000 (14:33 +0200)]
Format unnamed function arguments

9 years agoFormat all the loops!
Marcus Klaas [Sun, 19 Jul 2015 21:39:48 +0000 (23:39 +0200)]
Format all the loops!

9 years agoFormat if-let-else expressions
Marcus Klaas [Sun, 19 Jul 2015 20:25:44 +0000 (22:25 +0200)]
Format if-let-else expressions

9 years agoFormat if-else expressions
Marcus Klaas [Sun, 19 Jul 2015 21:42:54 +0000 (23:42 +0200)]
Format if-else expressions

9 years agoFormat while loops, including labels
Marcus Klaas [Thu, 16 Jul 2015 14:29:28 +0000 (16:29 +0200)]
Format while loops, including labels

9 years agoResolve some warnings
Nick Cameron [Fri, 17 Jul 2015 06:26:10 +0000 (18:26 +1200)]
Resolve some warnings

9 years agoMerge pull request #137 from nrc/struct-lit-opt
Nick Cameron [Thu, 16 Jul 2015 18:57:01 +0000 (06:57 +1200)]
Merge pull request #137 from nrc/struct-lit-opt

Options for formatting struct literals

9 years agoMerge pull request #139 from nrc/todo-sorry
Nick Cameron [Thu, 16 Jul 2015 18:56:38 +0000 (06:56 +1200)]
Merge pull request #139 from nrc/todo-sorry

Don't apologise if its not our fault in warnings

9 years agoTidy up some overrunning lines
Nick Cameron [Thu, 16 Jul 2015 02:23:48 +0000 (14:23 +1200)]
Tidy up some overrunning lines

9 years agoDon't apologise if its not our fault in warnings
Nick Cameron [Thu, 16 Jul 2015 02:17:07 +0000 (14:17 +1200)]
Don't apologise if its not our fault in warnings

9 years agoFix some bugs
Nick Cameron [Thu, 16 Jul 2015 02:03:52 +0000 (14:03 +1200)]
Fix some bugs

9 years agoReformat code to new struct lit style
Nick Cameron [Thu, 16 Jul 2015 01:31:20 +0000 (13:31 +1200)]
Reformat code to new struct lit style

9 years agoAdd an option to format struct lits with either block or visual indent
Nick Cameron [Wed, 15 Jul 2015 22:44:43 +0000 (10:44 +1200)]
Add an option to format struct lits with either block or visual indent

9 years agoMerge pull request #128 from marcusklaas/subexpr
Nick Cameron [Wed, 15 Jul 2015 22:08:36 +0000 (10:08 +1200)]
Merge pull request #128 from marcusklaas/subexpr

Format loops

9 years agoFormat loops
Marcus Klaas [Mon, 13 Jul 2015 19:51:56 +0000 (21:51 +0200)]
Format loops

9 years agoMerge pull request #132 from cassiersg/fix-tup-lit
Nick Cameron [Wed, 15 Jul 2015 19:05:54 +0000 (07:05 +1200)]
Merge pull request #132 from cassiersg/fix-tup-lit

Fix bug in rewrite_tup_lit