]> git.lizzy.rs Git - rust.git/log
rust.git
8 years agoAdd --version switch
Jan Likar [Mon, 16 Nov 2015 03:37:08 +0000 (04:37 +0100)]
Add --version switch

Add --version switch, which prints a short hash of the current
commit. Fix #612

8 years agoRustup
Nick Cameron [Thu, 12 Nov 2015 20:38:41 +0000 (09:38 +1300)]
Rustup

8 years agoImplement initial option for brace style for non-fn items.
Pavel Sountsov [Sun, 15 Nov 2015 19:55:18 +0000 (11:55 -0800)]
Implement initial option for brace style for non-fn items.

8 years agoMerge pull request #607 from rhoot/native-newline
Nick Cameron [Sun, 15 Nov 2015 19:25:22 +0000 (08:25 +1300)]
Merge pull request #607 from rhoot/native-newline

Adding a "Native" option to newline_style.

8 years agoMerge pull request #605 from sanxiyn/verbose
Nick Cameron [Sun, 15 Nov 2015 18:33:39 +0000 (07:33 +1300)]
Merge pull request #605 from sanxiyn/verbose

Add verbose mode

8 years agoAdds a "Native" option to newline_style.
Johan Sköld [Sun, 15 Nov 2015 11:34:04 +0000 (03:34 -0800)]
Adds a "Native" option to newline_style.

By using it one will get \r\n line endings on Windows, and \n line endings
on other platforms.

8 years agoAdd verbose mode
Seo Sanghyeon [Sun, 15 Nov 2015 06:41:41 +0000 (15:41 +0900)]
Add verbose mode

8 years agoMerge pull request #604 from eefriedman/path-cleanup
Marcus Klaas de Vries [Sat, 14 Nov 2015 23:02:12 +0000 (00:02 +0100)]
Merge pull request #604 from eefriedman/path-cleanup

Pass in whether an ast::Path is in an expression context.

8 years agoPass in whether an ast::Path is in an expression context.
Eli Friedman [Sat, 14 Nov 2015 21:52:43 +0000 (13:52 -0800)]
Pass in whether an ast::Path is in an expression context.

This gets rid of a slightly nasty hack involving scanning the source
expression for a ":".

8 years agoMerge pull request #601 from thorbenk/chains_tabbed_indent
Marcus Klaas de Vries [Sat, 14 Nov 2015 21:00:11 +0000 (22:00 +0100)]
Merge pull request #601 from thorbenk/chains_tabbed_indent

Chains tabbed indent

8 years agonew config 'chain_indent'
Thorben Kroeger [Sat, 14 Nov 2015 16:47:59 +0000 (17:47 +0100)]
new config 'chain_indent'

8 years agoMerge pull request #602 from crumblingstatue/report_newline
Marcus Klaas de Vries [Sat, 14 Nov 2015 18:23:00 +0000 (19:23 +0100)]
Merge pull request #602 from crumblingstatue/report_newline

Don't print an unnecessary newline after printing format report

8 years agoMerge pull request #600 from thorbenk/config_help_cmd
Marcus Klaas de Vries [Sat, 14 Nov 2015 18:22:27 +0000 (19:22 +0100)]
Merge pull request #600 from thorbenk/config_help_cmd

fix documentation of config help

8 years agoDon't print an unnecessary newline after printing format report
Mika Attila [Sat, 14 Nov 2015 18:01:28 +0000 (19:01 +0100)]
Don't print an unnecessary newline after printing format report

The Display implementation for FormatReport already prints
a newline after every error.

However, if the format report does not contain errors, we
don't want to print an empty newline.

This behavior clutters up the console output with
empty lines when rustfmt is invoked multiple times
(from .e.g a script or cargo-fmt).

So instead of using println! to print the report, we just
use print!.

8 years agofix documentation of config help
Thorben Kroeger [Sat, 14 Nov 2015 15:43:18 +0000 (16:43 +0100)]
fix documentation of config help

8 years agoMerge pull request #596 from marcusklaas/where-indent
Nick Cameron [Fri, 13 Nov 2015 21:04:04 +0000 (10:04 +1300)]
Merge pull request #596 from marcusklaas/where-indent

Fix brace indentation after where clause

