Update rustfmt to the 2024 style edition (#35764)

* Use 2024 style edition

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

* Reformat all code

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

---------

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

22 files changed, 41 insertions, 39 deletions

diff --git a/components/devtools/actors/browsing_context.rs b/components/devtools/actors/browsing_context.rs
index 3adf37aa4dc..54d1e8f2223 100644
--- a/components/devtools/actors/browsing_context.rs
+++ b/components/devtools/actors/browsing_context.rs
@@ -18,9 +18,9 @@ use serde::Serialize;
 use serde_json::{Map, Value};
 
 use crate::actor::{Actor, ActorMessageStatus, ActorRegistry};
+use crate::actors::inspector::InspectorActor;
 use crate::actors::inspector::accessibility::AccessibilityActor;
 use crate::actors::inspector::css_properties::CssPropertiesActor;
-use crate::actors::inspector::InspectorActor;
 use crate::actors::reflow::ReflowActor;
 use crate::actors::stylesheets::StyleSheetsActor;
 use crate::actors::tab::TabDescriptorActor;
diff --git a/components/devtools/actors/device.rs b/components/devtools/actors/device.rs
index 395825baedd..dc6826872c1 100644
--- a/components/devtools/actors/device.rs
+++ b/components/devtools/actors/device.rs
@@ -7,9 +7,9 @@ use std::net::TcpStream;
 use serde::Serialize;
 use serde_json::{Map, Value};
 
+use crate::StreamId;
 use crate::actor::{Actor, ActorMessageStatus, ActorRegistry};
 use crate::protocol::{ActorDescription, JsonPacketStream, Method};
-use crate::StreamId;
 
 #[derive(Serialize)]
 struct GetDescriptionReply {
diff --git a/components/devtools/actors/framerate.rs b/components/devtools/actors/framerate.rs
index b9db3f743d1..6a3a59b791f 100644
--- a/components/devtools/actors/framerate.rs
+++ b/components/devtools/actors/framerate.rs
@@ -10,9 +10,9 @@ use devtools_traits::DevtoolScriptControlMsg;
 use ipc_channel::ipc::IpcSender;
 use serde_json::{Map, Value};
 
+use crate::StreamId;
 use crate::actor::{Actor, ActorMessageStatus, ActorRegistry};
 use crate::actors::timeline::HighResolutionStamp;
-use crate::StreamId;
 
 pub struct FramerateActor {
     name: String,
diff --git a/components/devtools/actors/inspector.rs b/components/devtools/actors/inspector.rs
index dfc13e3433d..0dd886ada9f 100644
--- a/components/devtools/actors/inspector.rs
+++ b/components/devtools/actors/inspector.rs
@@ -14,6 +14,7 @@ use ipc_channel::ipc::{self, IpcSender};
 use serde::Serialize;
 use serde_json::{self, Map, Value};
 
+use crate::StreamId;
 use crate::actor::{Actor, ActorMessageStatus, ActorRegistry};
 use crate::actors::browsing_context::BrowsingContextActor;
 use crate::actors::inspector::highlighter::{HighlighterActor, HighlighterMsg};
@@ -21,7 +22,6 @@ use crate::actors::inspector::node::NodeInfoToProtocol;
 use crate::actors::inspector::page_style::{PageStyleActor, PageStyleMsg};
 use crate::actors::inspector::walker::{WalkerActor, WalkerMsg};
 use crate::protocol::JsonPacketStream;
-use crate::StreamId;
 
 pub mod accessibility;
 pub mod css_properties;
diff --git a/components/devtools/actors/inspector/accessibility.rs b/components/devtools/actors/inspector/accessibility.rs
index 2b4ccb0e33e..07ec8e24398 100644
--- a/components/devtools/actors/inspector/accessibility.rs
+++ b/components/devtools/actors/inspector/accessibility.rs
@@ -10,9 +10,9 @@ use std::net::TcpStream;
 use serde::Serialize;
 use serde_json::{Map, Value};
 
+use crate::StreamId;
 use crate::actor::{Actor, ActorMessageStatus, ActorRegistry};
 use crate::protocol::JsonPacketStream;
-use crate::StreamId;
 
 #[derive(Serialize)]
 struct BootstrapState {
diff --git a/components/devtools/actors/inspector/css_properties.rs b/components/devtools/actors/inspector/css_properties.rs
index cb7a939f224..6fae7bc86ce 100644
--- a/components/devtools/actors/inspector/css_properties.rs
+++ b/components/devtools/actors/inspector/css_properties.rs
@@ -12,9 +12,9 @@ use devtools_traits::CssDatabaseProperty;
 use serde::Serialize;
 use serde_json::{Map, Value};
 
+use crate::StreamId;
 use crate::actor::{Actor, ActorMessageStatus, ActorRegistry};
 use crate::protocol::JsonPacketStream;
-use crate::StreamId;
 
 pub struct CssPropertiesActor {
     name: String,
diff --git a/components/devtools/actors/inspector/layout.rs b/components/devtools/actors/inspector/layout.rs
index ab848b6b8fb..41ba640ca69 100644
--- a/components/devtools/actors/inspector/layout.rs
+++ b/components/devtools/actors/inspector/layout.rs
@@ -10,9 +10,9 @@ use std::net::TcpStream;
 use serde::Serialize;
 use serde_json::{Map, Value};
 
+use crate::StreamId;
 use crate::actor::{Actor, ActorMessageStatus, ActorRegistry};
 use crate::protocol::JsonPacketStream;
-use crate::StreamId;
 
 #[derive(Serialize)]
 pub struct LayoutInspectorActorMsg {
diff --git a/components/devtools/actors/inspector/page_style.rs b/components/devtools/actors/inspector/page_style.rs
index a6d6e9c3be9..9ac1958406e 100644
--- a/components/devtools/actors/inspector/page_style.rs
+++ b/components/devtools/actors/inspector/page_style.rs
@@ -5,8 +5,8 @@
 //! The page style actor is responsible of informing the DevTools client of the different style
 //! properties applied, including the attributes and layout of each element.
 
-use std::collections::hash_map::Entry;
 use std::collections::HashMap;
+use std::collections::hash_map::Entry;
 use std::iter::once;
 use std::net::TcpStream;
 
@@ -17,12 +17,12 @@ use ipc_channel::ipc::{self, IpcSender};
 use serde::Serialize;
 use serde_json::{self, Map, Value};
 
+use crate::StreamId;
 use crate::actor::{Actor, ActorMessageStatus, ActorRegistry};
 use crate::actors::inspector::node::NodeActor;
 use crate::actors::inspector::style_rule::{AppliedRule, ComputedDeclaration, StyleRuleActor};
-use crate::actors::inspector::walker::{find_child, WalkerActor};
+use crate::actors::inspector::walker::{WalkerActor, find_child};
 use crate::protocol::JsonPacketStream;
-use crate::StreamId;
 
 #[derive(Serialize)]
 struct GetAppliedReply {
diff --git a/components/devtools/actors/inspector/style_rule.rs b/components/devtools/actors/inspector/style_rule.rs
index 15c39e48903..c3b3c1afbb5 100644
--- a/components/devtools/actors/inspector/style_rule.rs
+++ b/components/devtools/actors/inspector/style_rule.rs
@@ -16,11 +16,11 @@ use ipc_channel::ipc;
 use serde::Serialize;
 use serde_json::{Map, Value};
 
+use crate::StreamId;
 use crate::actor::{Actor, ActorMessageStatus, ActorRegistry};
 use crate::actors::inspector::node::NodeActor;
 use crate::actors::inspector::walker::WalkerActor;
 use crate::protocol::JsonPacketStream;
-use crate::StreamId;
 
 const ELEMENT_STYLE_TYPE: u32 = 100;
 
diff --git a/components/devtools/actors/memory.rs b/components/devtools/actors/memory.rs
index 846db4c1d65..c6e58aff50c 100644
--- a/components/devtools/actors/memory.rs
+++ b/components/devtools/actors/memory.rs
@@ -7,8 +7,8 @@ use std::net::TcpStream;
 use serde::Serialize;
 use serde_json::{Map, Value};
 
-use crate::actor::{Actor, ActorMessageStatus, ActorRegistry};
 use crate::StreamId;
+use crate::actor::{Actor, ActorMessageStatus, ActorRegistry};
 
 #[derive(Serialize)]
 #[serde(rename_all = "camelCase")]
diff --git a/components/devtools/actors/network_event.rs b/components/devtools/actors/network_event.rs
index ac931a9931f..fdfc5d7b581 100644
--- a/components/devtools/actors/network_event.rs
+++ b/components/devtools/actors/network_event.rs
@@ -11,14 +11,14 @@ use std::time::{Duration, SystemTime, UNIX_EPOCH};
 use chrono::{Local, LocalResult, TimeZone};
 use devtools_traits::{HttpRequest as DevtoolsHttpRequest, HttpResponse as DevtoolsHttpResponse};
 use headers::{ContentType, Cookie, HeaderMapExt};
-use http::{header, HeaderMap, Method};
+use http::{HeaderMap, Method, header};
 use net_traits::http_status::HttpStatus;
 use serde::Serialize;
 use serde_json::{Map, Value};
 
+use crate::StreamId;
 use crate::actor::{Actor, ActorMessageStatus, ActorRegistry};
 use crate::protocol::JsonPacketStream;
-use crate::StreamId;
 
 struct HttpRequest {
     url: String,
diff --git a/components/devtools/actors/object.rs b/components/devtools/actors/object.rs
index 909871564cf..2e0e47e74e7 100644
--- a/components/devtools/actors/object.rs
+++ b/components/devtools/actors/object.rs
@@ -6,8 +6,8 @@ use std::net::TcpStream;
 
 use serde_json::{Map, Value};
 
-use crate::actor::{Actor, ActorMessageStatus, ActorRegistry};
 use crate::StreamId;
+use crate::actor::{Actor, ActorMessageStatus, ActorRegistry};
 
 pub struct ObjectActor {
     pub name: String,
diff --git a/components/devtools/actors/performance.rs b/components/devtools/actors/performance.rs
index 0644e2665ec..bf64b9a261c 100644
--- a/components/devtools/actors/performance.rs
+++ b/components/devtools/actors/performance.rs
@@ -10,9 +10,9 @@ use std::net::TcpStream;
 use serde::Serialize;
 use serde_json::{Map, Value};
 
+use crate::StreamId;
 use crate::actor::{Actor, ActorMessageStatus, ActorRegistry};
 use crate::protocol::{ActorDescription, JsonPacketStream, Method};
-use crate::StreamId;
 
 pub struct PerformanceActor {
     name: String,
diff --git a/components/devtools/actors/preference.rs b/components/devtools/actors/preference.rs
index bb48057e0da..c66c910df60 100644
--- a/components/devtools/actors/preference.rs
+++ b/components/devtools/actors/preference.rs
@@ -9,9 +9,9 @@ use serde::Serialize;
 use serde_json::{Map, Value};
 use servo_config::pref;
 
+use crate::StreamId;
 use crate::actor::{Actor, ActorMessageStatus, ActorRegistry};
 use crate::protocol::JsonPacketStream;
-use crate::StreamId;
 
 pub struct PreferenceActor {
     name: String,
diff --git a/components/devtools/actors/process.rs b/components/devtools/actors/process.rs
index 6f9d0ca60f0..1a3f8fbb64f 100644
--- a/components/devtools/actors/process.rs
+++ b/components/devtools/actors/process.rs
@@ -11,10 +11,10 @@ use std::net::TcpStream;
 use serde::Serialize;
 use serde_json::{Map, Value};
 
+use crate::StreamId;
 use crate::actor::{Actor, ActorMessageStatus, ActorRegistry};
 use crate::actors::root::DescriptorTraits;
 use crate::protocol::JsonPacketStream;
-use crate::StreamId;
 
 #[derive(Serialize)]
 struct ListWorkersReply {
diff --git a/components/devtools/actors/reflow.rs b/components/devtools/actors/reflow.rs
index 7df26826813..49e514c3ad5 100644
--- a/components/devtools/actors/reflow.rs
+++ b/components/devtools/actors/reflow.rs
@@ -8,8 +8,8 @@ use std::net::TcpStream;
 
 use serde_json::{Map, Value};
 
-use crate::actor::{Actor, ActorMessageStatus, ActorRegistry};
 use crate::StreamId;
+use crate::actor::{Actor, ActorMessageStatus, ActorRegistry};
 
 pub struct ReflowActor {
     name: String,
diff --git a/components/devtools/actors/root.rs b/components/devtools/actors/root.rs
index 2d22a631758..ee39bd337f4 100644
--- a/components/devtools/actors/root.rs
+++ b/components/devtools/actors/root.rs
@@ -12,8 +12,9 @@
 use std::net::TcpStream;
 
 use serde::Serialize;
-use serde_json::{json, Map, Value};
+use serde_json::{Map, Value, json};
 
+use crate::StreamId;
 use crate::actor::{Actor, ActorMessageStatus, ActorRegistry};
 use crate::actors::device::DeviceActor;
 use crate::actors::performance::PerformanceActor;
@@ -21,7 +22,6 @@ use crate::actors::process::{ProcessActor, ProcessActorMsg};
 use crate::actors::tab::{TabDescriptorActor, TabDescriptorActorMsg};
 use crate::actors::worker::{WorkerActor, WorkerMsg};
 use crate::protocol::{ActorDescription, JsonPacketStream};
-use crate::StreamId;
 
 #[derive(Serialize)]
 #[serde(rename_all = "camelCase")]
diff --git a/components/devtools/actors/stylesheets.rs b/components/devtools/actors/stylesheets.rs
index e5e8d873ecf..e6fd955295c 100644
--- a/components/devtools/actors/stylesheets.rs
+++ b/components/devtools/actors/stylesheets.rs
@@ -7,9 +7,9 @@ use std::net::TcpStream;
 use serde::Serialize;
 use serde_json::{Map, Value};
 
+use crate::StreamId;
 use crate::actor::{Actor, ActorMessageStatus, ActorRegistry};
 use crate::protocol::JsonPacketStream;
-use crate::StreamId;
 
 #[derive(Serialize)]
 #[serde(rename_all = "camelCase")]
diff --git a/components/devtools/actors/tab.rs b/components/devtools/actors/tab.rs
index 1d1e9ee19cf..d7d837fd12b 100644
--- a/components/devtools/actors/tab.rs
+++ b/components/devtools/actors/tab.rs
@@ -14,12 +14,12 @@ use std::net::TcpStream;
 use serde::Serialize;
 use serde_json::{Map, Value};
 
+use crate::StreamId;
 use crate::actor::{Actor, ActorMessageStatus, ActorRegistry};
 use crate::actors::browsing_context::{BrowsingContextActor, BrowsingContextActorMsg};
 use crate::actors::root::{DescriptorTraits, RootActor};
 use crate::actors::watcher::{WatcherActor, WatcherActorMsg};
 use crate::protocol::JsonPacketStream;
-use crate::StreamId;
 
 #[derive(Serialize)]
 #[serde(rename_all = "camelCase")]
diff --git a/components/devtools/actors/timeline.rs b/components/devtools/actors/timeline.rs
index 1a399bb8a5b..0ea9fbcd722 100644
--- a/components/devtools/actors/timeline.rs
+++ b/components/devtools/actors/timeline.rs
@@ -20,11 +20,11 @@ use ipc_channel::ipc::{self, IpcReceiver, IpcSender};
 use serde::{Serialize, Serializer};
 use serde_json::{Map, Value};
 
+use crate::StreamId;
 use crate::actor::{Actor, ActorMessageStatus, ActorRegistry};
 use crate::actors::framerate::FramerateActor;
 use crate::actors::memory::{MemoryActor, TimelineMemoryReply};
 use crate::protocol::JsonPacketStream;
-use crate::StreamId;
 
 pub struct TimelineActor {
     name: String,
@@ -163,20 +163,22 @@ impl TimelineActor {
 
         thread::Builder::new()
             .name("PullTimelineData".to_owned())
-            .spawn(move || loop {
-                if !*is_recording.lock().unwrap() {
-                    break;
-                }
+            .spawn(move || {
+                loop {
+                    if !*is_recording.lock().unwrap() {
+                        break;
+                    }
 
-                let mut markers = vec![];
-                while let Ok(Some(marker)) = receiver.try_recv() {
-                    markers.push(emitter.marker(marker));
-                }
-                if emitter.send(markers).is_err() {
-                    break;
-                }
+                    let mut markers = vec![];
+                    while let Ok(Some(marker)) = receiver.try_recv() {
+                        markers.push(emitter.marker(marker));
+                    }
+                    if emitter.send(markers).is_err() {
+                        break;
+                    }
 
-                thread::sleep(Duration::from_millis(DEFAULT_TIMELINE_DATA_PULL_TIMEOUT));
+                    thread::sleep(Duration::from_millis(DEFAULT_TIMELINE_DATA_PULL_TIMEOUT));
+                }
             })
             .expect("Thread spawning failed");
     }
diff --git a/components/devtools/actors/worker.rs b/components/devtools/actors/worker.rs
index b5bcec23b54..01f15a6351c 100644
--- a/components/devtools/actors/worker.rs
+++ b/components/devtools/actors/worker.rs
@@ -14,9 +14,9 @@ use serde::Serialize;
 use serde_json::{Map, Value};
 use servo_url::ServoUrl;
 
+use crate::StreamId;
 use crate::actor::{Actor, ActorMessageStatus, ActorRegistry};
 use crate::protocol::JsonPacketStream;
-use crate::StreamId;
 
 #[derive(Clone, Copy)]
 #[allow(dead_code)]
diff --git a/components/devtools/lib.rs b/components/devtools/lib.rs
index 3aec5a8d02c..b1c1f8cadf8 100644
--- a/components/devtools/lib.rs
+++ b/components/devtools/lib.rs
@@ -12,15 +12,15 @@
 #![deny(unsafe_code)]
 
 use std::borrow::ToOwned;
-use std::collections::hash_map::Entry::{Occupied, Vacant};
 use std::collections::HashMap;
+use std::collections::hash_map::Entry::{Occupied, Vacant};
 use std::io::Read;
 use std::net::{Shutdown, TcpListener, TcpStream};
 use std::sync::{Arc, Mutex};
 use std::thread;
 
 use base::id::{BrowsingContextId, PipelineId};
-use crossbeam_channel::{unbounded, Receiver, Sender};
+use crossbeam_channel::{Receiver, Sender, unbounded};
 use devtools_traits::{
     ChromeToDevtoolsControlMsg, ConsoleMessage, ConsoleMessageBuilder, DevtoolScriptControlMsg,
     DevtoolsControlMsg, DevtoolsPageInfo, LogLevel, NavigationState, NetworkEvent, PageError,