about summary refs log tree commit diff
path: root/src/test
diff options
context:
space:
mode:
authorIgor Matuszewski <Xanewok@gmail.com>2019-03-01 19:20:57 +0100
committerIgor Matuszewski <Xanewok@gmail.com>2019-03-04 18:19:30 +0100
commitb3c28dba830fb7c88133a0a402f02a5dff9d0738 (patch)
tree9e9c13fa33180f6b3d9903dac3b88b3b689e452d /src/test
parent0437bf7a7d968af885dc05931e4e7d1eaddaadbf (diff)
Expose ModifiedLines and implement parsing data from the string output
This moves `Modified{Chunks,Lines}` from `src/formatting.rs` to
`src/rustfmt_diff.rs` and reexports it in `src/lib.rs`.

With this, a conversion from `Vec<Mismatch>` to `ModifiedLines` was implemented
and now this implements complementary `Display` and `FromStr`, which
simplified the previously used `output_modified` function and which allows to
parse the raw data emitted with `EmitMode::ModifiedLines`.
Diffstat (limited to 'src/test')
-rw-r--r--src/test/mod.rs4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/test/mod.rs b/src/test/mod.rs
index 5d9c103ed03..24772d70c16 100644
--- a/src/test/mod.rs
+++ b/src/test/mod.rs
@@ -9,8 +9,8 @@ use std::process::{Command, Stdio};
 use std::str::Chars;
 
 use crate::config::{Color, Config, EmitMode, FileName, ReportTactic};
-use crate::formatting::{ModifiedChunk, ReportedErrors, SourceFile};
-use crate::rustfmt_diff::{make_diff, print_diff, DiffLine, Mismatch, OutputWriter};
+use crate::formatting::{ReportedErrors, SourceFile};
+use crate::rustfmt_diff::{make_diff, print_diff, DiffLine, Mismatch, ModifiedChunk, OutputWriter};
 use crate::source_file;
 use crate::{FormatReport, Input, Session};