diff options
Diffstat (limited to 'components/net')
| -rw-r--r-- | components/net/cookie.rs | 2 | ||||
| -rw-r--r-- | components/net/cookie_storage.rs | 4 | ||||
| -rw-r--r-- | components/net/decoder.rs | 6 | ||||
| -rw-r--r-- | components/net/mime_classifier.rs | 6 | ||||
| -rw-r--r-- | components/net/storage_thread.rs | 8 |
5 files changed, 11 insertions, 15 deletions
diff --git a/components/net/cookie.rs b/components/net/cookie.rs index 3d2cf61fab3..d39d1b3b2a7 100644 --- a/components/net/cookie.rs +++ b/components/net/cookie.rs @@ -183,7 +183,7 @@ impl ServoCookie { let has_case_insensitive_prefix = |value: &str, prefix: &str| { value .get(..prefix.len()) - .map_or(false, |p| p.eq_ignore_ascii_case(prefix)) + .is_some_and(|p| p.eq_ignore_ascii_case(prefix)) }; if has_case_insensitive_prefix(cookie.name(), "__Secure-") && !cookie.secure().unwrap_or(false) diff --git a/components/net/cookie_storage.rs b/components/net/cookie_storage.rs index be20cf2412f..7c116734e23 100644 --- a/components/net/cookie_storage.rs +++ b/components/net/cookie_storage.rs @@ -261,9 +261,7 @@ fn get_oldest_accessed( if (c.cookie.secure().unwrap_or(false) == is_secure_cookie) && oldest_accessed .as_ref() - .map_or(true, |(_, current_oldest_time)| { - c.last_access < *current_oldest_time - }) + .is_none_or(|(_, current_oldest_time)| c.last_access < *current_oldest_time) { oldest_accessed = Some((i, c.last_access)); } diff --git a/components/net/decoder.rs b/components/net/decoder.rs index 8d63b1c58b9..4b4fcb18e24 100644 --- a/components/net/decoder.rs +++ b/components/net/decoder.rs @@ -275,14 +275,12 @@ impl Stream for BodyStream { // // The error can be safely ignored if we known that all content was received or is explicitly // set in preferences. - let all_content_read = self - .content_length - .map_or(false, |c| c.0 == self.total_read); + let all_content_read = self.content_length.is_some_and(|c| c.0 == self.total_read); if self.is_secure_scheme && all_content_read { let source = err.source(); let is_unexpected_eof = source .and_then(|e| e.downcast_ref::<io::Error>()) - .map_or(false, |e| e.kind() == io::ErrorKind::UnexpectedEof); + .is_some_and(|e| e.kind() == io::ErrorKind::UnexpectedEof); if is_unexpected_eof { return Poll::Ready(None); } diff --git a/components/net/mime_classifier.rs b/components/net/mime_classifier.rs index 784df39e5e4..a98c4428b87 100644 --- a/components/net/mime_classifier.rs +++ b/components/net/mime_classifier.rs @@ -392,9 +392,9 @@ impl Mp4Matcher { return false; } - let box_size = ((data[0] as u32) << 24 | - (data[1] as u32) << 16 | - (data[2] as u32) << 8 | + let box_size = (((data[0] as u32) << 24) | + ((data[1] as u32) << 16) | + ((data[2] as u32) << 8) | (data[3] as u32)) as usize; if (data.len() < box_size) || (box_size % 4 != 0) { return false; diff --git a/components/net/storage_thread.rs b/components/net/storage_thread.rs index fdd29953b9f..dd058f17170 100644 --- a/components/net/storage_thread.rs +++ b/components/net/storage_thread.rs @@ -185,11 +185,11 @@ impl StorageManager { let message = data .get_mut(&origin) .map(|&mut (ref mut total, ref mut entry)| { - let mut new_total_size = this_storage_size + value.as_bytes().len(); + let mut new_total_size = this_storage_size + value.len(); if let Some(old_value) = entry.get(&name) { - new_total_size -= old_value.as_bytes().len(); + new_total_size -= old_value.len(); } else { - new_total_size += name.as_bytes().len(); + new_total_size += name.len(); } if (new_total_size + other_storage_size) > QUOTA_SIZE_LIMIT { @@ -245,7 +245,7 @@ impl StorageManager { .get_mut(&origin) .and_then(|&mut (ref mut total, ref mut entry)| { entry.remove(&name).inspect(|old| { - *total -= name.as_bytes().len() + old.as_bytes().len(); + *total -= name.len() + old.len(); }) }); sender.send(old_value).unwrap(); |