From 37ab4b98259d45c9efd3645ebc961ca518adb5c6 Mon Sep 17 00:00:00 2001 From: Martin Robinson Date: Thu, 12 Sep 2024 06:24:05 -0700 Subject: [PATCH] chore: Fix two compiler warnings (#33421) Signed-off-by: Martin Robinson --- components/script/dom/bindings/codegen/CodegenRust.py | 5 ++++- components/script/dom/fakexrdevice.rs | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/components/script/dom/bindings/codegen/CodegenRust.py b/components/script/dom/bindings/codegen/CodegenRust.py index cf8e70441c5..498979c3b63 100644 --- a/components/script/dom/bindings/codegen/CodegenRust.py +++ b/components/script/dom/bindings/codegen/CodegenRust.py @@ -6755,12 +6755,15 @@ class CGDictionary(CGThing): initParent = f"parent: {initParent},\n" if initParent else "" memberInits = CGList([memberInit(m, True) for m in self.memberInfo]) + unsafe_if_necessary = "unsafe" + if not initParent and not memberInits: + unsafe_if_necessary = "" return ( f"impl {selfName} {{\n" f"{CGIndenter(CGGeneric(self.makeEmpty()), indentLevel=4).define()}\n" " pub fn new(cx: SafeJSContext, val: HandleValue) \n" f" -> Result, ()> {{\n" - " unsafe {\n" + f" {unsafe_if_necessary} {{\n" " let object = if val.get().is_null_or_undefined() {\n" " ptr::null_mut()\n" " } else if val.get().is_object() {\n" diff --git a/components/script/dom/fakexrdevice.rs b/components/script/dom/fakexrdevice.rs index 0c37b7a1e2c..397f6032c94 100644 --- a/components/script/dom/fakexrdevice.rs +++ b/components/script/dom/fakexrdevice.rs @@ -11,8 +11,8 @@ use ipc_channel::ipc::IpcSender; use ipc_channel::router::ROUTER; use profile_traits::ipc; use webxr_api::{ - EntityType, Handedness, InputId, InputSource, MockButton, MockDeviceMsg, MockInputInit, - MockRegion, MockViewInit, MockViewsInit, MockWorld, TargetRayMode, Triangle, Visibility, + EntityType, Handedness, InputId, InputSource, MockDeviceMsg, MockInputInit, MockRegion, + MockViewInit, MockViewsInit, MockWorld, TargetRayMode, Triangle, Visibility, }; use crate::dom::bindings::codegen::Bindings::DOMPointBinding::DOMPointInit;