X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=src%2Frustfmt_diff.rs;h=fc2c7d06e264ef269a2fc2a26f4916ba7d4159d0;hb=e4617e0e612206fda148bb7f1ba2388bdf3f68f3;hp=f2acc96a8deb9d1cd442fd99b75a7c4a4c91fddd;hpb=788c52ae74bfcad8d0bf72644120eff02826c706;p=rust.git diff --git a/src/rustfmt_diff.rs b/src/rustfmt_diff.rs index f2acc96a8de..fc2c7d06e26 100644 --- a/src/rustfmt_diff.rs +++ b/src/rustfmt_diff.rs @@ -1,20 +1,9 @@ -// Copyright 2017 The Rust Project Developers. See the COPYRIGHT -// file at the top-level directory of this distribution and at -// http://rust-lang.org/COPYRIGHT. -// -// Licensed under the Apache License, Version 2.0 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - -use config::{Color, Config, Verbosity}; -use diff; use std::collections::VecDeque; +use std::fmt; use std::io; use std::io::Write; -use term; -use utils::use_colored_tty; + +use crate::config::{Color, Config, Verbosity}; #[derive(Debug, PartialEq)] pub enum DiffLine { @@ -43,18 +32,128 @@ fn new(line_number: u32, line_number_orig: u32) -> Mismatch { } } +/// A single span of changed lines, with 0 or more removed lines +/// and a vector of 0 or more inserted lines. +#[derive(Debug, PartialEq, Eq)] +pub struct ModifiedChunk { + /// The first to be removed from the original text + pub line_number_orig: u32, + /// The number of lines which have been replaced + pub lines_removed: u32, + /// The new lines + pub lines: Vec, +} + +/// Set of changed sections of a file. +#[derive(Debug, PartialEq, Eq)] +pub struct ModifiedLines { + /// The set of changed chunks. + pub chunks: Vec, +} + +impl From> for ModifiedLines { + fn from(mismatches: Vec) -> ModifiedLines { + let chunks = mismatches.into_iter().map(|mismatch| { + let lines = mismatch.lines.iter(); + let num_removed = lines + .filter(|line| match line { + DiffLine::Resulting(_) => true, + _ => false, + }) + .count(); + + let new_lines = mismatch.lines.into_iter().filter_map(|line| match line { + DiffLine::Context(_) | DiffLine::Resulting(_) => None, + DiffLine::Expected(str) => Some(str), + }); + + ModifiedChunk { + line_number_orig: mismatch.line_number_orig, + lines_removed: num_removed as u32, + lines: new_lines.collect(), + } + }); + + ModifiedLines { + chunks: chunks.collect(), + } + } +} + +// Converts a `Mismatch` into a serialized form, which just includes +// enough information to modify the original file. +// Each section starts with a line with three integers, space separated: +// lineno num_removed num_added +// followed by (`num_added`) lines of added text. The line numbers are +// relative to the original file. +impl fmt::Display for ModifiedLines { + fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { + for chunk in &self.chunks { + writeln!( + f, + "{} {} {}", + chunk.line_number_orig, + chunk.lines_removed, + chunk.lines.iter().count() + )?; + + for line in &chunk.lines { + writeln!(f, "{}", line)?; + } + } + + Ok(()) + } +} + +// Allows to convert `Display`ed `ModifiedLines` back to the structural data. +impl std::str::FromStr for ModifiedLines { + type Err = (); + + fn from_str(s: &str) -> Result { + let mut chunks = vec![]; + + let mut lines = s.lines(); + while let Some(header) = lines.next() { + let mut header = header.split_whitespace(); + let (orig, rem, new_lines) = match (header.next(), header.next(), header.next()) { + (Some(orig), Some(removed), Some(added)) => (orig, removed, added), + _ => return Err(()), + }; + let (orig, rem, new_lines): (u32, u32, usize) = + match (orig.parse(), rem.parse(), new_lines.parse()) { + (Ok(a), Ok(b), Ok(c)) => (a, b, c), + _ => return Err(()), + }; + let lines = lines.by_ref().take(new_lines); + let lines: Vec<_> = lines.map(ToOwned::to_owned).collect(); + if lines.len() != new_lines { + return Err(()); + } + + chunks.push(ModifiedChunk { + line_number_orig: orig, + lines_removed: rem, + lines, + }); + } + + Ok(ModifiedLines { chunks }) + } +} + // This struct handles writing output to stdout and abstracts away the logic // of printing in color, if it's possible in the executing environment. -pub struct OutputWriter { - terminal: Option>>, +pub(crate) struct OutputWriter { + terminal: Option>>, } impl OutputWriter { // Create a new OutputWriter instance based on the caller's preference // for colorized output and the capabilities of the terminal. - pub fn new(color: Color) -> Self { + pub(crate) fn new(color: Color) -> Self { if let Some(t) = term::stdout() { - if use_colored_tty(color) && t.supports_color() { + if color.use_colored_tty() && t.supports_color() { return OutputWriter { terminal: Some(t) }; } } @@ -64,7 +163,7 @@ pub fn new(color: Color) -> Self { // Write output in the optionally specified color. The output is written // in the specified color if this OutputWriter instance contains a // Terminal in its `terminal` field. - pub fn writeln(&mut self, msg: &str, color: Option) { + pub(crate) fn writeln(&mut self, msg: &str, color: Option) { match &mut self.terminal { Some(ref mut t) => { if let Some(color) = color { @@ -81,7 +180,7 @@ pub fn writeln(&mut self, msg: &str, color: Option) { } // Produces a diff between the expected output and actual output of rustfmt. -pub fn make_diff(expected: &str, actual: &str, context_size: usize) -> Vec { +pub(crate) fn make_diff(expected: &str, actual: &str, context_size: usize) -> Vec { let mut line_number = 1; let mut line_number_orig = 1; let mut context_queue: VecDeque<&str> = VecDeque::with_capacity(context_size); @@ -149,7 +248,7 @@ pub fn make_diff(expected: &str, actual: &str, context_size: usize) -> Vec(diff: Vec, get_section_title: F, config: &Config) +pub(crate) fn print_diff(diff: Vec, get_section_title: F, config: &Config) where F: Fn(u32) -> String, { @@ -163,7 +262,7 @@ pub fn print_diff(diff: Vec, get_section_title: F, config: &Config) let mut writer = OutputWriter::new(color); for mismatch in diff { - let title = get_section_title(mismatch.line_number); + let title = get_section_title(mismatch.line_number_orig); writer.writeln(&title, None); for line in mismatch.lines { @@ -184,46 +283,11 @@ pub fn print_diff(diff: Vec, get_section_title: F, config: &Config) } } -/// Convert a Mismatch into a serialised form which just includes -/// enough information to modify the original file. -/// Each section starts with a line with three integers, space separated: -/// lineno num_removed num_added -/// followed by (num_added) lines of added text. The line numbers are -/// relative to the original file. -pub fn output_modified(mut out: W, diff: Vec) -where - W: Write, -{ - for mismatch in diff { - let (num_removed, num_added) = mismatch.lines.iter().fold((0, 0), |(rem, add), line| { - match *line { - DiffLine::Context(_) => panic!("No Context expected"), - DiffLine::Expected(_) => (rem, add + 1), - DiffLine::Resulting(_) => (rem + 1, add), - } - }); - // Write a header with enough information to separate the modified lines. - writeln!( - out, - "{} {} {}", - mismatch.line_number_orig, num_removed, num_added - ).unwrap(); - - for line in mismatch.lines { - match line { - DiffLine::Context(_) | DiffLine::Resulting(_) => (), - DiffLine::Expected(ref str) => { - writeln!(out, "{}", str).unwrap(); - } - } - } - } -} - #[cfg(test)] mod test { use super::DiffLine::*; use super::{make_diff, Mismatch}; + use super::{ModifiedChunk, ModifiedLines}; #[test] fn diff_simple() { @@ -305,4 +369,35 @@ fn diff_trailing_newline() { }] ); } + + #[test] + fn modified_lines_from_str() { + use std::str::FromStr; + + let src = "1 6 2\nfn some() {}\nfn main() {}\n25 3 1\n struct Test {}"; + let lines = ModifiedLines::from_str(src).unwrap(); + assert_eq!( + lines, + ModifiedLines { + chunks: vec![ + ModifiedChunk { + line_number_orig: 1, + lines_removed: 6, + lines: vec!["fn some() {}".to_owned(), "fn main() {}".to_owned(),] + }, + ModifiedChunk { + line_number_orig: 25, + lines_removed: 3, + lines: vec![" struct Test {}".to_owned()] + } + ] + } + ); + + let src = "1 5 3"; + assert_eq!(ModifiedLines::from_str(src), Err(())); + + let src = "1 5 3\na\nb"; + assert_eq!(ModifiedLines::from_str(src), Err(())); + } }