Commit Graph

1525 Commits

Author SHA1 Message Date
Marcus Klaas de Vries
bd0fdbb364 Merge pull request #543 from eefriedman/macro-crash
Fix crash speculatively parsing macro arguments as expressions.
2015-10-28 08:09:44 +01:00
Eli Friedman
1c235de97d 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.
2015-10-27 23:41:32 -07:00
Nick Cameron
3abe93596a Merge pull request #541 from zeckalpha/link-in-readme
Link in README
2015-10-27 07:47:39 -04:00
Kyle Marek-Spartz
2b5bc7c9a8 Link in README 2015-10-26 21:51:59 -05:00
Nick Cameron
100058f2de Merge pull request #531 from marcusklaas/match-inner-block
Address some issues with multiline patterns in let statements
2015-10-26 06:46:26 +13:00
Nick Cameron
7a9ae5c4ab Merge pull request #533 from marcusklaas/double-help
Print configuration options once in help message
2015-10-26 02:00:39 +13:00
Marcus Klaas de Vries
3ce2b840cf Merge pull request #522 from marcusklaas/writing-tests
Add a brief overview of rustfmt tests
2015-10-24 16:38:51 +02:00
Marcus Klaas
be77f8a277 Add a brief overview of rustfmt tests 2015-10-24 16:24:51 +02:00
Marcus Klaas
4fa0b0bc57 Print configuration options once in help message 2015-10-24 16:03:10 +02:00
Marcus Klaas
d122ad5adc Address some issues with multiline patterns in let statements 2015-10-24 13:13:15 +02:00
Marcus Klaas de Vries
58ff0d8730 Merge pull request #515 from Wafflespeanut/coverage
Coverage mode for rustfmt...
2015-10-24 12:06:27 +02:00
Ravi Shankar
7f7d763175 tests for coverage mode 2015-10-24 15:22:45 +05:30
Ravi Shankar
d135217db2 show rustfmt coverage! 2015-10-24 15:22:37 +05:30
Nick Cameron
29b244b67e Merge pull request #471 from defuz/relative-configfile
Lookup of rustfmt.toml file should be relative from input file
2015-10-24 12:20:54 +13:00
defuz
2ec769709f Lookup rustfmt.toml file is relative from input file, not from current directory 2015-10-24 02:14:12 +03:00
Nick Cameron
efa5df39a5 Merge pull request #530 from marcusklaas/match-inner-block
Bump match inner block indent a level
2015-10-24 11:22:50 +13:00
Nick Cameron
0c1360a77c Merge pull request #529 from marcusklaas/pattern-indent
Fix indentation for enum-style patterns
2015-10-24 11:15:01 +13:00
Nick Cameron
45bcf59bde Merge pull request #528 from marcusklaas/chain-idempotence
Restore idempotence for chain formatting
2015-10-24 11:14:24 +13:00
Marcus Klaas de Vries
02c118ae72 Merge pull request #523 from alexcrichton/stable
Move to stable Rust
2015-10-23 22:57:43 +02:00
Alex Crichton
7fdfff6e58 Update README for stable build 2015-10-23 13:51:29 -07:00
Alex Crichton
4121b503e9 Add test for a macro not containing an exprssion 2015-10-23 13:46:14 -07:00
Alex Crichton
9006a8b87d Test on stable/beta branches on Travis as well 2015-10-23 13:46:14 -07:00
Alex Crichton
e6b7ad3e39 Ignore #[cfg_attr(rustfmt, rustfmt_skip)] functions
This adds to #[rustfmt_skip] but is usable on stable Rust!
2015-10-23 13:46:14 -07:00
Alex Crichton
26958a1c10 Move option parsing to crates.io-based getopts crate
Should help adding more options in the future as well!
2015-10-23 13:46:14 -07:00
Alex Crichton
579fb34417 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.
2015-10-23 13:46:14 -07:00
Alex Crichton
36abfe5dc2 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.
2015-10-23 13:46:14 -07:00
Alex Crichton
cda463275e Use the log/env_logger crates from crates.io 2015-10-23 13:46:14 -07:00
Marcus Klaas
b41965539a Bump match inner block indent a level 2015-10-23 21:39:26 +02:00
Marcus Klaas
ae5d7e6ba4 Fix indentation for enum-style patterns 2015-10-23 20:44:46 +02:00
Marcus Klaas
0bb979bb85 Restore idempotence for chain formatting 2015-10-23 20:37:45 +02:00
Marcus Klaas de Vries
7e76fad1f5 Merge pull request #485 from marcusklaas/floaters2
Deal with floaters
2015-10-22 22:33:24 +02:00
Marcus Klaas
2d267b16d1 Deal with floating links in chains 2015-10-22 22:30:01 +02:00
Nick Cameron
032e6ae833 Merge pull request #517 from eefriedman/match-comma
Improve handling of commas after match arms.
2015-10-22 10:56:02 +13:00
Eli Friedman
e720218ffb Improve handling of commas after match arms.
Fixes #507. Fixes #508.
2015-10-21 14:35:45 -07:00
Nick Cameron
ca50af7f03 Merge pull request #516 from eefriedman/remove-walk
Don't use `visit::walk_*`.  Instead, recurse by hand.
2015-10-22 10:08:17 +13:00
Eli Friedman
be9e7dc689 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.
2015-10-21 13:46:13 -07:00
Marcus Klaas de Vries
8e2547b6bc Merge pull request #505 from tikue/master
Fix doc comment regression and add tests.
2015-10-20 20:14:27 +02:00
Tim Kuehn
6b4ef7457a Fix doc comment regression and add tests. 2015-10-20 02:13:14 -07:00
Marcus Klaas de Vries
526ccff690 Merge pull request #445 from marcusklaas/comments
Format more comments
2015-10-19 23:09:04 +02:00
Marcus Klaas
e8447a8210 Fix large block comments 2015-10-19 23:06:36 +02:00
Marcus Klaas
3970748f59 Remove overflow indentation 2015-10-19 23:06:36 +02:00
Marcus Klaas
cf0f5ca814 Implement CommentCodeSlices 2015-10-19 23:06:35 +02:00
Nick Cameron
0148c16b64 Merge pull request #473 from marcusklaas/empty-struktz
Refactor enum formatting
2015-10-20 09:13:20 +13:00
Marcus Klaas
11756d2ef8 Refactor enum formatting 2015-10-19 21:28:05 +02:00
Marcus Klaas de Vries
754925e132 Merge pull request #484 from marcusklaas/patternz
Format some patterns
2015-10-19 20:20:29 +02:00
Nick Cameron
c719d68078 Merge pull request #500 from marcusklaas/pub-statix
Format visibility for statics and consts
2015-10-20 07:17:01 +13:00
Marcus Klaas
ca023ba9b7 Format some patterns 2015-10-19 20:15:36 +02:00
Marcus Klaas
7e0456b852 Format visibility for statics and consts 2015-10-19 20:08:03 +02:00
Marcus Klaas de Vries
8a9bbd9d7c Merge pull request #487 from marcusklaas/konsts-n-statix
Format constants and static variables
2015-10-18 23:03:01 +02:00
Marcus Klaas
3ce425c9ed Factor out common item indentation idiom 2015-10-18 22:59:39 +02:00