8 years agoMerge pull request #597 from marcusklaas/method-generix
Nick Cameron [Fri, 13 Nov 2015 21:03:12 +0000 (10:03 +1300)]
Merge pull request #597 from marcusklaas/method-generix

Fix span issue with generic method calls

8 years agoMerge pull request #593 from JanLikar/Fix580
Nick Cameron [Fri, 13 Nov 2015 21:01:58 +0000 (10:01 +1300)]
Merge pull request #593 from JanLikar/Fix580

Enable rustfmt to format a list of files

8 years agoFix span issue with generic method calls
Marcus Klaas [Fri, 13 Nov 2015 13:53:34 +0000 (14:53 +0100)]
Fix span issue with generic method calls

8 years agoFix brace indentation after where clause
Marcus Klaas [Fri, 13 Nov 2015 13:31:20 +0000 (14:31 +0100)]
Fix brace indentation after where clause

8 years agoMerge pull request #594 from cskksc/master
Nick Cameron [Fri, 13 Nov 2015 05:56:59 +0000 (18:56 +1300)]
Merge pull request #594 from cskksc/master

Add emacs integration to readme.

8 years agoMerge branch 'master' of https://github.com/rust-lang-nursery/rustfmt
cskksc [Fri, 13 Nov 2015 03:25:48 +0000 (08:55 +0530)]
Merge branch 'master' of https://github.com/rust-lang-nursery/rustfmt

8 years agoAdd emacs integration to readme.
cskksc [Thu, 12 Nov 2015 09:44:28 +0000 (15:14 +0530)]
Add emacs integration to readme.

8 years agoCorrect some non-idiomatic code
Jan Likar [Fri, 13 Nov 2015 01:08:57 +0000 (02:08 +0100)]
Correct some non-idiomatic code

8 years agoMerge pull request #592 from johannhof/coveralls
Nick Cameron [Fri, 13 Nov 2015 00:32:25 +0000 (13:32 +1300)]
Merge pull request #592 from johannhof/coveralls

Try fixing OSX builds

8 years agoEnable rustfmt to format a list of files
Jan Likar [Fri, 13 Nov 2015 00:13:25 +0000 (01:13 +0100)]
Enable rustfmt to format a list of files

Fix #580 by allowing rustfmt to accept a list of files. This also
enables usage of shell wildcard expansion, although notably this does
not work with cmd.exe on Windows. For example: 'rustfmt *.rs' will
format all rust files in the current working directory.

  - Change usage text to show rustfmt will accept a list of files
  - Change "Using rustfmt config file: {}" message to
    "Using rustfmt config file {} for {}"
  - Change Operation::Format(PathBuf, WriteMode) to
    Operation::Format(Vec<PathBuf>, WriteMode)
  - Loop through Vec<PathBuf>, load config and call 'run' for each path

8 years agoTry fixing OSX builds
Johann [Thu, 12 Nov 2015 22:47:24 +0000 (23:47 +0100)]
Try fixing OSX builds

... that I broke by introducing travis-cargo.

8 years agoMerge pull request #590 from johannhof/coveralls
Nick Cameron [Thu, 12 Nov 2015 21:58:51 +0000 (10:58 +1300)]
Merge pull request #590 from johannhof/coveralls

Report test coverage with travis-cargo & coveralls

8 years agoReport test coverage with travis-cargo & coveralls
Johann [Thu, 12 Nov 2015 21:38:35 +0000 (22:38 +0100)]
Report test coverage with travis-cargo & coveralls

As this project grows, it might be beneficial to require pull requests
to keep a certain level of test coverage. Plus it's a fun statistic.

8 years agoMerge pull request #582 from rust-lang-nursery/links
Nick Cameron [Wed, 11 Nov 2015 22:51:51 +0000 (11:51 +1300)]
Merge pull request #582 from rust-lang-nursery/links

make links work

8 years agomake links work
Nick Cameron [Wed, 11 Nov 2015 22:46:55 +0000 (11:46 +1300)]
make links work

8 years agoMerge pull request #579 from alex/patch-2
Nick Cameron [Wed, 11 Nov 2015 20:14:50 +0000 (09:14 +1300)]
Merge pull request #579 from alex/patch-2

Cache downloaded packages on travis

