diff options
author | Simon Wülker <simon.wuelker@arcor.de> | 2025-03-03 12:26:53 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2025-03-03 11:26:53 +0000 |
commit | 3d320fa96ae2ca95a720c454c47ee7827864c5af (patch) | |
tree | 1b7718d574cb9164d924b7571760d90d6d2099c4 /components/servo | |
parent | 6300e820b4e3fbfcec260048f931528d4998d5e4 (diff) | |
download | servo-3d320fa96ae2ca95a720c454c47ee7827864c5af.tar.gz servo-3d320fa96ae2ca95a720c454c47ee7827864c5af.zip |
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>
Diffstat (limited to 'components/servo')
-rw-r--r-- | components/servo/examples/winit_minimal.rs | 2 | ||||
-rw-r--r-- | components/servo/lib.rs | 16 | ||||
-rw-r--r-- | components/servo/proxies.rs | 2 | ||||
-rw-r--r-- | components/servo/servo_delegate.rs | 2 | ||||
-rw-r--r-- | components/servo/webview.rs | 6 |
5 files changed, 14 insertions, 14 deletions
diff --git a/components/servo/examples/winit_minimal.rs b/components/servo/examples/winit_minimal.rs index 5b16aaf5496..c4995a54224 100644 --- a/components/servo/examples/winit_minimal.rs +++ b/components/servo/examples/winit_minimal.rs @@ -12,8 +12,8 @@ use servo::{RenderingContext, Servo, TouchEventType, WebView, WindowRenderingCon use servo_geometry::DeviceIndependentPixel; use tracing::warn; use url::Url; -use webrender_api::units::{DeviceIntPoint, DeviceIntRect, DevicePixel, LayoutVector2D}; use webrender_api::ScrollLocation; +use webrender_api::units::{DeviceIntPoint, DeviceIntRect, DevicePixel, LayoutVector2D}; use winit::application::ApplicationHandler; use winit::dpi::{PhysicalPosition, PhysicalSize}; use winit::event::{MouseScrollDelta, WindowEvent}; diff --git a/components/servo/lib.rs b/components/servo/lib.rs index 5261a6db087..4ea13e2ff82 100644 --- a/components/servo/lib.rs +++ b/components/servo/lib.rs @@ -38,8 +38,8 @@ use base::id::{PipelineNamespace, PipelineNamespaceId, WebViewId}; use bluetooth::BluetoothThreadFactory; #[cfg(feature = "bluetooth")] use bluetooth_traits::BluetoothRequest; -use canvas::canvas_paint_thread::CanvasPaintThread; use canvas::WebGLComm; +use canvas::canvas_paint_thread::CanvasPaintThread; use canvas_traits::webgl::{GlType, WebGLThreads}; use clipboard_delegate::StringRequest; use compositing::windowing::{EmbedderMethods, WindowMethods}; @@ -58,7 +58,7 @@ use constellation::{ Constellation, FromCompositorLogger, FromScriptLogger, InitialConstellationState, UnprivilegedContent, }; -use crossbeam_channel::{unbounded, Receiver, Sender}; +use crossbeam_channel::{Receiver, Sender, unbounded}; pub use embedder_traits::*; use env_logger::Builder as EnvLoggerBuilder; use euclid::Scale; @@ -79,7 +79,7 @@ use ipc_channel::router::ROUTER; pub use keyboard_types::*; #[cfg(feature = "layout_2013")] pub use layout_thread_2013; -use log::{debug, warn, Log, Metadata, Record}; +use log::{Log, Metadata, Record, debug, warn}; use media::{GlApi, NativeDisplay, WindowGLContext}; use net::protocols::ProtocolRegistry; use net::resource_thread::new_resource_threads; @@ -92,14 +92,14 @@ use servo_config::opts::Opts; use servo_config::prefs::Preferences; use servo_config::{opts, pref, prefs}; use servo_delegate::DefaultServoDelegate; -use servo_media::player::context::GlContext; use servo_media::ServoMedia; +use servo_media::player::context::GlContext; use servo_url::ServoUrl; #[cfg(feature = "webgpu")] pub use webgpu; #[cfg(feature = "webgpu")] use webgpu::swapchain::WGPUImageMap; -use webrender::{RenderApiSender, ShaderPrecacheFlags, UploadMethod, ONE_TIME_USAGE_HINT}; +use webrender::{ONE_TIME_USAGE_HINT, RenderApiSender, ShaderPrecacheFlags, UploadMethod}; use webrender_api::{ColorF, DocumentId, FramePublishId}; pub use webrender_traits::rendering_context::{ OffscreenRenderingContext, RenderingContext, SoftwareRenderingContext, WindowRenderingContext, @@ -1246,9 +1246,9 @@ fn default_user_agent_string_for(agent: UserAgent) -> String { match agent { UserAgent::Desktop => desktop_ua_string, - UserAgent::Android => format!( - "Mozilla/5.0 (Android; Mobile; rv:128.0) Servo/{servo_version} Firefox/128.0" - ), + UserAgent::Android => { + format!("Mozilla/5.0 (Android; Mobile; rv:128.0) Servo/{servo_version} Firefox/128.0") + }, UserAgent::OpenHarmony => format!( "Mozilla/5.0 (OpenHarmony; Mobile; rv:128.0) Servo/{servo_version} Firefox/128.0" ), diff --git a/components/servo/proxies.rs b/components/servo/proxies.rs index 2d98bbdab6e..ff51b8b9b19 100644 --- a/components/servo/proxies.rs +++ b/components/servo/proxies.rs @@ -2,8 +2,8 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -use std::sync::atomic::{AtomicBool, Ordering}; use std::sync::Arc; +use std::sync::atomic::{AtomicBool, Ordering}; use compositing_traits::ConstellationMsg; use crossbeam_channel::{SendError, Sender}; diff --git a/components/servo/servo_delegate.rs b/components/servo/servo_delegate.rs index 3c2b9befaaa..5ddd1036735 100644 --- a/components/servo/servo_delegate.rs +++ b/components/servo/servo_delegate.rs @@ -2,8 +2,8 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -use crate::webview_delegate::{AllowOrDenyRequest, WebResourceLoad}; use crate::Servo; +use crate::webview_delegate::{AllowOrDenyRequest, WebResourceLoad}; #[derive(Clone, Copy, Debug, Hash, PartialEq)] pub enum ServoError { diff --git a/components/servo/webview.rs b/components/servo/webview.rs index 3e39d1db21a..ba60ccd6bdc 100644 --- a/components/servo/webview.rs +++ b/components/servo/webview.rs @@ -8,8 +8,8 @@ use std::rc::{Rc, Weak}; use std::time::Duration; use base::id::WebViewId; -use compositing::windowing::WebRenderDebugOption; use compositing::IOCompositor; +use compositing::windowing::WebRenderDebugOption; use compositing_traits::ConstellationMsg; use dpi::PhysicalSize; use embedder_traits::{ @@ -17,12 +17,12 @@ use embedder_traits::{ TraversalDirection, }; use url::Url; -use webrender_api::units::{DeviceIntPoint, DeviceRect}; use webrender_api::ScrollLocation; +use webrender_api::units::{DeviceIntPoint, DeviceRect}; +use crate::ConstellationProxy; use crate::clipboard_delegate::{ClipboardDelegate, DefaultClipboardDelegate}; use crate::webview_delegate::{DefaultWebViewDelegate, WebViewDelegate}; -use crate::ConstellationProxy; /// A handle to a Servo webview. If you clone this handle, it does not create a new webview, /// but instead creates a new handle to the webview. Once the last handle is dropped, Servo |