Commit Graph

720 Commits

Author SHA1 Message Date
Nick Cameron 9368de276c Merge pull request #2327 from nrc/macro-defs
Some macros 2.0 macro defs
2018-01-04 14:02:37 +13:00
Nick Cameron e52b383a57 Merge pull request #2306 from dtwood/assert-eq-on-one-line
Add assert_eq! to special-cased macros
2018-01-04 13:42:24 +13:00
Nick Cameron aa758d671f Better handling of comments in macro defs 2018-01-03 20:36:52 +13:00
Nick Cameron 47d9ccd6a1 Tests for formatting macro 2.0 defs 2018-01-01 19:51:54 +13:00
David Alber aa70bbe377 Moving test files to satisfy verify_config_test_names test 2017-12-28 10:29:48 -08:00
David Alber 6939e21f43 Moving config option tests to subdirectory
This was done by running the following.

```sh
for f in `find . -name "configs-*.rs"`; do
    topdir=`echo $f | cut -d/ -f2`;
    configname=`echo $f | cut -d/ -f3 | cut -d- -f2`;
    testname=`echo $f | cut -d/ -f3 | cut -d- -f3`;
    mkdir -p $topdir/configs/$configname;
    git mv $f $topdir/configs/$configname/$testname;
done
```
2017-12-28 10:29:48 -08:00
David Alber 8fb3342ca2 Renaming tests to match existing convention 2017-12-28 10:29:48 -08:00
David Alber 6a583399ff Renaming test to match existing convention 2017-12-28 10:29:48 -08:00
David Wood 39e2f43f91 Split assert_eq! if any arguments are not simple 2017-12-27 21:19:42 +00:00
Seiichi Uchida f523ec58ab Do not give up rewriting struct field when attribute is long 2017-12-24 13:57:29 +09:00
David Wood ef8b2efd13 Fix off-by-one error in assert_eq! line wrapping
If two really long conditions are checked for equality, they wouldn't be split
into multiple lines if the last condition is the one to push the line past the
width limit.

Fix the off-by-one error that caused this, and add a test-case for it.
2017-12-23 01:32:55 +00:00
David Wood e343521276 Add assert_eq! to special-cased macros
Allows for this form of assert_eq! macros:
```rust
assert_eq!(
    left.id, right.id,
    "IDs are not equal: {:?} {:?}",
    left, right
);
```

