From 31938e04d2e171eb2460acd0db6b55ff7705c810 Mon Sep 17 00:00:00 2001 From: Martijn Faassen Date: Tue, 19 May 2026 14:33:56 +0200 Subject: [PATCH] Fix clippy issues. --- xee-interpreter/src/interpreter/interpret.rs | 6 ++---- xee-interpreter/src/library/map.rs | 4 ++-- xee-xslt-ast/src/whitespace.rs | 9 ++++----- 3 files changed, 8 insertions(+), 11 deletions(-) diff --git a/xee-interpreter/src/interpreter/interpret.rs b/xee-interpreter/src/interpreter/interpret.rs index 7e2a34a5a..9a4e235d2 100644 --- a/xee-interpreter/src/interpreter/interpret.rs +++ b/xee-interpreter/src/interpreter/interpret.rs @@ -1130,13 +1130,11 @@ impl<'a> Interpreter<'a> { "Appending a whole document is not supported yet", ))); } - xot::Value::Text(text) => { + xot::Value::Text(text) if text.get().is_empty() => { // zero length text nodes are skipped // Can this even exist, or does Xot not have // them anyway? - if text.get().is_empty() { - continue; - } + continue; } _ => {} } diff --git a/xee-interpreter/src/library/map.rs b/xee-interpreter/src/library/map.rs index 5d1126ef7..e3cf087ab 100644 --- a/xee-interpreter/src/library/map.rs +++ b/xee-interpreter/src/library/map.rs @@ -162,7 +162,7 @@ fn find_helper( function::Function::Array(array) => { for entry in array.iter() { let found = find_helper(entry, key.clone())?; - result.extend(found.into_iter()) + result.extend(found) } } function::Function::Map(map) => { @@ -171,7 +171,7 @@ fn find_helper( result.push(v.clone()); } let found = find_helper(v, key.clone())?; - result.extend(found.into_iter()) + result.extend(found) } } _ => {} diff --git a/xee-xslt-ast/src/whitespace.rs b/xee-xslt-ast/src/whitespace.rs index 69f7216a2..626ab519c 100644 --- a/xee-xslt-ast/src/whitespace.rs +++ b/xee-xslt-ast/src/whitespace.rs @@ -14,12 +14,11 @@ pub(crate) fn strip_whitespace(xot: &mut Xot, names: &Names, node: Node) { for edge in xot.traverse(node) { match edge { NodeEdge::Start(node) => match xot.value(node) { - Value::Text(text) => { + Value::Text(text) if is_xml_whitespace(text.get()) - && !is_xml_space_preserve(xot, names, node, &xml_space_preserve) - { - to_remove.push(node); - } + && !is_xml_space_preserve(xot, names, node, &xml_space_preserve) => + { + to_remove.push(node); } Value::Element(_) => { if let Some(xml_space) = xot.attributes(node).get(xot.xml_space_name()) {