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/webxr/openxr | |
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/webxr/openxr')
-rw-r--r-- | components/webxr/openxr/graphics_d3d11.rs | 6 | ||||
-rw-r--r-- | components/webxr/openxr/input.rs | 12 | ||||
-rw-r--r-- | components/webxr/openxr/interaction_profiles.rs | 2 | ||||
-rw-r--r-- | components/webxr/openxr/mod.rs | 2 |
4 files changed, 11 insertions, 11 deletions
diff --git a/components/webxr/openxr/graphics_d3d11.rs b/components/webxr/openxr/graphics_d3d11.rs index 15a472a6c3e..a22df9f5bb1 100644 --- a/components/webxr/openxr/graphics_d3d11.rs +++ b/components/webxr/openxr/graphics_d3d11.rs @@ -6,7 +6,7 @@ use std::{mem, ptr}; use euclid::{Size2D, UnknownUnit}; use log::warn; -use openxr::d3d::{Requirements, SessionCreateInfoD3D11, D3D11}; +use openxr::d3d::{D3D11, Requirements, SessionCreateInfoD3D11}; use openxr::{ ExtensionSet, FormFactor, FrameStream, FrameWaiter, Graphics, Instance, Session, SystemId, }; @@ -15,14 +15,14 @@ use surfman::{ Error as SurfmanError, SurfaceTexture, }; use webxr_api::Error; +use winapi::Interface; use winapi::shared::winerror::{DXGI_ERROR_NOT_FOUND, S_OK}; use winapi::shared::{dxgi, dxgiformat}; use winapi::um::d3d11::ID3D11Texture2D; -use winapi::Interface; use wio::com::ComPtr; use crate::openxr::graphics::{GraphicsProvider, GraphicsProviderMethods}; -use crate::openxr::{create_instance, AppInfo}; +use crate::openxr::{AppInfo, create_instance}; pub type Backend = D3D11; diff --git a/components/webxr/openxr/input.rs b/components/webxr/openxr/input.rs index 0a940aff002..16335cc01a2 100644 --- a/components/webxr/openxr/input.rs +++ b/components/webxr/openxr/input.rs @@ -8,21 +8,21 @@ use std::mem::MaybeUninit; use euclid::RigidTransform3D; use log::debug; use openxr::sys::{ - HandJointLocationsEXT, HandJointsLocateInfoEXT, HandTrackingAimStateFB, - FB_HAND_TRACKING_AIM_EXTENSION_NAME, + FB_HAND_TRACKING_AIM_EXTENSION_NAME, HandJointLocationsEXT, HandJointsLocateInfoEXT, + HandTrackingAimStateFB, }; use openxr::{ - self, Action, ActionSet, Binding, FrameState, Graphics, Hand as HandEnum, HandJoint, - HandJointLocation, HandTracker, HandTrackingAimFlagsFB, Instance, Path, Posef, Session, Space, - SpaceLocationFlags, HAND_JOINT_COUNT, + self, Action, ActionSet, Binding, FrameState, Graphics, HAND_JOINT_COUNT, Hand as HandEnum, + HandJoint, HandJointLocation, HandTracker, HandTrackingAimFlagsFB, Instance, Path, Posef, + Session, Space, SpaceLocationFlags, }; use webxr_api::{ Finger, Hand, Handedness, Input, InputFrame, InputId, InputSource, JointFrame, Native, SelectEvent, TargetRayMode, Viewer, }; -use super::interaction_profiles::InteractionProfile; use super::IDENTITY_POSE; +use super::interaction_profiles::InteractionProfile; use crate::ext_string; use crate::openxr::interaction_profiles::INTERACTION_PROFILES; diff --git a/components/webxr/openxr/interaction_profiles.rs b/components/webxr/openxr/interaction_profiles.rs index c728e958748..8fae3da3e55 100644 --- a/components/webxr/openxr/interaction_profiles.rs +++ b/components/webxr/openxr/interaction_profiles.rs @@ -2,6 +2,7 @@ * 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 openxr::ExtensionSet; use openxr::sys::{ BD_CONTROLLER_INTERACTION_EXTENSION_NAME, EXT_HAND_INTERACTION_EXTENSION_NAME, EXT_HP_MIXED_REALITY_CONTROLLER_EXTENSION_NAME, EXT_SAMSUNG_ODYSSEY_CONTROLLER_EXTENSION_NAME, @@ -10,7 +11,6 @@ use openxr::sys::{ HTC_VIVE_FOCUS3_CONTROLLER_INTERACTION_EXTENSION_NAME, META_TOUCH_CONTROLLER_PLUS_EXTENSION_NAME, ML_ML2_CONTROLLER_INTERACTION_EXTENSION_NAME, }; -use openxr::ExtensionSet; #[macro_export] macro_rules! ext_string { diff --git a/components/webxr/openxr/mod.rs b/components/webxr/openxr/mod.rs index 7c3da3fb74b..585752dffa8 100644 --- a/components/webxr/openxr/mod.rs +++ b/components/webxr/openxr/mod.rs @@ -34,8 +34,8 @@ use webxr_api::{ ViewerPose, Viewport, Viewports, Views, Visibility, WebXrSender, }; -use crate::gl_utils::GlClearer; use crate::SurfmanGL; +use crate::gl_utils::GlClearer; mod input; use input::OpenXRInput; |