Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-06 14:10:11 +01:00
Code Issues Projects Releases Packages Wiki Activity

webxr: Rename sender & receiver type aliases to WebXrSender and WebXrReceiver (#35307)

Browse source 
This will prevent rust-analyzer from suggesting the import of these
types when dealing with `crossbeam` channels.

Signed-off-by: Martin Robinson <mrobinson@igalia.com>
This commit is contained in:
Martin Robinson 2025-02-05 22:10:17 +01:00 • committed by GitHub
parent eb0382449f
commit 1e5db41afd
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
9 changed files with 77 additions and 70 deletions
Download patch file Download diff file Expand all files Collapse all files

10
components/webxr/glwindow/mod.rs
View file

@ -18,10 +18,10 @@ use surfman::{
use webxr_api::util::ClipPlanes;
use webxr_api::{
ContextId, DeviceAPI, DiscoveryAPI, Display, Error, Event, EventBuffer, Floor, Frame,
InputSource, LayerGrandManager, LayerId, LayerInit, LayerManager, Native, Quitter, Sender,
Session, SessionBuilder, SessionInit, SessionMode, SomeEye, View, Viewer, ViewerPose, Viewport,
Viewports, Views, CUBE_BACK, CUBE_BOTTOM, CUBE_LEFT, CUBE_RIGHT, CUBE_TOP, LEFT_EYE, RIGHT_EYE,
VIEWER,
InputSource, LayerGrandManager, LayerId, LayerInit, LayerManager, Native, Quitter, Session,
SessionBuilder, SessionInit, SessionMode, SomeEye, View, Viewer, ViewerPose, Viewport,
Viewports, Views, WebXrSender, CUBE_BACK, CUBE_BOTTOM, CUBE_LEFT, CUBE_RIGHT, CUBE_TOP,
LEFT_EYE, RIGHT_EYE, VIEWER,
};
use crate::{SurfmanGL, SurfmanLayerManager};
@ -305,7 +305,7 @@ impl DeviceAPI for GlWindowDevice {
vec![]
}
fn set_event_dest(&mut self, dest: Sender<Event>) {
fn set_event_dest(&mut self, dest: WebXrSender<Event>) {
self.events.upgrade(dest)
}

10
components/webxr/headless/mod.rs
View file

@ -13,8 +13,8 @@ use webxr_api::{
Frame, FrameUpdateEvent, HitTestId, HitTestResult, HitTestSource, Input, InputFrame, InputId,
InputSource, LayerGrandManager, LayerId, LayerInit, LayerManager, MockButton, MockDeviceInit,
MockDeviceMsg, MockDiscoveryAPI, MockInputMsg, MockViewInit, MockViewsInit, MockWorld, Native,
Quitter, Ray, Receiver, SelectEvent, SelectKind, Sender, Session, SessionBuilder, SessionInit,
SessionMode, Space, SubImages, View, Viewer, ViewerPose, Viewports, Views,
Quitter, Ray, SelectEvent, SelectKind, Session, SessionBuilder, SessionInit, SessionMode,
Space, SubImages, View, Viewer, ViewerPose, Viewports, Views, WebXrReceiver, WebXrSender,
};
use crate::{SurfmanGL, SurfmanLayerManager};
@ -74,7 +74,7 @@ impl MockDiscoveryAPI<SurfmanGL> for HeadlessMockDiscovery {
fn simulate_device_connection(
&mut self,
init: MockDeviceInit,
receiver: Receiver<MockDeviceMsg>,
receiver: WebXrReceiver<MockDeviceMsg>,
) -> Result<Box<dyn DiscoveryAPI<SurfmanGL>>, Error> {
let viewer_origin = init.viewer_origin;
let floor_transform = init.floor_origin.map(|f| f.inverse());
@ -107,7 +107,7 @@ impl MockDiscoveryAPI<SurfmanGL> for HeadlessMockDiscovery {
}
}
fn run_loop(receiver: Receiver<MockDeviceMsg>, data: Arc<Mutex<HeadlessDeviceData>>) {
fn run_loop(receiver: WebXrReceiver<MockDeviceMsg>, data: Arc<Mutex<HeadlessDeviceData>>) {
while let Ok(msg) = receiver.recv() {
if !data.lock().expect("Mutex poisoned").handle_msg(msg) {
break;
@ -283,7 +283,7 @@ impl DeviceAPI for HeadlessDevice {
vec![]
}
fn set_event_dest(&mut self, dest: Sender<Event>) {
fn set_event_dest(&mut self, dest: WebXrSender<Event>) {
self.with_per_session(|s| s.events.upgrade(dest))
}

6
components/webxr/openxr/mod.rs
View file

@ -29,9 +29,9 @@ use webxr_api::util::{self, ClipPlanes};
use webxr_api::{
BaseSpace, Capture, ContextId, DeviceAPI, DiscoveryAPI, Display, Error, Event, EventBuffer,
Floor, Frame, GLContexts, InputId, InputSource, LayerGrandManager, LayerId, LayerInit,
LayerManager, LayerManagerAPI, LeftEye, Native, Quitter, RightEye, SelectKind, Sender,
LayerManager, LayerManagerAPI, LeftEye, Native, Quitter, RightEye, SelectKind,
Session as WebXrSession, SessionBuilder, SessionInit, SessionMode, SubImage, SubImages, View,
ViewerPose, Viewport, Viewports, Views, Visibility,
ViewerPose, Viewport, Viewports, Views, Visibility, WebXrSender,
};
use crate::gl_utils::GlClearer;
@ -1421,7 +1421,7 @@ impl DeviceAPI for OpenXrDevice {
]
}
fn set_event_dest(&mut self, dest: Sender<Event>) {
fn set_event_dest(&mut self, dest: WebXrSender<Event>) {
self.events.upgrade(dest)
}