diff options
| -rw-r--r-- | components/script/dom/mutationobserver.rs | 16 | ||||
| -rw-r--r-- | components/script/dom/mutationrecord.rs | 4 | ||||
| -rw-r--r-- | components/script/dom/namednodemap.rs | 2 | ||||
| -rw-r--r-- | components/script/dom/navigationpreloadmanager.rs | 2 | ||||
| -rw-r--r-- | components/script/dom/performance.rs | 2 | ||||
| -rw-r--r-- | components/script/dom/performanceobserver.rs | 2 | ||||
| -rw-r--r-- | components/script/dom/permissions.rs | 23 |
7 files changed, 24 insertions, 27 deletions
diff --git a/components/script/dom/mutationobserver.rs b/components/script/dom/mutationobserver.rs index 650d6caefb1..863029e483b 100644 --- a/components/script/dom/mutationobserver.rs +++ b/components/script/dom/mutationobserver.rs @@ -169,7 +169,7 @@ impl MutationObserver { .options .attribute_filter .iter() - .any(|s| &**s == &**name) + .any(|s| **s == **name) { continue; } @@ -181,9 +181,9 @@ impl MutationObserver { None }; // Step 3.1.1 - let idx = interested_observers.iter().position(|(o, _)| { - &**o as *const _ == &*registered.observer as *const _ - }); + let idx = interested_observers + .iter() + .position(|(o, _)| std::ptr::eq(&**o, &*registered.observer)); if let Some(idx) = idx { interested_observers[idx].1 = paired_string; } else { @@ -202,9 +202,9 @@ impl MutationObserver { None }; // Step 3.1.1 - let idx = interested_observers.iter().position(|(o, _)| { - &**o as *const _ == &*registered.observer as *const _ - }); + let idx = interested_observers + .iter() + .position(|(o, _)| std::ptr::eq(&**o, &*registered.observer)); if let Some(idx) = idx { interested_observers[idx].1 = paired_string; } else { @@ -260,7 +260,7 @@ impl MutationObserver { impl MutationObserverMethods for MutationObserver { /// <https://dom.spec.whatwg.org/#dom-mutationobserver-observe> fn Observe(&self, target: &Node, options: &MutationObserverInit) -> Fallible<()> { - let attribute_filter = options.attributeFilter.clone().unwrap_or(vec![]); + let attribute_filter = options.attributeFilter.clone().unwrap_or_default(); let attribute_old_value = options.attributeOldValue.unwrap_or(false); let mut attributes = options.attributes.unwrap_or(false); let mut character_data = options.characterData.unwrap_or(false); diff --git a/components/script/dom/mutationrecord.rs b/components/script/dom/mutationrecord.rs index 6552cbd53e6..505928367b4 100644 --- a/components/script/dom/mutationrecord.rs +++ b/components/script/dom/mutationrecord.rs @@ -87,8 +87,8 @@ impl MutationRecord { None, None, None, - added_nodes.as_ref().map(|list| &**list), - removed_nodes.as_ref().map(|list| &**list), + added_nodes.as_deref(), + removed_nodes.as_deref(), next_sibling, prev_sibling, )), diff --git a/components/script/dom/namednodemap.rs b/components/script/dom/namednodemap.rs index d7121d2815d..823ad044b5c 100644 --- a/components/script/dom/namednodemap.rs +++ b/components/script/dom/namednodemap.rs @@ -114,7 +114,7 @@ impl NamedNodeMapMethods for NamedNodeMap { continue; } - if !names.iter().any(|name| &*name == s) { + if !names.iter().any(|name| name == s) { names.push(DOMString::from(s)); } } diff --git a/components/script/dom/navigationpreloadmanager.rs b/components/script/dom/navigationpreloadmanager.rs index 7aa200b4306..b5ea4d4d036 100644 --- a/components/script/dom/navigationpreloadmanager.rs +++ b/components/script/dom/navigationpreloadmanager.rs @@ -38,7 +38,7 @@ impl NavigationPreloadManager { global: &GlobalScope, registration: &ServiceWorkerRegistration, ) -> DomRoot<NavigationPreloadManager> { - let manager = NavigationPreloadManager::new_inherited(&*registration); + let manager = NavigationPreloadManager::new_inherited(registration); reflect_dom_object(Box::new(manager), global) } } diff --git a/components/script/dom/performance.rs b/components/script/dom/performance.rs index b203a6856f1..93d47634cd5 100644 --- a/components/script/dom/performance.rs +++ b/components/script/dom/performance.rs @@ -29,7 +29,7 @@ use crate::dom::performancenavigationtiming::PerformanceNavigationTiming; use crate::dom::performanceobserver::PerformanceObserver as DOMPerformanceObserver; use crate::dom::window::Window; -const INVALID_ENTRY_NAMES: &'static [&'static str] = &[ +const INVALID_ENTRY_NAMES: &[&str] = &[ "navigationStart", "unloadEventStart", "unloadEventEnd", diff --git a/components/script/dom/performanceobserver.rs b/components/script/dom/performanceobserver.rs index ebf6e95d615..4d73ebc8daf 100644 --- a/components/script/dom/performanceobserver.rs +++ b/components/script/dom/performanceobserver.rs @@ -27,7 +27,7 @@ use crate::dom::performanceobserverentrylist::PerformanceObserverEntryList; use crate::script_runtime::JSContext; /// List of allowed performance entry types, in alphabetical order. -pub const VALID_ENTRY_TYPES: &'static [&'static str] = &[ +pub const VALID_ENTRY_TYPES: &[&str] = &[ // "frame", //TODO Frame Timing API "mark", // User Timing API "measure", // User Timing API diff --git a/components/script/dom/permissions.rs b/components/script/dom/permissions.rs index af8925dfb6b..ef0867253ac 100644 --- a/components/script/dom/permissions.rs +++ b/components/script/dom/permissions.rs @@ -288,20 +288,17 @@ pub fn get_descriptor_permission_state( // and let the user decide to grant the permission or not. let state = if allowed_in_nonsecure_contexts(&permission_name) { PermissionState::Prompt + } else if pref!(dom.permissions.testing.allowed_in_nonsecure_contexts) { + PermissionState::Granted } else { - if pref!(dom.permissions.testing.allowed_in_nonsecure_contexts) { - PermissionState::Granted - } else { - globalscope - .permission_state_invocation_results() - .borrow_mut() - .remove(&permission_name.to_string()); - - prompt_user_from_embedder( - PermissionPrompt::Insecure(embedder_traits::PermissionName::from(permission_name)), - &globalscope, - ) - } + globalscope + .permission_state_invocation_results() + .borrow_mut() + .remove(&permission_name.to_string()); + prompt_user_from_embedder( + PermissionPrompt::Insecure(embedder_traits::PermissionName::from(permission_name)), + &globalscope, + ) }; // Step 3. |