mirror of
https://github.com/encounter/objdiff.git
synced 2026-07-10 12:18:36 -07:00
Add config option to limit which string literal encodings are used (#356)
* Fix annoying rust-analyzer error with a cfg * Refactor literal info into a struct * Add field hide a literal from the GUI but still use for diffing * Add config option to limit string literal diffing * Fix deprecation warning `float_literal_f32_fallback` * Hide non-preferred string encodings from the GUI * Fix new cargo check warning * Clippy again * Rename "None" -> "Auto"
This commit is contained in:
@@ -198,8 +198,8 @@ fn run_oneshot(
|
||||
.transpose()?;
|
||||
let result =
|
||||
diff::diff_objs(target.as_ref(), base.as_ref(), None, &diff_config, &mapping_config)?;
|
||||
let left = target.as_ref().and_then(|o| result.left.as_ref().map(|d| (o, d)));
|
||||
let right = base.as_ref().and_then(|o| result.right.as_ref().map(|d| (o, d)));
|
||||
let left = target.as_ref().zip(result.left.as_ref());
|
||||
let right = base.as_ref().zip(result.right.as_ref());
|
||||
let diff_result = DiffResult::new(left, right, &diff_config)?;
|
||||
write_output(&diff_result, Some(output), output_format)?;
|
||||
Ok(())
|
||||
|
||||
Reference in New Issue
Block a user