talexander/organic
1
0
Fork 0
Code Issues Pull Requests Releases Activity

Cleanup.

Browse Source
This commit is contained in:
Tom Alexander
2023-10-06 16:32:49 -04:00
parent 368c6a457e
commit fbe3c76ab7
3 changed files with 53 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
src/compare/diff.rs
View File

@@ -3,9 +3,7 @@ use std::borrow::Cow;
use std::collections::BTreeSet;
use std::collections::HashSet;
use super::compare_field::compare_identity;
use super::compare_field::compare_property_quoted_string;
use super::compare_field::impl_compare_noop;
use super::elisp_fact::ElispFact;
use super::elisp_fact::GetElispFact;
use super::sexp::unquote;
@@ -2607,9 +2605,14 @@ fn compare_italic<'b, 's>(
rust: &'b Italic<'s>,
) -> Result<DiffEntry<'b, 's>, Box<dyn std::error::Error>> {
let children = emacs.as_list()?;
let this_status = DiffStatus::Good;
let mut this_status = DiffStatus::Good;
let mut child_status = Vec::new();
let message = None;
let mut message = None;
if let Some((new_status, new_message)) = compare_properties!(emacs)? {
this_status = new_status;
message = new_message;
}
for (emacs_child, rust_child) in children.iter().skip(2).zip(rust.children.iter()) {
child_status.push(compare_ast_node(source, emacs_child, rust_child.into())?);
@@ -2632,9 +2635,14 @@ fn compare_underline<'b, 's>(
rust: &'b Underline<'s>,
) -> Result<DiffEntry<'b, 's>, Box<dyn std::error::Error>> {
let children = emacs.as_list()?;
let this_status = DiffStatus::Good;
let mut this_status = DiffStatus::Good;
let mut child_status = Vec::new();
let message = None;
let mut message = None;
if let Some((new_status, new_message)) = compare_properties!(emacs)? {
this_status = new_status;
message = new_message;
}
for (emacs_child, rust_child) in children.iter().skip(2).zip(rust.children.iter()) {
child_status.push(compare_ast_node(source, emacs_child, rust_child.into())?);
@@ -2666,16 +2674,6 @@ fn compare_verbatim<'b, 's>(
EmacsField::Required(":value"),
|r| Some(r.contents),
compare_property_quoted_string
),
(
EmacsField::Required(":value"),
|r| Some(r.contents),
compare_property_quoted_string
),
(
EmacsField::Required(":foo"),
compare_identity,
impl_compare_noop
)
)? {
this_status = new_status;
@@ -2731,9 +2729,14 @@ fn compare_strike_through<'b, 's>(
rust: &'b StrikeThrough<'s>,
) -> Result<DiffEntry<'b, 's>, Box<dyn std::error::Error>> {
let children = emacs.as_list()?;
let this_status = DiffStatus::Good;
let mut this_status = DiffStatus::Good;
let mut child_status = Vec::new();
let message = None;
let mut message = None;
if let Some((new_status, new_message)) = compare_properties!(emacs)? {
this_status = new_status;
message = new_message;
}
for (emacs_child, rust_child) in children.iter().skip(2).zip(rust.children.iter()) {
child_status.push(compare_ast_node(source, emacs_child, rust_child.into())?);