Migrate to the 2024 edition (#35755)

* Migrate to 2024 edition

Signed-off-by: Simon Wülker <simon.wuelker@arcor.de>

* Allow unsafe_op_in_unsafe_fn lint

This lint warns by default in the 2024
edition, but is *way* too noisy for servo.

We might enable it in the future, but not now.

Signed-off-by: Simon Wülker <simon.wuelker@arcor.de>

* Compile using the 2024 edition

Signed-off-by: Simon Wülker <simon.wuelker@arcor.de>

---------

Signed-off-by: Simon Wülker <simon.wuelker@arcor.de>
This commit is contained in:
Simon Wülker 2025-03-13 11:28:11 +01:00 committed by GitHub
parent eb2ca42824
commit bb0d08432e
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
66 changed files with 317 additions and 293 deletions

View file

@ -48,56 +48,56 @@ pub(crate) enum MixedMessage {
impl MixedMessage {
pub(crate) fn pipeline_id(&self) -> Option<PipelineId> {
match self {
MixedMessage::FromConstellation(ref inner_msg) => match *inner_msg {
ScriptThreadMessage::StopDelayingLoadEventsMode(id) => Some(id),
ScriptThreadMessage::AttachLayout(ref new_layout_info) => new_layout_info
MixedMessage::FromConstellation(inner_msg) => match inner_msg {
ScriptThreadMessage::StopDelayingLoadEventsMode(id) => Some(*id),
ScriptThreadMessage::AttachLayout(new_layout_info) => new_layout_info
.parent_info
.or(Some(new_layout_info.new_pipeline_id)),
ScriptThreadMessage::Resize(id, ..) => Some(id),
ScriptThreadMessage::ThemeChange(id, ..) => Some(id),
ScriptThreadMessage::ResizeInactive(id, ..) => Some(id),
ScriptThreadMessage::UnloadDocument(id) => Some(id),
ScriptThreadMessage::ExitPipeline(id, ..) => Some(id),
ScriptThreadMessage::Resize(id, ..) => Some(*id),
ScriptThreadMessage::ThemeChange(id, ..) => Some(*id),
ScriptThreadMessage::ResizeInactive(id, ..) => Some(*id),
ScriptThreadMessage::UnloadDocument(id) => Some(*id),
ScriptThreadMessage::ExitPipeline(id, ..) => Some(*id),
ScriptThreadMessage::ExitScriptThread => None,
ScriptThreadMessage::SendInputEvent(id, ..) => Some(id),
ScriptThreadMessage::Viewport(id, ..) => Some(id),
ScriptThreadMessage::GetTitle(id) => Some(id),
ScriptThreadMessage::SetDocumentActivity(id, ..) => Some(id),
ScriptThreadMessage::SetThrottled(id, ..) => Some(id),
ScriptThreadMessage::SetThrottledInContainingIframe(id, ..) => Some(id),
ScriptThreadMessage::NavigateIframe(id, ..) => Some(id),
ScriptThreadMessage::PostMessage { target: id, .. } => Some(id),
ScriptThreadMessage::UpdatePipelineId(_, _, _, id, _) => Some(id),
ScriptThreadMessage::UpdateHistoryState(id, ..) => Some(id),
ScriptThreadMessage::RemoveHistoryStates(id, ..) => Some(id),
ScriptThreadMessage::FocusIFrame(id, ..) => Some(id),
ScriptThreadMessage::WebDriverScriptCommand(id, ..) => Some(id),
ScriptThreadMessage::TickAllAnimations(id, ..) => Some(id),
ScriptThreadMessage::WebFontLoaded(id, ..) => Some(id),
ScriptThreadMessage::SendInputEvent(id, ..) => Some(*id),
ScriptThreadMessage::Viewport(id, ..) => Some(*id),
ScriptThreadMessage::GetTitle(id) => Some(*id),
ScriptThreadMessage::SetDocumentActivity(id, ..) => Some(*id),
ScriptThreadMessage::SetThrottled(id, ..) => Some(*id),
ScriptThreadMessage::SetThrottledInContainingIframe(id, ..) => Some(*id),
ScriptThreadMessage::NavigateIframe(id, ..) => Some(*id),
ScriptThreadMessage::PostMessage { target: id, .. } => Some(*id),
ScriptThreadMessage::UpdatePipelineId(_, _, _, id, _) => Some(*id),
ScriptThreadMessage::UpdateHistoryState(id, ..) => Some(*id),
ScriptThreadMessage::RemoveHistoryStates(id, ..) => Some(*id),
ScriptThreadMessage::FocusIFrame(id, ..) => Some(*id),
ScriptThreadMessage::WebDriverScriptCommand(id, ..) => Some(*id),
ScriptThreadMessage::TickAllAnimations(id, ..) => Some(*id),
ScriptThreadMessage::WebFontLoaded(id, ..) => Some(*id),
ScriptThreadMessage::DispatchIFrameLoadEvent {
target: _,
parent: id,
child: _,
} => Some(id),
ScriptThreadMessage::DispatchStorageEvent(id, ..) => Some(id),
ScriptThreadMessage::ReportCSSError(id, ..) => Some(id),
ScriptThreadMessage::Reload(id, ..) => Some(id),
ScriptThreadMessage::PaintMetric(id, ..) => Some(id),
ScriptThreadMessage::ExitFullScreen(id, ..) => Some(id),
} => Some(*id),
ScriptThreadMessage::DispatchStorageEvent(id, ..) => Some(*id),
ScriptThreadMessage::ReportCSSError(id, ..) => Some(*id),
ScriptThreadMessage::Reload(id, ..) => Some(*id),
ScriptThreadMessage::PaintMetric(id, ..) => Some(*id),
ScriptThreadMessage::ExitFullScreen(id, ..) => Some(*id),
ScriptThreadMessage::MediaSessionAction(..) => None,
#[cfg(feature = "webgpu")]
ScriptThreadMessage::SetWebGPUPort(..) => None,
ScriptThreadMessage::SetScrollStates(id, ..) => Some(id),
ScriptThreadMessage::SetEpochPaintTime(id, ..) => Some(id),
ScriptThreadMessage::SetScrollStates(id, ..) => Some(*id),
ScriptThreadMessage::SetEpochPaintTime(id, ..) => Some(*id),
},
MixedMessage::FromScript(ref inner_msg) => match *inner_msg {
MixedMessage::FromScript(inner_msg) => match inner_msg {
MainThreadScriptMsg::Common(CommonScriptMsg::Task(_, _, pipeline_id, _)) => {
pipeline_id
*pipeline_id
},
MainThreadScriptMsg::Common(CommonScriptMsg::CollectReports(_)) => None,
MainThreadScriptMsg::NavigationResponse { pipeline_id, .. } => Some(pipeline_id),
MainThreadScriptMsg::WorkletLoaded(pipeline_id) => Some(pipeline_id),
MainThreadScriptMsg::RegisterPaintWorklet { pipeline_id, .. } => Some(pipeline_id),
MainThreadScriptMsg::NavigationResponse { pipeline_id, .. } => Some(*pipeline_id),
MainThreadScriptMsg::WorkletLoaded(pipeline_id) => Some(*pipeline_id),
MainThreadScriptMsg::RegisterPaintWorklet { pipeline_id, .. } => Some(*pipeline_id),
MainThreadScriptMsg::Inactive => None,
MainThreadScriptMsg::WakeUp => None,
},
@ -396,7 +396,7 @@ impl ScriptThreadReceivers {
}
#[cfg(not(feature = "webgpu"))]
{
&crossbeam_channel::never::<()>()
crossbeam_channel::never::<()>()
}
}) -> msg => {
#[cfg(feature = "webgpu")]