-
Notifications
You must be signed in to change notification settings - Fork 15
Create the side-by-side option (-y) feature for the diff command (Incomplete) #117
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.
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
Merged
Merged
Changes from all commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
8105420
Create the side-by-side option (-y) feature for the diff command (Inc…
sami-daniel dff98a2
fix(deps): update rust crate chrono to v0.4.41
renovate[bot] 1ef6923
Add side by side diff (partial)
sami-daniel a3e57c9
chore(deps): update rust crate tempfile to v3.20.0
renovate[bot] 45b3072
Configure CI fuzzer for fuzz_side
sami-daniel fce0881
Merge branch 'main' into main
sami-daniel File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,42 @@ | ||
#![no_main] | ||
#[macro_use] | ||
extern crate libfuzzer_sys; | ||
|
||
use diffutilslib::side_diff; | ||
|
||
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; | ||
|
||
// if width == 0 || tabsize == 0 { | ||
// return; | ||
// } | ||
|
||
let params = Params { | ||
// width, | ||
// tabsize, | ||
expand_tabs: expand, | ||
..Default::default() | ||
}; | ||
let mut output_buf = vec![]; | ||
side_diff::diff(&original, &new, &mut output_buf, ¶ms); | ||
File::create("target/fuzz.file.original") | ||
.unwrap() | ||
.write_all(&original) | ||
.unwrap(); | ||
File::create("target/fuzz.file.new") | ||
.unwrap() | ||
.write_all(&new) | ||
.unwrap(); | ||
File::create("target/fuzz.file") | ||
.unwrap() | ||
.write_all(&original) | ||
.unwrap(); | ||
File::create("target/fuzz.diff") | ||
.unwrap() | ||
.write_all(&output_buf) | ||
.unwrap(); | ||
}); |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -18,6 +18,7 @@ mod ed_diff; | |
mod macros; | ||
mod normal_diff; | ||
mod params; | ||
mod side_diff; | ||
mod unified_diff; | ||
mod utils; | ||
|
||
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
[nitpick] Consider removing disk writes from the fuzz target to avoid unnecessary I/O overhead and side effects during fuzzing. Using in-memory buffers for debugging outputs can improve iteration speed.
Copilot uses AI. Check for mistakes.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I wouldn't mind changing it, but it would be out of standard compared to other files related to fuzz.