Also allows for assert! macros to have the format arguments split across
multiple lines even if the assert condition is not simple:
```rust
assert!(
    result >= 42,
    "The result must be at least 42: {:?}",
    result, result.code, context
);
```
2017-12-23 01:06:17 +00:00
topecongiro 984ac100a4 Fix indent width bug when recovering comments
Using last_line_width() ignores the width of tab character ('\t').
2017-12-22 12:05:36 +09:00
Nick Cameron 723b938057 Merge pull request #2291 from topecongiro/issue-2289
Take the width of block's prefix into account only once
2017-12-22 12:58:02 +13:00
topecongiro 366ff40ae7 Take the width of block's prefix into account only once 2017-12-20 15:44:11 +09:00
topecongiro 4f7cbc3aad Add tests for trait aliases 2017-12-15 13:47:32 +09:00
Nick Cameron fc52a4d33f Merge pull request #2173 from topecongiro/assignment-with-100-chars
Assignment whose lhs has 100 chars
2017-12-11 17:04:41 +13:00
Nick Cameron 3c08da3433 Merge pull request #2270 from topecongiro/issue-2260
Trim a trailing whitespace on empty line inside code block comment
2017-12-11 16:40:12 +13:00
Seiichi Uchida a16a5b4c2e Add a test fot #2260 2017-12-11 11:40:59 +09:00
Nick Cameron 0c9b2b402e Merge pull request #2267 from topecongiro/issue-2264
Remove block() and block_only() wherever possible
2017-12-11 09:02:16 +13:00
Nick Cameron 08022ec1a3 Merge pull request #2265 from topecongiro/issue-2262
Fix bugs related to closures
2017-12-11 09:00:56 +13:00
Nick Cameron 5da2d7be32 Merge pull request #2258 from topecongiro/issue-819
Format macro in pattern position
2017-12-11 08:54:02 +13:00
Seiichi Uchida b749aa0699 Add a test fot #2264 2017-12-10 23:38:30 +09:00
Seiichi Uchida 4110c7b8c5 Add a test for #2262 2017-12-10 21:19:51 +09:00
Seiichi Uchida 0909ecbac7 Add tests for macro in pattern position 2017-12-10 00:21:49 +09:00
Seiichi Uchida d4a569848e Add tests for nested imports 2017-12-09 16:45:20 +09:00
Seiichi Uchida 23fa0bc3ef Merge pull request #2240 from davidalber/revisit-2219
Adding `print!` to the list of specially-formatted `format!`-like macros
2017-12-07 17:37:01 +09:00
David Alber 9a25458179 Adding tests for assert!, write!, and writeln! 2017-12-06 22:42:33 -08:00
Nick Cameron b07e4339f0 Merge pull request #2221 from topecongiro/rfc/blank-lines
Keep vertical spaces between items or statements within range
2017-12-06 15:52:19 +13:00
David Alber eb42956e84 Adding print! specially-formatted format!-like macros list
This commit corrects what appears to be an accidental inclusion of
`panic!` twice in the list resulting from the union of ffbe52e and
aeb3398.
2017-12-05 16:56:56 -08:00
David Alber 8c51122f54 Adding tests for all specially-formatted format!-like macros 2017-12-05 16:56:36 -08:00
Seiichi Uchida 9ed05410a3 Add more tests 2017-12-05 17:45:19 +09:00
Seiichi Uchida 2302e904e9 Add a test for 'blank_lines_lower_bound = 1' 2017-12-05 17:38:07 +09:00
Nick Cameron ae51f69de4 Merge pull request #2239 from topecongiro/issue-2157
Fix double indented chained closure
2017-12-05 16:56:52 +13:00
Seiichi Uchida b45a69699a Add a test for #2157 2017-12-05 10:02:49 +09:00
Seiichi Uchida ab8129069a Add a test for #1209 2017-12-05 08:41:10 +09:00
topecongiro 72cac8beae Add a test for special case macros like format! and assert! 2017-12-03 11:34:18 +09:00
Nick Cameron 8f6b6c28f7 Merge pull request #2210 from topecongiro/issue-2178
Combine a short callee and a single argument
2017-12-01 15:02:16 +13:00
topecongiro 5aaa00a929 Add a test for #2214 2017-11-30 22:12:55 +09:00
topecongiro 0f6b4977dd Add a test for #2178 2017-11-30 15:00:13 +09:00
Seiichi Uchida 35aa1dc992 Add a test for #2207 2017-11-30 06:10:50 +09:00
topecongiro 4720462e67 Add a test for #2200 2017-11-29 12:34:09 +09:00
topecongiro 3d7d978fe8 Add a test for #2193 2017-11-27 20:53:54 +09:00
Nick Cameron fcb48786c8 Merge pull request #2191 from topecongiro/issue-2190
Recover from failing to format variants even where there is no comment
2017-11-27 18:14:08 +13:00
Nick Cameron f0af1d4818 Remove CompressedIfEmpty option from fn_args_density
It was identical to Tall
2017-11-27 17:49:55 +13:00
topecongiro 9ece82f9ea Add a test for #2190 2017-11-27 13:49:53 +09:00
Nick Cameron 677446e99d Merge fn_empty_single_line and impl_empty_single_line into empty_item_single_line 2017-11-27 17:46:09 +13:00
Nick Cameron 9a33255834 Rename wrap_match_arms to match_arm_blocks 2017-11-27 17:35:27 +13:00
Nick Cameron 8f4d85a9d7 Merge multiline_closure_forces_block and multiline_match_arm_forces_block into force_multiline_block 2017-11-27 17:03:54 +13:00
Nick Cameron 087f8b5854 Remove match_arm_forces_newline 2017-11-27 16:31:49 +13:00