8 years agoUpdate README with new url
Nick Cameron [Wed, 11 Nov 2015 20:01:38 +0000 (09:01 +1300)]
Update README with new url

8 years agoMerge pull request #578 from alex/patch-1
Nick Cameron [Wed, 11 Nov 2015 20:00:09 +0000 (09:00 +1300)]
Merge pull request #578 from alex/patch-1

Update README, cargo install is now stable

8 years agoCache downloaded packages on travis
Alex Gaynor [Wed, 11 Nov 2015 17:41:12 +0000 (12:41 -0500)]
Cache downloaded packages on travis

8 years agoUpdate README, cargo install is now stable
Alex Gaynor [Wed, 11 Nov 2015 17:34:17 +0000 (12:34 -0500)]
Update README, cargo install is now stable

8 years agoMerge pull request #478 from KeenS/travis
Nick Cameron [Tue, 10 Nov 2015 22:24:12 +0000 (11:24 +1300)]
Merge pull request #478 from KeenS/travis

Create a binary from travis ci and so on

8 years agoMerge pull request #577 from nrc/docs
Nick Cameron [Tue, 10 Nov 2015 22:16:20 +0000 (11:16 +1300)]
Merge pull request #577 from nrc/docs

Information for new contributors

8 years agoInformation for new contributors
Nick Cameron [Mon, 9 Nov 2015 18:34:44 +0000 (07:34 +1300)]
Information for new contributors

8 years agoMerge pull request #571 from nrc/semi
Marcus Klaas de Vries [Tue, 10 Nov 2015 07:43:29 +0000 (08:43 +0100)]
Merge pull request #571 from nrc/semi

Don't strip semi-colons from expressions with non-void type since it …

8 years agoMerge pull request #576 from boblehest/check_cwd_for_config
Nick Cameron [Mon, 9 Nov 2015 22:05:48 +0000 (17:05 -0500)]
Merge pull request #576 from boblehest/check_cwd_for_config

Check if the CWD contains a config (previously it only checked parents)

8 years agoCheck if the CWD contains a config (previously it only checked parents)
Jørn Lode [Mon, 9 Nov 2015 20:41:25 +0000 (21:41 +0100)]
Check if the CWD contains a config (previously it only checked parents)

8 years agoMerge pull request #573 from nrc/doom_panic
Marcus Klaas de Vries [Mon, 9 Nov 2015 19:17:50 +0000 (20:17 +0100)]
Merge pull request #573 from nrc/doom_panic

Format tuple structs better

8 years agoMerge pull request #575 from nrc/comments
Marcus Klaas de Vries [Mon, 9 Nov 2015 19:15:56 +0000 (20:15 +0100)]
Merge pull request #575 from nrc/comments

Option to disable line breaking in comments

8 years agoOption to disable line breaking in comments
Nick Cameron [Mon, 9 Nov 2015 19:03:01 +0000 (08:03 +1300)]
Option to disable line breaking in comments

Set to false by default for now, since we are having a lot of problems with comments. We should set to true once we have a better algorithm.

8 years agoFormat tuple structs better
Nick Cameron [Mon, 9 Nov 2015 06:00:04 +0000 (19:00 +1300)]
Format tuple structs better

closes #546

8 years agoDon't strip semi-colons from expressions with non-void type since it can change semantics
Nick Cameron [Mon, 9 Nov 2015 00:23:19 +0000 (13:23 +1300)]
Don't strip semi-colons from expressions with non-void type since it can change semantics

8 years agoMerge pull request #567 from kamalmarhubi/config-docs-flag
Nick Cameron [Sun, 8 Nov 2015 03:41:16 +0000 (22:41 -0500)]
Merge pull request #567 from kamalmarhubi/config-docs-flag

Move config help to dedicated --config-help flag

8 years agoMove config help to dedicated --config-help flag
Kamal Marhubi [Sun, 8 Nov 2015 00:03:25 +0000 (19:03 -0500)]
Move config help to dedicated --config-help flag

The existing help output is very verbose, overflowing a 50+ line
terminal. This moves the configuration options to a separate help flag
to make a mistyped command less annoying!

8 years agoMerge pull request #565 from takkanm/fix_unused_variable_path_warning
Nick Cameron [Wed, 4 Nov 2015 23:37:27 +0000 (18:37 -0500)]
Merge pull request #565 from takkanm/fix_unused_variable_path_warning

