mirror of
https://github.com/servo/servo.git
synced 2025-08-12 08:55:32 +01:00
build: upgrade rustc to 1.81.0 (#34270)
Signed-off-by: Mukilan Thiyagarajan <mukilan@igalia.com>
This commit is contained in:
parent
26f61103d6
commit
7fcde1f7a3
15 changed files with 16 additions and 26 deletions
|
@ -448,9 +448,8 @@ where
|
|||
{
|
||||
let mut next = parent.first_child();
|
||||
std::iter::from_fn(move || {
|
||||
next.map(|child| {
|
||||
next.inspect(|child| {
|
||||
next = child.next_sibling();
|
||||
child
|
||||
})
|
||||
})
|
||||
}
|
||||
|
|
|
@ -232,13 +232,12 @@ impl InlineFormattingContextBuilder {
|
|||
|
||||
let white_space_collapse = info.style.clone_white_space_collapse();
|
||||
let new_text: String = char_iterator
|
||||
.map(|character| {
|
||||
.inspect(|&character| {
|
||||
self.has_uncollapsible_text_content |= matches!(
|
||||
white_space_collapse,
|
||||
WhiteSpaceCollapse::Preserve | WhiteSpaceCollapse::BreakSpaces
|
||||
) || !character.is_ascii_whitespace() ||
|
||||
(character == '\n' && white_space_collapse != WhiteSpaceCollapse::Collapse);
|
||||
character
|
||||
})
|
||||
.collect();
|
||||
|
||||
|
|
|
@ -125,7 +125,7 @@ impl AllPendingLoads {
|
|||
}
|
||||
|
||||
fn remove(&mut self, key: &LoadKey) -> Option<PendingLoad> {
|
||||
self.loads.remove(key).map(|pending_load| {
|
||||
self.loads.remove(key).inspect(|pending_load| {
|
||||
self.url_to_load_key
|
||||
.remove(&(
|
||||
pending_load.url.clone(),
|
||||
|
@ -133,7 +133,6 @@ impl AllPendingLoads {
|
|||
pending_load.cors_setting,
|
||||
))
|
||||
.unwrap();
|
||||
pending_load
|
||||
})
|
||||
}
|
||||
|
||||
|
|
|
@ -244,9 +244,8 @@ impl StorageManager {
|
|||
let old_value = data
|
||||
.get_mut(&origin)
|
||||
.and_then(|&mut (ref mut total, ref mut entry)| {
|
||||
entry.remove(&name).map(|old| {
|
||||
entry.remove(&name).inspect(|old| {
|
||||
*total -= name.as_bytes().len() + old.as_bytes().len();
|
||||
old
|
||||
})
|
||||
});
|
||||
sender.send(old_value).unwrap();
|
||||
|
|
|
@ -873,11 +873,7 @@ fn run_form_data_algorithm(
|
|||
mime: &[u8],
|
||||
can_gc: CanGc,
|
||||
) -> Fallible<FetchedData> {
|
||||
let mime_str = if let Ok(s) = str::from_utf8(mime) {
|
||||
s
|
||||
} else {
|
||||
""
|
||||
};
|
||||
let mime_str = str::from_utf8(mime).unwrap_or_default();
|
||||
let mime: Mime = mime_str
|
||||
.parse()
|
||||
.map_err(|_| Error::Type("Inappropriate MIME-type for Body".to_string()))?;
|
||||
|
|
|
@ -1037,7 +1037,7 @@ impl<T: ClipboardProvider> TextInput<T> {
|
|||
// https://html.spec.whatwg.org/multipage/#textarea-line-break-normalisation-transformation
|
||||
content
|
||||
.replace("\r\n", "\n")
|
||||
.split(|c| c == '\n' || c == '\r')
|
||||
.split(['\n', '\r'])
|
||||
.map(DOMString::from)
|
||||
.collect()
|
||||
} else {
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue