diff options
Diffstat (limited to 'components/script/dom')
-rw-r--r-- | components/script/dom/audionode.rs | 2 | ||||
-rw-r--r-- | components/script/dom/bindings/utils.rs | 2 | ||||
-rw-r--r-- | components/script/dom/blob.rs | 2 | ||||
-rw-r--r-- | components/script/dom/bluetoothuuid.rs | 2 | ||||
-rw-r--r-- | components/script/dom/characterdata.rs | 2 | ||||
-rw-r--r-- | components/script/dom/cssnamespacerule.rs | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/components/script/dom/audionode.rs b/components/script/dom/audionode.rs index bdf864d0981..4a8ea032b45 100644 --- a/components/script/dom/audionode.rs +++ b/components/script/dom/audionode.rs @@ -258,7 +258,7 @@ impl AudioNodeMethods for AudioNode { EventTargetTypeId::AudioNode(AudioNodeTypeId::AudioDestinationNode) => { if self.context.is_offline() { return Err(Error::InvalidState); - } else if value < 1 || value > MAX_CHANNEL_COUNT { + } else if !(1..=MAX_CHANNEL_COUNT).contains(&value) { return Err(Error::IndexSize); } }, diff --git a/components/script/dom/bindings/utils.rs b/components/script/dom/bindings/utils.rs index e5f5f8ab41f..64886971f5f 100644 --- a/components/script/dom/bindings/utils.rs +++ b/components/script/dom/bindings/utils.rs @@ -197,7 +197,7 @@ pub unsafe fn get_array_index_from_id(_cx: *mut JSContext, id: HandleId) -> Opti let first_char = char::decode_utf16(chars.iter().cloned()) .next() .map_or('\0', |r| r.unwrap_or('\0')); - if !('a'..='z').contains(&first_char) { + if !first_char.is_ascii_lowercase() { return None; } diff --git a/components/script/dom/blob.rs b/components/script/dom/blob.rs index e1d38680d21..af45c1e858c 100644 --- a/components/script/dom/blob.rs +++ b/components/script/dom/blob.rs @@ -322,5 +322,5 @@ pub fn normalize_type_string(s: &str) -> String { fn is_ascii_printable(string: &str) -> bool { // Step 5.1 in Sec 5.1 of File API spec // <https://w3c.github.io/FileAPI/#constructorBlob> - string.chars().all(|c| c >= '\x20' && c <= '\x7E') + string.chars().all(|c| ('\x20'..='\x7E').contains(&c)) } diff --git a/components/script/dom/bluetoothuuid.rs b/components/script/dom/bluetoothuuid.rs index c233b69144e..2be73830f3b 100644 --- a/components/script/dom/bluetoothuuid.rs +++ b/components/script/dom/bluetoothuuid.rs @@ -523,7 +523,7 @@ const BLUETOOTH_ASSIGNED_CHARCTERISTICS: &[(&str, u32)] = &[ ]; //https://developer.bluetooth.org/gatt/services/Pages/ServicesHome.aspx -const BLUETOOTH_ASSIGNED_DESCRIPTORS: &'static [(&str, u32)] = &[ +const BLUETOOTH_ASSIGNED_DESCRIPTORS: &[(&str, u32)] = &[ ( "org.bluetooth.descriptor.gatt.characteristic_extended_properties", 0x2900_u32, diff --git a/components/script/dom/characterdata.rs b/components/script/dom/characterdata.rs index 3c053281bea..5aeb344568d 100644 --- a/components/script/dom/characterdata.rs +++ b/components/script/dom/characterdata.rs @@ -148,7 +148,7 @@ impl CharacterDataMethods for CharacterData { Err(()) => substring += remaining, // Steps 4. Ok((s, astral, _)) => { - substring = substring + s; + substring += s; // As if we had split the UTF-16 surrogate pair in half // and then transcoded that to UTF-8 lossily, // since our DOMString is currently strict UTF-8. diff --git a/components/script/dom/cssnamespacerule.rs b/components/script/dom/cssnamespacerule.rs index 3e6a1625136..0c51b43f387 100644 --- a/components/script/dom/cssnamespacerule.rs +++ b/components/script/dom/cssnamespacerule.rs @@ -57,7 +57,7 @@ impl CSSNamespaceRuleMethods for CSSNamespaceRule { .prefix .as_ref() .map(|s| s.to_string().into()) - .unwrap_or(DOMString::new()) + .unwrap_or_default() } // https://drafts.csswg.org/cssom/#dom-cssnamespacerule-namespaceuri |