fix unused variable `path` warning

8 years agofix unused variable `path` warning
Mitsutaka Mimura [Wed, 4 Nov 2015 23:14:55 +0000 (08:14 +0900)]
fix unused variable `path` warning

8 years agoAdd Vim reference to README and reorg
Nick Cameron [Wed, 4 Nov 2015 04:45:01 +0000 (17:45 +1300)]
Add Vim reference to README and reorg

8 years agoMerge pull request #560 from Florob/enum_trailing_comma
Nick Cameron [Tue, 3 Nov 2015 23:59:43 +0000 (18:59 -0500)]
Merge pull request #560 from Florob/enum_trailing_comma

Honor "enum_trailing_comma" option. Fixes #556

8 years agoHonor "enum_trailing_comma" option. Fixes #556
Florian Zeitz [Tue, 3 Nov 2015 22:14:37 +0000 (23:14 +0100)]
Honor "enum_trailing_comma" option. Fixes #556

8 years agoMerge pull request #558 from johannhof/master
Nick Cameron [Tue, 3 Nov 2015 08:39:21 +0000 (03:39 -0500)]
Merge pull request #558 from johannhof/master

Stdin support

8 years agoAddress review concerns
Johann [Tue, 3 Nov 2015 08:16:33 +0000 (09:16 +0100)]
Address review concerns

8 years agoStdin support
Johann [Mon, 2 Nov 2015 19:45:45 +0000 (20:45 +0100)]
Stdin support

Adds support for receiving input from stdin in case no file was
specified. This is useful for editor/IDE integrations and other tooling.

To achieve clean output a new write-mode option called plain was added,
this option is mandatory when using stdin.

8 years agoMerge pull request #543 from eefriedman/macro-crash
Marcus Klaas de Vries [Wed, 28 Oct 2015 07:09:44 +0000 (08:09 +0100)]
Merge pull request #543 from eefriedman/macro-crash

Fix crash speculatively parsing macro arguments as expressions.

8 years agoFix crash speculatively parsing macro arguments as expressions.
Eli Friedman [Wed, 28 Oct 2015 06:41:32 +0000 (23:41 -0700)]
Fix crash speculatively parsing macro arguments as expressions.

The problem is essentially that if we try to parse a token tree using a
CodeMap different from the one the tree was originally parsed with,
spans become nonsense. Since CodeMaps can't be cloned, we're basically
forced to use the original ParseSess for additional parsing.

Ideally, rustfmt would be a bit more clever and figure out how to parse
macro arguments based on the definition of the macro itself, rather than
just guessing that a particular token sequence looks like an expression,
but this is good enough for now.

Fixes #538.

8 years agoMerge pull request #541 from zeckalpha/link-in-readme
Nick Cameron [Tue, 27 Oct 2015 11:47:39 +0000 (07:47 -0400)]
Merge pull request #541 from zeckalpha/link-in-readme

Link in README

8 years agoLink in README
Kyle Marek-Spartz [Tue, 27 Oct 2015 02:51:59 +0000 (21:51 -0500)]
Link in README

8 years agoMerge pull request #531 from marcusklaas/match-inner-block
Nick Cameron [Sun, 25 Oct 2015 17:46:26 +0000 (06:46 +1300)]
Merge pull request #531 from marcusklaas/match-inner-block

Address some issues with multiline patterns in let statements

8 years agoMerge pull request #533 from marcusklaas/double-help
Nick Cameron [Sun, 25 Oct 2015 13:00:39 +0000 (02:00 +1300)]
Merge pull request #533 from marcusklaas/double-help

Print configuration options once in help message

8 years agoMerge pull request #522 from marcusklaas/writing-tests
Marcus Klaas de Vries [Sat, 24 Oct 2015 14:38:51 +0000 (16:38 +0200)]
Merge pull request #522 from marcusklaas/writing-tests

Add a brief overview of rustfmt tests

8 years agoAdd a brief overview of rustfmt tests
Marcus Klaas [Thu, 22 Oct 2015 21:51:19 +0000 (23:51 +0200)]
Add a brief overview of rustfmt tests

