3983 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Seiichi Uchida	5a6822c326	Cargo update	2018-10-07 00:39:49 +09:00
Seiichi Uchida	383a23d0ee	Merge pull request #3073 from scampi/format_strings ... format_strings: take into account newline occurring within a rewritten line	2018-10-02 10:29:37 +09:00
Stéphane Campinas	4b26723e55	format_strings: take into account newline occurring within a rewritten line	2018-10-02 00:41:56 +02:00
Nick Cameron	4c1b0c2241	Merge pull request #3061 from mehcode/feature/default-edition ... Fix help message for edition config option	2018-09-28 21:54:29 +12:00
Nick Cameron	3dc6eed601	Merge pull request #2816 from moxian/enum-discrim ... Add option to vertically align enum discriminants.	2018-09-28 21:48:57 +12:00
Ryan Leckey	c7377c3555	Fix help message for edition config option	2018-09-27 22:31:17 -07:00
Seiichi Uchida	86fff9eafa	Merge pull request #3050 from andrehjr/empty-impl-body-with-braces-newline ... Trait Implementation - Adds a newline before the last brace on impls without a body if the first brace is also on a newline	2018-09-28 11:10:58 +09:00
Seiichi Uchida	333c580090	Merge pull request #3052 from scampi/contributing ... added a note about the use of the RUST_LOG environment variable	2018-09-28 11:08:51 +09:00
Stéphane Campinas	2bcc3a9302	do not format a code block in documentation if it is annotated with ignore or text (#3058)	2018-09-28 11:06:29 +09:00
Stéphane Campinas	d681d5f456	added a note about the use of the RUST_LOG environment variable	2018-09-26 22:42:59 +02:00
moxian	65ae0b9a09	Change enum align semantics to care about absolute length, rather than difference. ... If we're only aligning enum discriminants that are "not too far apart (length-wise)", then this works really well for enums with consistently-long or consistently-short idents, but not for the mixed ones. However, consistently-long idents is somewhate of an uncommon case and overlong idents may be allowed to be formatted suboptimally if that makes mixed-length idents work better (and it does in this case).	2018-09-26 18:47:17 +00:00
moxian	cc22869fb4	Add option to vertically align enum discriminants.	2018-09-26 14:35:38 +00:00
André Luis Leal Cardoso Junior	2727d41ddb	Makes brace behavior consistent with empty bodies for traits and impls ... Adds a newline before the last brace on impls without a body if the first brace is also on a newline	2018-09-26 09:44:13 -03:00
Nick Cameron	90692a5917	Update rustc_ap_syntax	2018-09-26 08:55:15 +12:00
Nick Cameron	88f3b32e43	Remove unnecessary feature flag	2018-09-25 18:23:17 +12:00
Nick Cameron	ac6871f376	Merge pull request #3048 from emilio/merged-comments ... lists: Detect block comment by starting from the end.	2018-09-24 14:22:01 +12:00
Nick Cameron	1e60c6118e	Merge pull request #3045 from scampi/issue2917 ... Prevent right-shifting of block comments with bare lines.	2018-09-24 14:11:46 +12:00
Nick Cameron	ff4fe5db13	Merge pull request #3044 from orium/fix-too-many-modsep ... Fix bug in import where two consecutive module separators were possible.	2018-09-24 14:07:20 +12:00
Emilio Cobos Álvarez	66c15e46ba	lists: Detect block comment by starting from the end. ... The issue with the current code is that comments are collapsed, so comments like the one from the test end up in a string like: ``` "// this is a single line comment\n/* block = */" ``` I chose to fix it by detecting whether we're in a block comment starting from the end instead, and tested a single-line comment ended in `*/` just for sanity, ensuring line breaks are not removed in that case, which would break the formatting. The right fix eventually is probably to lex the comments properly, but this does the work for now, I guess :) Fixes #3025	2018-09-22 12:16:38 +02:00
Stéphane Campinas	5fdb6db136	Prevent right-shifting of block comments with bare lines. ... Lines that didn't start with a comment sigil were returned unchanged in comment::rewrite_comment. Then these unchanged lines were indented in MacroBranch::rewrite.	2018-09-22 00:09:11 +02:00
Diogo Sousa	98a0ef2436	Fix bug in import where two consecutive module separators were possible. ... Fixes #3043.	2018-09-21 18:51:19 +01:00
Nick Cameron	4568c1a70f	Merge pull request #3042 from topecongiro/issue-3040 ... Do not trim a block from expression if its condition will go multi-line	2018-09-21 14:25:21 +12:00
Seiichi Uchida	f70d139f9c	Do not trim a block from expression if its condition will go multi-line	2018-09-21 00:58:47 +09:00
Seiichi Uchida	ec32c961d3	Add a test for #3040	2018-09-21 00:57:46 +09:00
Nick Cameron	cd8549e013	Merge pull request #3036 from topecongiro/issue-2932 ... Combine chain items only when the item gets orphaned otherwise	2018-09-20 11:36:46 +12:00
Nick Cameron	635efdf69b	Merge pull request #3035 from topecongiro/issue-3006 ... Format generics on associated types	2018-09-20 11:33:47 +12:00
Seiichi Uchida	e2b9c66cc9	Cargo fmt	2018-09-19 23:22:26 +09:00
Seiichi Uchida	d4f7e219dc	Fix shape for index	2018-09-19 23:21:07 +09:00
Seiichi Uchida	76650174c7	Combine chain items only when the item will get orphaned	2018-09-19 23:20:43 +09:00
Seiichi Uchida	594774b4e5	Update tests	2018-09-19 23:19:24 +09:00
Seiichi Uchida	7eca33f8a5	Format generics on associated types	2018-09-19 22:33:28 +09:00
Seiichi Uchida	8021b29405	Add a test for #3006	2018-09-19 22:33:25 +09:00
Nick Cameron	829dbfabe9	Merge pull request #3028 from scampi/issue2973 ... Fix indent computation of a macro with braces.	2018-09-19 11:31:28 +12:00
Nick Cameron	1739041f03	Merge pull request #3002 from lqd/normalize-doc-attributes ... normalize_doc_attributes option: convert doc attributes to comments	2018-09-19 11:05:27 +12:00
Nick Cameron	2267c2cddc	Merge pull request #3001 from scampi/issue2977 ... propagate errors about failing to rewrite a macro	2018-09-19 10:43:21 +12:00
Nick Cameron	14fdf2e6b1	Merge pull request #3014 from PSeitz/master ... fixes #2914 by handling BadIssue case	2018-09-19 10:42:16 +12:00
Seiichi Uchida	661bea71c1	Merge pull request #3013 from YaLTeR/fix-issue-2985 ... Fix wrong shape for last chain items for indent_style = "Visual"	2018-09-18 20:21:21 +09:00
Nathan Sutton	d165533813	Improve error message when failing cargo metadata (#3024)	2018-09-18 20:20:07 +09:00
Seiichi Uchida	68ede7bf45	Merge pull request #3019 from yangby-cryptape/fix-typo-in-readme ... Fix typo in README.md.	2018-09-18 20:18:24 +09:00
Seiichi Uchida	abe1e60a73	Merge pull request #3017 from matthiaskrgr/typo ... cargo fmt: fix typo in format_crate(): (verison -> version)	2018-09-18 20:17:59 +09:00
Nick Cameron	01c14a2058	Merge pull request #3012 from YaLTeR/fix-issue-2496 ... Fix match arm block flattening	2018-09-18 21:12:12 +12:00
Stéphane Campinas	c3edf6d3a1	Fix indent computation of a macro with braces. ... The leading whitespace of a multine string was taken into account when computing the `min_prefix_space_width`, even if that line couldn't be trimmed. The consequence is it was always shifting the macro's content to the right.	2018-09-18 00:01:51 +02:00
Boyu Yang	ef4de4d005	Fix typo in README.md.	2018-09-13 10:01:34 +08:00
Rémy Rakic	0c73b9414b	add test ensuring only doc = "" attributes are normalized to comments ... The other shapes of doc attributes shouldn't be normalized or modified.	2018-09-13 02:40:24 +02:00
Rémy Rakic	cbc58410d9	add tests interleaving doc attrib comments and regular comments	2018-09-13 02:27:09 +02:00
Rémy Rakic	6c96ab7c9a	address review comment in Attribute rewrite fn	2018-09-13 01:13:07 +02:00
Rémy Rakic	171e656f64	add non-regression test to existing attributes ... when `normalize_doc_attributes` is on, they shouldn't be affected	2018-09-13 01:10:57 +02:00
Rémy Rakic	4af0888648	add non-regression test to existing doc attributes ... when `normalize_doc_attributes` is off, they shouldn't be normalized to a doc comment	2018-09-13 01:06:02 +02:00
Rémy Rakic	43f813867c	add test with multiple levels of indents	2018-09-13 01:02:11 +02:00
Rémy Rakic	9f6cf7b72c	move config attribute	2018-09-13 00:37:31 +02:00