Finish the integration of `webxr` into the Cargo workspace (#35229)

- Run `cargo fmt` on `webxr` and `webxr-api`
- Fix clippy warnings in the existing `webxr` code
- Integrate the new crates into the workspace
- Expose `webxr` via the libservo API rather than requiring embedders to
  depend on it explicitly.

Signed-off-by: Martin Robinson <mrobinson@igalia.com>

1 files changed, 3 insertions, 3 deletions

diff --git a/ports/servoshell/egl/servo_glue.rs b/ports/servoshell/egl/servo_glue.rs
index 8bb38e5fc3d..5311f2a197c 100644
--- a/ports/servoshell/egl/servo_glue.rs
+++ b/ports/servoshell/egl/servo_glue.rs
@@ -681,13 +681,13 @@ impl ServoGlue {
 pub(super) struct ServoEmbedderCallbacks {
     waker: Box<dyn EventLoopWaker>,
     #[cfg(feature = "webxr")]
-    xr_discovery: Option<webxr::Discovery>,
+    xr_discovery: Option<servo::webxr::Discovery>,
 }
 
 impl ServoEmbedderCallbacks {
     pub(super) fn new(
         waker: Box<dyn EventLoopWaker>,
-        #[cfg(feature = "webxr")] xr_discovery: Option<webxr::Discovery>,
+        #[cfg(feature = "webxr")] xr_discovery: Option<servo::webxr::Discovery>,
     ) -> Self {
         Self {
             waker,
@@ -706,7 +706,7 @@ impl EmbedderMethods for ServoEmbedderCallbacks {
     #[cfg(feature = "webxr")]
     fn register_webxr(
         &mut self,
-        registry: &mut webxr::MainThreadRegistry,
+        registry: &mut servo::webxr::MainThreadRegistry,
         _embedder_proxy: EmbedderProxy,
     ) {
         debug!("EmbedderMethods::register_xr");