8 years agoPrint configuration options once in help message
Marcus Klaas [Sat, 24 Oct 2015 13:30:26 +0000 (15:30 +0200)]
Print configuration options once in help message

8 years agoAddress some issues with multiline patterns in let statements
Marcus Klaas [Sat, 24 Oct 2015 10:19:58 +0000 (12:19 +0200)]
Address some issues with multiline patterns in let statements

8 years agoMerge pull request #515 from Wafflespeanut/coverage
Marcus Klaas de Vries [Sat, 24 Oct 2015 10:06:27 +0000 (12:06 +0200)]
Merge pull request #515 from Wafflespeanut/coverage

Coverage mode for rustfmt...

8 years agotests for coverage mode
Ravi Shankar [Fri, 23 Oct 2015 14:42:07 +0000 (20:12 +0530)]
tests for coverage mode

8 years agoshow rustfmt coverage!
Ravi Shankar [Wed, 21 Oct 2015 07:26:24 +0000 (12:56 +0530)]
show rustfmt coverage!

8 years agoMerge pull request #471 from defuz/relative-configfile
Nick Cameron [Fri, 23 Oct 2015 23:20:54 +0000 (12:20 +1300)]
Merge pull request #471 from defuz/relative-configfile

Lookup of rustfmt.toml file should be relative from input file

8 years agoLookup rustfmt.toml file is relative from input file, not from current directory
defuz [Fri, 16 Oct 2015 08:08:47 +0000 (11:08 +0300)]
Lookup rustfmt.toml file is relative from input file, not from current directory

8 years agoMerge pull request #530 from marcusklaas/match-inner-block
Nick Cameron [Fri, 23 Oct 2015 22:22:50 +0000 (11:22 +1300)]
Merge pull request #530 from marcusklaas/match-inner-block

Bump match inner block indent a level

8 years agoMerge pull request #529 from marcusklaas/pattern-indent
Nick Cameron [Fri, 23 Oct 2015 22:15:01 +0000 (11:15 +1300)]
Merge pull request #529 from marcusklaas/pattern-indent

Fix indentation for enum-style patterns

8 years agoMerge pull request #528 from marcusklaas/chain-idempotence
Nick Cameron [Fri, 23 Oct 2015 22:14:24 +0000 (11:14 +1300)]
Merge pull request #528 from marcusklaas/chain-idempotence

Restore idempotence for chain formatting

8 years agoMerge pull request #523 from alexcrichton/stable
Marcus Klaas de Vries [Fri, 23 Oct 2015 20:57:43 +0000 (22:57 +0200)]
Merge pull request #523 from alexcrichton/stable

Move to stable Rust

8 years agoUpdate README for stable build
Alex Crichton [Fri, 23 Oct 2015 20:51:29 +0000 (13:51 -0700)]
Update README for stable build

8 years agoAdd test for a macro not containing an exprssion
Alex Crichton [Thu, 22 Oct 2015 23:20:45 +0000 (16:20 -0700)]
Add test for a macro not containing an exprssion

8 years agoTest on stable/beta branches on Travis as well
Alex Crichton [Thu, 22 Oct 2015 22:09:12 +0000 (15:09 -0700)]
Test on stable/beta branches on Travis as well

8 years agoIgnore #[cfg_attr(rustfmt, rustfmt_skip)] functions
Alex Crichton [Thu, 22 Oct 2015 22:02:53 +0000 (15:02 -0700)]
Ignore #[cfg_attr(rustfmt, rustfmt_skip)] functions

This adds to #[rustfmt_skip] but is usable on stable Rust!

8 years agoMove option parsing to crates.io-based getopts crate
Alex Crichton [Thu, 22 Oct 2015 21:38:16 +0000 (14:38 -0700)]
Move option parsing to crates.io-based getopts crate

Should help adding more options in the future as well!

8 years agoRemove dependence on rustc/rustc_driver, use syntex
Alex Crichton [Thu, 22 Oct 2015 21:37:13 +0000 (14:37 -0700)]
Remove dependence on rustc/rustc_driver, use syntex

Instead just parse manually with the `syntex_syntax` crate which is a clone of
libsyntax on crates.io which builds on stable Rust.

