diff --git a/packages/dom/src/queries/label_text.rs b/packages/dom/src/queries/label_text.rs index 0956ea7..9be44c4 100644 --- a/packages/dom/src/queries/label_text.rs +++ b/packages/dom/src/queries/label_text.rs @@ -40,15 +40,15 @@ pub fn _query_all_by_label_text>( let label_list = get_labels(container, &labelled_element, Some(selector.clone())); for label in &label_list { - if let Some(form_control) = label.form_control.as_ref() { - if matcher( + if let Some(form_control) = label.form_control.as_ref() + && matcher( label.content.clone(), label.form_control.as_deref(), &text, match_normalizer.as_ref(), - ) { - labelled_elements.push(form_control.clone()); - } + ) + { + labelled_elements.push(form_control.clone()); } } diff --git a/packages/dom/src/role_helpers.rs b/packages/dom/src/role_helpers.rs index b38d475..45c4f18 100644 --- a/packages/dom/src/role_helpers.rs +++ b/packages/dom/src/role_helpers.rs @@ -83,12 +83,11 @@ static ELEMENT_ROLE_LIST: LazyLock> = LazyLock::new(|| { result.push(ElementRole { r#match: Box::new(move |element| { - if type_text_index.is_some() { - if let Some(input_element) = element.dyn_ref::() { - if input_element.type_() != "text" { - return false; - } - } + if type_text_index.is_some() + && let Some(input_element) = element.dyn_ref::() + && input_element.type_() != "text" + { + return false; } element.matches(&selector).unwrap_or(false) diff --git a/packages/pretty-format/src/lib.rs b/packages/pretty-format/src/lib.rs index d148db7..52cff16 100644 --- a/packages/pretty-format/src/lib.rs +++ b/packages/pretty-format/src/lib.rs @@ -203,17 +203,17 @@ fn create_indent(indent: usize) -> String { pub fn format(val: &JsValue, options: PrettyFormatOptions) -> Result { validate_options(&options)?; - if let Some(plugins) = &options.plugins { - if let Some(plugin) = find_plugin(plugins, val) { - return Ok(print_plugin( - plugin, - val, - &get_config(options), - "".into(), - 0, - vec![], - )); - } + if let Some(plugins) = &options.plugins + && let Some(plugin) = find_plugin(plugins, val) + { + return Ok(print_plugin( + plugin, + val, + &get_config(options), + "".into(), + 0, + vec![], + )); } let basic_result = print_basic_value(