sascha
/
difftastic
mirror of https://github.com/Wilfred/difftastic/
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix compilation on Rust 1.54

html_output
Wilfred Hughes 2022-01-30 22:54:02 +07:00
parent 3c05d979ba
commit 01d6cb149f
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/side_by_side.rs
Unescape Escape View File

@ -531,9 +531,15 @@ mod tests {
}, },
}]; }];
let mut novel_lhs = HashSet::new();
novel_lhs.insert(0.into());
let mut novel_rhs = HashSet::new();
novel_rhs.insert(0.into());
let hunks = [Hunk { let hunks = [Hunk {
novel_lhs: HashSet::from([0.into()]), novel_lhs,
novel_rhs: HashSet::from([0.into()]), novel_rhs,
lines: vec![(Some(0.into()), Some(0.into()))], lines: vec![(Some(0.into()), Some(0.into()))],
}]; }];

8
src/unchanged.rs
Unescape Escape View File

@ -40,13 +40,13 @@ fn skip_unchanged_delimiters<'a>(
rhs_nodes: &[&'a Syntax<'a>], rhs_nodes: &[&'a Syntax<'a>],
) -> (Vec<&'a Syntax<'a>>, Vec<&'a Syntax<'a>>) { ) -> (Vec<&'a Syntax<'a>>, Vec<&'a Syntax<'a>>) {
if let ( if let (
[lhs_node @ Syntax::List { [Syntax::List {
open_content: lhs_open, open_content: lhs_open,
children: lhs_children, children: lhs_children,
close_content: lhs_close, close_content: lhs_close,
.. ..
}], }],
[rhs_node @ Syntax::List { [Syntax::List {
open_content: rhs_open, open_content: rhs_open,
children: rhs_children, children: rhs_children,
close_content: rhs_close, close_content: rhs_close,
@ -55,8 +55,8 @@ fn skip_unchanged_delimiters<'a>(
) = (lhs_nodes, rhs_nodes) ) = (lhs_nodes, rhs_nodes)
{ {
if lhs_open == rhs_open && lhs_close == rhs_close { if lhs_open == rhs_open && lhs_close == rhs_close {
lhs_node.set_change(ChangeKind::Unchanged(rhs_node)); lhs_nodes[0].set_change(ChangeKind::Unchanged(rhs_nodes[0]));
rhs_node.set_change(ChangeKind::Unchanged(lhs_node)); rhs_nodes[0].set_change(ChangeKind::Unchanged(lhs_nodes[0]));
return (lhs_children.to_vec(), rhs_children.to_vec()); return (lhs_children.to_vec(), rhs_children.to_vec());
} }