8 years agoRemove usage of many unstable features
Alex Crichton [Thu, 22 Oct 2015 21:35:42 +0000 (14:35 -0700)]
Remove usage of many unstable features

This removes usage of:

* PathExt
* split_last
* split_last_mut
* catch_panic

The catch_panic one was a little tricky as the ident interner needed to be
cloned across threads (a little unsafely), but it should otherwise be good to
go.

8 years agoUse the log/env_logger crates from crates.io
Alex Crichton [Thu, 22 Oct 2015 21:34:05 +0000 (14:34 -0700)]
Use the log/env_logger crates from crates.io

8 years agoBump match inner block indent a level
Marcus Klaas [Fri, 23 Oct 2015 19:20:43 +0000 (21:20 +0200)]
Bump match inner block indent a level

8 years agoFix indentation for enum-style patterns
Marcus Klaas [Fri, 23 Oct 2015 18:44:46 +0000 (20:44 +0200)]
Fix indentation for enum-style patterns

8 years agoRestore idempotence for chain formatting
Marcus Klaas [Fri, 23 Oct 2015 18:36:38 +0000 (20:36 +0200)]
Restore idempotence for chain formatting

8 years agoMerge pull request #485 from marcusklaas/floaters2
Marcus Klaas de Vries [Thu, 22 Oct 2015 20:33:24 +0000 (22:33 +0200)]
Merge pull request #485 from marcusklaas/floaters2

Deal with floaters

8 years agoDeal with floating links in chains
Marcus Klaas [Sun, 18 Oct 2015 15:56:13 +0000 (17:56 +0200)]
Deal with floating links in chains

8 years agoMerge pull request #517 from eefriedman/match-comma
Nick Cameron [Wed, 21 Oct 2015 21:56:02 +0000 (10:56 +1300)]
Merge pull request #517 from eefriedman/match-comma

Improve handling of commas after match arms.

8 years agoImprove handling of commas after match arms.
Eli Friedman [Wed, 21 Oct 2015 21:35:45 +0000 (14:35 -0700)]
Improve handling of commas after match arms.

Fixes #507. Fixes #508.

8 years agoMerge pull request #516 from eefriedman/remove-walk
Nick Cameron [Wed, 21 Oct 2015 21:08:17 +0000 (10:08 +1300)]
Merge pull request #516 from eefriedman/remove-walk

Don't use `visit::walk_*`.  Instead, recurse by hand.

8 years agoDon't use `visit::walk_*`. Instead, recurse by hand.
Eli Friedman [Wed, 21 Oct 2015 20:21:14 +0000 (13:21 -0700)]
Don't use `visit::walk_*`.  Instead, recurse by hand.

This is much more straightforward to understand given how rustfmt
rewriting works, and it avoids walking into expressions in unexpected
places.

Fixes #513. Fixes #514.

8 years agoMerge pull request #505 from tikue/master
Marcus Klaas de Vries [Tue, 20 Oct 2015 18:14:27 +0000 (20:14 +0200)]
Merge pull request #505 from tikue/master

Fix doc comment regression and add tests.

8 years agoFix doc comment regression and add tests.
Tim Kuehn [Tue, 20 Oct 2015 09:12:52 +0000 (02:12 -0700)]
Fix doc comment regression and add tests.

8 years agoMerge pull request #445 from marcusklaas/comments
Marcus Klaas de Vries [Mon, 19 Oct 2015 21:09:04 +0000 (23:09 +0200)]
Merge pull request #445 from marcusklaas/comments

Format more comments

8 years agoFix large block comments
Marcus Klaas [Mon, 19 Oct 2015 19:41:47 +0000 (21:41 +0200)]
Fix large block comments

8 years agoRemove overflow indentation
Marcus Klaas [Mon, 19 Oct 2015 19:41:18 +0000 (21:41 +0200)]
Remove overflow indentation

8 years agoImplement CommentCodeSlices
Marcus Klaas [Mon, 19 Oct 2015 19:40:00 +0000 (21:40 +0200)]
Implement CommentCodeSlices

8 years agoMerge pull request #473 from marcusklaas/empty-struktz
Nick Cameron [Mon, 19 Oct 2015 20:13:20 +0000 (09:13 +1300)]
Merge pull request #473 from marcusklaas/empty-struktz

Refactor enum formatting