changed lines from rustfmting.
Squashed commit of the following:
commit e90f9da64bbdb640b8c9ee61c3ad395617d8b4da
Author: Chris Emerson <github@mail.nosreme.org>
Date: Sat Jan 20 20:10:16 2018 +0000
Fix tests after merging with master.
commit c3af0042769fe459b0c9c94a0934605ea4b40e40
Merge: 03868583 e0e3e222
Author: Chris Emerson <github@mail.nosreme.org>
Date: Sat Jan 20 17:45:05 2018 +0000
Merge remote-tracking branch 'origin/master' into HEAD
commit 03868583f8555aae30bdfb5839a82afd3704f4cb
Author: Chris Emerson <github@mail.nosreme.org>
Date: Mon Nov 20 01:57:56 2017 +0000
Fix some warnings.
commit 162b13463e44c782394d418db5ca5710931beb7a
Author: Chris Emerson <github@mail.nosreme.org>
Date: Mon Nov 20 01:48:02 2017 +0000
Remove unneeded import.
commit 20cce3cbfd0f386d92b80bf4c7b83ab4d78a73e7
Merge: 81e98147 fa794f58
Author: Chris Emerson <github@mail.nosreme.org>
Date: Mon Nov 20 01:07:17 2017 +0000
Merge branch 'master' into difflines_mode
commit 81e981472ceb3a0938d6f050edf8dcd5ebff8e33
Author: Chris Emerson <github@mail.nosreme.org>
Date: Mon Nov 20 01:02:50 2017 +0000
Add a simple "modified lines" test.
commit 018390ced3523ca9fdd5384a6c1004cdb99174a9
Author: Chris Emerson <github@mail.nosreme.org>
Date: Thu Nov 2 23:06:21 2017 +0000
Update test output.
commit 7909f4986ed21999aff7b3d075332e686ac464ff
Author: Chris Emerson <github@mail.nosreme.org>
Date: Thu Nov 2 23:03:22 2017 +0000
Rerun rustfmt.
commit 6275f1a8da52db1df36c4b7432996cdbb94ca463
Merge: 7a66d286 175c0c6f
Author: Chris Emerson <github@mail.nosreme.org>
Date: Thu Nov 2 21:40:29 2017 +0000
Merge remote-tracking branch 'origin/master' into difflines_mode
commit 7a66d2866432c430b046938bb37bf5efc03fa9da
Author: Chris Emerson <github@mail.nosreme.org>
Date: Thu Nov 2 21:36:40 2017 +0000
WIP: Add a separate API to get changed lines.
Currently calls format_input() and adjusts the output.
commit c8163a923c7d9ae42fd8078cd9b2b51c6f73e36e
Author: Chris Emerson <github@mail.nosreme.org>
Date: Fri Oct 27 22:53:33 2017 +0100
Remove "modified" from the documentation again.
commit 94041fa115a6f428afe40e01d41bf2fe603f70bb
Merge: acaa3c7c 2adf7eec
Author: Chris Emerson <github@mail.nosreme.org>
Date: Fri Oct 27 22:47:05 2017 +0100
Merge branch 'master' into difflines_mode
commit acaa3c7ce446297cd3fe5c9610763629a2d8537c
Author: Chris Emerson <github@mail.nosreme.org>
Date: Tue Oct 24 23:34:14 2017 +0100
Update the Modified write mode to use `out` instead of just prinln!().
This means we can test it more easily, so do so.
commit 9f1bbca1f3c12d933ea823918cc548e69b438b1e
Author: Chris Emerson <github@mail.nosreme.org>
Date: Tue Oct 24 23:11:55 2017 +0100
Add "Modified" to the various lists of modes.
commit e12f023756cf3daf202dcaa02bd6492b0d2a0455
Author: Chris Emerson <github@mail.nosreme.org>
Date: Tue Oct 24 22:57:33 2017 +0100
Rerun cargo fmt.
commit 0f8a43630fa1548e95dcb1c0933708f9c11ae135
Author: Chris Emerson <github@mail.nosreme.org>
Date: Tue Oct 24 22:46:26 2017 +0100
Add `line_number_orig` to instances of `Mismatch` in tests.
commit d432a7061f74dbc159584f08470c64985a4b41d9
Author: Chris Emerson <github@mail.nosreme.org>
Date: Tue Oct 24 22:41:40 2017 +0100
Add a `line_number_orig` field to `Mismatch` to track the pre-format line number.
Use that for the write-mode=modified output.
commit bdb7d1d23f02f7b8f18e7073a65be88ff94cdbb3
Author: Chris Emerson <github@mail.nosreme.org>
Date: Tue Oct 24 22:35:50 2017 +0100
First basic --write-mode=modified implementation.
commit ea1433dae0c32879a31182c11be08b1bf53fbf31
Author: Chris Emerson <github@mail.nosreme.org>
Date: Fri Oct 20 00:04:16 2017 +0100
WIP on new "modified" mode.
commit 27ee9483cf937a11a0e115f54de0afcc3f9ceb44
Merge: e48dd81a 2a84352d
Author: Chris Emerson <github@mail.nosreme.org>
Date: Tue Oct 24 21:56:44 2017 +0100
Merge remote-tracking branch 'jc/diff_zero_context' into difflines_mode
We put the opening brace on the next line if the following conditions hold:
1. the result before '{' ends with comments or contains newline
2. the last line of the result before '{' is not extendable (i.e. consists of
'>' and whitespaces).
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.
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
);
```
