Skip to content

sdiff initial implementation #159

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
zxvfc wants to merge 9 commits into
base: main
Choose a base branch
from
Open

sdiff initial implementation #159

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
96115ea
Extract shared code to utils
zxvfc Jan 7, 2026
4be21f1
Make side_diff use separate set of formatting params
zxvfc Jan 7, 2026
ed9f154
Add sdiff initiall implementation
zxvfc Jan 9, 2026
7355680
Add call of sdiff to main and basic integration test
zxvfc Jan 9, 2026
a5a1baf
Fix usage side_diff in fuzzers
zxvfc Jan 10, 2026
f3c4c78
Fix codestyle
zxvfc Jan 10, 2026
17bc12c
Fix failed test
zxvfc Jan 10, 2026
06e1d92
Add more tests for new code
zxvfc Jan 11, 2026
9983fb2
More tests for sdiff params parsing
zxvfc Jan 13, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fix usage side_diff in fuzzers
  • Loading branch information
@zxvfc
zxvfc committed Jan 10, 2026
commit a5a1baf23ed8268085a59f8df7845ed1ceb5ed08
17 changes: 13 additions & 4 deletions fuzz/fuzz_targets/fuzz_side.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,10 @@
#[macro_use]
extern crate libfuzzer_sys;

use diffutilslib::side_diff;
use diffutilslib::side_diff::{self, Params};

use std::fs::File;
use std::io::Write;
use diffutilslib::params::Params;

fuzz_target!(|x: (Vec<u8>, Vec<u8>, /* usize, usize */ bool)| {
let (original, new, /* width, tabsize, */ expand) = x;
Expand All @@ -22,7 +21,16 @@ fuzz_target!(|x: (Vec<u8>, Vec<u8>, /* usize, usize */ bool)| {
..Default::default()
};
let mut output_buf = vec![];
side_diff::diff(&original, &new, &mut output_buf, &params);
side_diff::diff(
&original,
&new,
&mut output_buf,
&Params {
width: params.width,
tabsize: params.tabsize,
expand_tabs: params.expand_tabs,
},
);
File::create("target/fuzz.file.original")
.unwrap()
.write_all(&original)
Expand All @@ -39,4 +47,5 @@ fuzz_target!(|x: (Vec<u8>, Vec<u8>, /* usize, usize */ bool)| {
.unwrap()
.write_all(&output_buf)
.unwrap();
});
});