diff options
author | Rosemary Ajayi <okhuomonajayi54@gmail.com> | 2024-03-27 22:14:41 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-03-27 22:14:41 +0000 |
commit | 072b892706e9f39a2cb3559c610509cae00ab5cc (patch) | |
tree | 3471611587e718bfaf633892224ad8b380247834 | |
parent | 1c8c287f01757488733f5df501461bf1b74ca163 (diff) | |
download | servo-072b892706e9f39a2cb3559c610509cae00ab5cc.tar.gz servo-072b892706e9f39a2cb3559c610509cae00ab5cc.zip |
clippy:fix various clippy problems in components/scripts (#31907)
* manual implementation of an assign operation
* manual implementation of an assign operation
* single-character string
* manual cjheck for common ascii range
-rw-r--r-- | components/script/dom/characterdata.rs | 6 | ||||
-rw-r--r-- | components/script/dom/console.rs | 10 | ||||
-rw-r--r-- | components/script/dom/cssstyledeclaration.rs | 4 | ||||
-rw-r--r-- | components/script/dom/customelementregistry.rs | 8 |
4 files changed, 14 insertions, 14 deletions
diff --git a/components/script/dom/characterdata.rs b/components/script/dom/characterdata.rs index 0de4f22d09a..3c053281bea 100644 --- a/components/script/dom/characterdata.rs +++ b/components/script/dom/characterdata.rs @@ -136,7 +136,7 @@ impl CharacterDataMethods for CharacterData { // and then transcoded that to UTF-8 lossily, // since our DOMString is currently strict UTF-8. if astral.is_some() { - substring = substring + "\u{FFFD}"; + substring += "\u{FFFD}"; } remaining = s; }, @@ -145,7 +145,7 @@ impl CharacterDataMethods for CharacterData { } match split_at_utf16_code_unit_offset(remaining, count, replace_surrogates) { // Steps 3. - Err(()) => substring = substring + remaining, + Err(()) => substring += remaining, // Steps 4. Ok((s, astral, _)) => { substring = substring + s; @@ -153,7 +153,7 @@ impl CharacterDataMethods for CharacterData { // and then transcoded that to UTF-8 lossily, // since our DOMString is currently strict UTF-8. if astral.is_some() { - substring = substring + "\u{FFFD}"; + substring += "\u{FFFD}"; } }, }; diff --git a/components/script/dom/console.rs b/components/script/dom/console.rs index 6fe07534146..bb9d7822229 100644 --- a/components/script/dom/console.rs +++ b/components/script/dom/console.rs @@ -90,7 +90,7 @@ fn stringify_handle_value(message: HandleValue) -> DOMString { ) -> DOMString { rooted!(in(cx) let mut obj = value.to_object()); let mut object_class = ESClass::Other; - if !GetBuiltinClass(cx, obj.handle().into(), &mut object_class as *mut _) { + if !GetBuiltinClass(cx, obj.handle(), &mut object_class as *mut _) { return DOMString::from("/* invalid */"); } let mut ids = IdVector::new(cx); @@ -120,9 +120,9 @@ fn stringify_handle_value(message: HandleValue) -> DOMString { let mut is_none = false; if !JS_GetOwnPropertyDescriptorById( cx, - obj.handle().into(), - id.handle().into(), - desc.handle_mut().into(), + obj.handle(), + id.handle(), + desc.handle_mut(), &mut is_none, ) { return DOMString::from("/* invalid */"); @@ -191,7 +191,7 @@ fn stringify_handle_value(message: HandleValue) -> DOMString { parents.push(value_bits); stringify_object_from_handle_value(cx, value, parents) } - stringify_inner(cx, message.into(), Vec::new()) + stringify_inner(cx, message, Vec::new()) } } diff --git a/components/script/dom/cssstyledeclaration.rs b/components/script/dom/cssstyledeclaration.rs index 36eda0aed87..2d5015648d9 100644 --- a/components/script/dom/cssstyledeclaration.rs +++ b/components/script/dom/cssstyledeclaration.rs @@ -361,8 +361,8 @@ lazy_static! { enabled_longhands.sort_unstable_by(|a, b| { let a = a.name(); let b = b.name(); - let is_a_vendor_prefixed = a.starts_with("-"); - let is_b_vendor_prefixed = b.starts_with("-"); + let is_a_vendor_prefixed = a.starts_with('-'); + let is_b_vendor_prefixed = b.starts_with('-'); if is_a_vendor_prefixed == is_b_vendor_prefixed { a.partial_cmp(b).unwrap() } else if is_b_vendor_prefixed { diff --git a/components/script/dom/customelementregistry.rs b/components/script/dom/customelementregistry.rs index d47efab3b2f..e41fcdb8079 100644 --- a/components/script/dom/customelementregistry.rs +++ b/components/script/dom/customelementregistry.rs @@ -290,7 +290,7 @@ impl CustomElementRegistryMethods for CustomElementRegistry { .definitions .borrow() .iter() - .any(|(_, ref def)| def.constructor == constructor_) + .any(|(_, def)| def.constructor == constructor_) { return Err(Error::NotSupported); } @@ -1035,7 +1035,7 @@ pub fn is_valid_custom_element_name(name: &str) -> bool { // PotentialCustomElementName ::= [a-z] (PCENChar)* '-' (PCENChar)* let mut chars = name.chars(); - if !chars.next().map_or(false, |c| ('a'..='z').contains(&c)) { + if !chars.next().map_or(false, |c| c.is_ascii_lowercase()) { return false; } @@ -1078,8 +1078,8 @@ fn is_potential_custom_element_char(c: char) -> bool { c == '.' || c == '_' || c == '\u{B7}' || - ('0'..='9').contains(&c) || - ('a'..='z').contains(&c) || + c.is_ascii_digit() || + c.is_ascii_lowercase() || ('\u{C0}'..='\u{D6}').contains(&c) || ('\u{D8}'..='\u{F6}').contains(&c) || ('\u{F8}'..='\u{37D}').contains(&c) || |