diff --git a/src/changes.rs b/src/diff/changes.rs similarity index 100% rename from src/changes.rs rename to src/diff/changes.rs diff --git a/src/diff/dijkstra.rs b/src/diff/dijkstra.rs index 53a1304c4..b1d63f19d 100644 --- a/src/diff/dijkstra.rs +++ b/src/diff/dijkstra.rs @@ -4,7 +4,7 @@ use std::{cmp::Reverse, env, rc::Rc}; use crate::{ - changes::ChangeMap, + diff::changes::ChangeMap, diff::graph::{neighbours, populate_change_map, Edge, Vertex}, parse::syntax::Syntax, }; @@ -169,7 +169,7 @@ pub fn mark_syntax<'a>( mod tests { use super::*; use crate::{ - changes::ChangeKind, + diff::changes::ChangeKind, diff::graph::Edge::*, positions::SingleLineSpan, syntax::{init_all_info, AtomKind}, diff --git a/src/diff/graph.rs b/src/diff/graph.rs index 59ec06a82..9c4819ee8 100644 --- a/src/diff/graph.rs +++ b/src/diff/graph.rs @@ -10,7 +10,7 @@ use std::{ use strsim::normalized_levenshtein; use crate::{ - changes::{insert_deep_unchanged, ChangeKind, ChangeMap}, + diff::changes::{insert_deep_unchanged, ChangeKind, ChangeMap}, parse::syntax::{AtomKind, Syntax, SyntaxId}, }; use Edge::*; diff --git a/src/diff/mod.rs b/src/diff/mod.rs index 2aa3a487d..360cf293f 100644 --- a/src/diff/mod.rs +++ b/src/diff/mod.rs @@ -3,3 +3,4 @@ mod graph; pub mod myers_diff; pub mod sliders; pub mod unchanged; +pub mod changes; diff --git a/src/diff/sliders.rs b/src/diff/sliders.rs index acb77fb69..39e81255b 100644 --- a/src/diff/sliders.rs +++ b/src/diff/sliders.rs @@ -30,7 +30,7 @@ //! (B in this example). use crate::{ - changes::{insert_deep_novel, insert_deep_unchanged, ChangeKind::*, ChangeMap}, + diff::changes::{insert_deep_novel, insert_deep_unchanged, ChangeKind::*, ChangeMap}, parse::guess_language, positions::SingleLineSpan, parse::syntax::Syntax, diff --git a/src/diff/unchanged.rs b/src/diff/unchanged.rs index acbb24c17..c6113f087 100644 --- a/src/diff/unchanged.rs +++ b/src/diff/unchanged.rs @@ -1,7 +1,7 @@ //! Find nodes that are obviously unchanged, so we can run the main //! diff on smaller inputs. -use crate::changes::{insert_deep_unchanged, ChangeKind, ChangeMap}; +use crate::diff::changes::{insert_deep_unchanged, ChangeKind, ChangeMap}; use crate::diff::myers_diff; use crate::parse::syntax::Syntax; diff --git a/src/main.rs b/src/main.rs index 979a26cd6..a5a2b6cd9 100644 --- a/src/main.rs +++ b/src/main.rs @@ -13,7 +13,6 @@ // the number of arguments and triggering this lint. #![allow(clippy::too_many_arguments)] -mod changes; mod constants; mod diff; mod display; @@ -32,7 +31,7 @@ extern crate log; use crate::diff::{dijkstra, unchanged}; use crate::hunks::{matched_pos_to_hunks, merge_adjacent}; use crate::parse::syntax; -use changes::ChangeMap; +use diff::changes::ChangeMap; use display::context::opposite_positions; use files::{is_probably_binary, read_files_or_die, read_or_die, relative_paths_in_either}; use log::info; diff --git a/src/parse/syntax.rs b/src/parse/syntax.rs index c2a04b02b..4568cc3f9 100644 --- a/src/parse/syntax.rs +++ b/src/parse/syntax.rs @@ -6,8 +6,8 @@ use std::{cell::Cell, collections::HashMap, env, fmt, hash::Hash, num::NonZeroU3 use typed_arena::Arena; use crate::{ - changes::ChangeKind, - changes::{ChangeKind::*, ChangeMap}, + diff::changes::ChangeKind, + diff::changes::{ChangeKind::*, ChangeMap}, diff::myers_diff, lines::{LineNumber, NewlinePositions}, positions::SingleLineSpan,