diff options
| author | Rosemary Ajayi <okhuomonajayi54@gmail.com> | 2024-04-01 05:34:48 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-04-01 05:34:48 +0000 |
| commit | 52a74287fc3f13f855cdf24c8610cf902a49686b (patch) | |
| tree | b4e70ec04db97821ae3a79bfe777772c9c31098e | |
| parent | 00c4d798c9619e068119db02910ed80ad9df937b (diff) | |
| download | servo-52a74287fc3f13f855cdf24c8610cf902a49686b.tar.gz servo-52a74287fc3f13f855cdf24c8610cf902a49686b.zip | |
clippy: Fix a few problems in `components/scripts` (#31959)
* fixed various clippy warnings
* fixed various clippy warnings
| -rw-r--r-- | components/script/canvas_state.rs | 2 | ||||
| -rw-r--r-- | components/script/dom/xrinputsourcearray.rs | 2 | ||||
| -rw-r--r-- | components/script/dom/xrrenderstate.rs | 2 | ||||
| -rw-r--r-- | components/script/script_module.rs | 2 | ||||
| -rw-r--r-- | components/script/script_thread.rs | 4 |
5 files changed, 6 insertions, 6 deletions
diff --git a/components/script/canvas_state.rs b/components/script/canvas_state.rs index fd5acadf699..2956a8ce86c 100644 --- a/components/script/canvas_state.rs +++ b/components/script/canvas_state.rs @@ -953,7 +953,7 @@ impl CanvasState { // https://html.spec.whatwg.org/multipage/#dom-context-2d-globalalpha pub fn set_global_alpha(&self, alpha: f64) { - if !alpha.is_finite() || alpha > 1.0 || alpha < 0.0 { + if !alpha.is_finite() || !(0.0..=1.0).contains(&alpha) { return; } diff --git a/components/script/dom/xrinputsourcearray.rs b/components/script/dom/xrinputsourcearray.rs index be48cbc4052..c2f15361738 100644 --- a/components/script/dom/xrinputsourcearray.rs +++ b/components/script/dom/xrinputsourcearray.rs @@ -43,7 +43,7 @@ impl XRInputSourceArray { // This is quadratic, but won't be a problem for the only case // where we add multiple input sources (the initial input sources case) debug_assert!( - input_sources.iter().find(|i| i.id() == info.id).is_none(), + !input_sources.iter().any(|i| i.id() == info.id), "Should never add a duplicate input id!" ); let input = XRInputSource::new(&global, session, info.clone()); diff --git a/components/script/dom/xrrenderstate.rs b/components/script/dom/xrrenderstate.rs index 1deca6f7976..77e579ecf89 100644 --- a/components/script/dom/xrrenderstate.rs +++ b/components/script/dom/xrrenderstate.rs @@ -109,7 +109,7 @@ impl XRRenderState { if let Some(base_layer) = self.base_layer.get() { match sub_images.len() { // For inline sessions, there may be a base layer, but it won't have a framebuffer - 0 => base_layer.layer_id() == None, + 0 => base_layer.layer_id().is_none(), // For immersive sessions, the base layer will have a framebuffer, // so we make sure the layer id's match up 1 => base_layer.layer_id() == Some(sub_images[0].layer_id), diff --git a/components/script/script_module.rs b/components/script/script_module.rs index f63161ba654..aa1d6ed35dd 100644 --- a/components/script/script_module.rs +++ b/components/script/script_module.rs @@ -615,7 +615,7 @@ impl ModuleTree { } // Step 2. - if !specifier_str.starts_with("/") && + if !specifier_str.starts_with('/') && !specifier_str.starts_with("./") && !specifier_str.starts_with("../") { diff --git a/components/script/script_thread.rs b/components/script/script_thread.rs index 743d9226302..84bf1b36918 100644 --- a/components/script/script_thread.rs +++ b/components/script/script_thread.rs @@ -3108,7 +3108,7 @@ impl ScriptThread { ) }); - let opener_browsing_context = opener.and_then(|id| ScriptThread::find_window_proxy(id)); + let opener_browsing_context = opener.and_then(ScriptThread::find_window_proxy); let creator = CreatorBrowsingContextInfo::from( parent_browsing_context.as_deref(), @@ -3164,7 +3164,7 @@ impl ScriptThread { _ => None, }; - let opener_browsing_context = opener.and_then(|id| ScriptThread::find_window_proxy(id)); + let opener_browsing_context = opener.and_then(ScriptThread::find_window_proxy); let creator = CreatorBrowsingContextInfo::from( parent_browsing_context.as_deref(), |