From 6ace7ad577552a820ad432113ec6c93192dda262 Mon Sep 17 00:00:00 2001
From: Narfinger <Narfinger@users.noreply.github.com>
Date: Thu, 24 Jul 2025 12:29:49 +0900
Subject: [PATCH] OHOS: Clean up some compile warnings (#38240)

This cleans up some compile warnings about unused functions.

Testing: Does not change functionality, OHOS and Linux still compile
(hopefully the other builds too).

---------

Signed-off-by: Narfinger <Narfinger@users.noreply.github.com>
Signed-off-by: Jonathan Schwender <schwenderjonathan@gmail.com>
Co-authored-by: Jonathan Schwender <schwenderjonathan@gmail.com>
---
 components/fonts/font.rs          | 5 ++++-
 components/script/dom/console.rs  | 4 +++-
 ports/servoshell/egl/app_state.rs | 1 +
 ports/servoshell/egl/ohos.rs      | 3 ++-
 4 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/components/fonts/font.rs b/components/fonts/font.rs
index 27ac77f5eb8..c98a40c7321 100644
--- a/components/fonts/font.rs
+++ b/components/fonts/font.rs
@@ -914,7 +914,10 @@ pub struct FontBaseline {
 /// ];
 /// let mapped_weight = apply_font_config_to_style_mapping(&mapping, weight as f64);
 /// ```
-#[cfg(any(target_os = "linux", target_os = "macos"))]
+#[cfg(all(
+    any(target_os = "linux", target_os = "macos"),
+    not(target_env = "ohos")
+))]
 pub(crate) fn map_platform_values_to_style_values(mapping: &[(f64, f64)], value: f64) -> f64 {
     if value < mapping[0].0 {
         return mapping[0].1;
diff --git a/components/script/dom/console.rs b/components/script/dom/console.rs
index 5c5f9ff9bdd..3356b0192b9 100644
--- a/components/script/dom/console.rs
+++ b/components/script/dom/console.rs
@@ -4,7 +4,7 @@
 
 use std::convert::TryFrom;
 use std::ptr::{self, NonNull};
-use std::{io, slice};
+use std::slice;
 
 use devtools_traits::{
     ConsoleMessage, ConsoleMessageArgument, ConsoleMessageBuilder, LogLevel,
@@ -115,6 +115,7 @@ fn with_stderr_lock<F>(f: F)
 where
     F: FnOnce(),
 {
+    use std::io;
     let stderr = io::stderr();
     let _handle = stderr.lock();
     f()
@@ -343,6 +344,7 @@ fn stringify_handle_values(messages: &[HandleValue]) -> DOMString {
 /// to the logger. As `Console::method` and `Console::send_string_message`
 /// already forwards all messages to the logger with appropriate level
 /// this does not need to do anything for these targets.
+#[allow(unused_variables)]
 fn console_message_to_stdout(global: &GlobalScope, message: &DOMString) {
     #[cfg(not(any(target_os = "android", target_env = "ohos")))]
     {
diff --git a/ports/servoshell/egl/app_state.rs b/ports/servoshell/egl/app_state.rs
index 9a33bb375cc..37ccb3b408a 100644
--- a/ports/servoshell/egl/app_state.rs
+++ b/ports/servoshell/egl/app_state.rs
@@ -702,6 +702,7 @@ pub(crate) struct XrDiscoveryWebXrRegistry {
 }
 
 #[cfg(feature = "webxr")]
+#[cfg_attr(target_env = "ohos", allow(dead_code))]
 impl XrDiscoveryWebXrRegistry {
     pub(crate) fn new(xr_discovery: Option<servo::webxr::Discovery>) -> Self {
         Self {
diff --git a/ports/servoshell/egl/ohos.rs b/ports/servoshell/egl/ohos.rs
index 374f3d1061a..2ca9726390b 100644
--- a/ports/servoshell/egl/ohos.rs
+++ b/ports/servoshell/egl/ohos.rs
@@ -818,6 +818,7 @@ struct HostCallbacks {
     ime_proxy: RefCell<Option<ohos_ime::ImeProxy>>,
 }
 
+#[allow(dead_code)]
 #[derive(Debug)]
 enum ImeError {
     TextEditorProxy(CreateTextEditorProxyError),
@@ -1007,7 +1008,7 @@ impl HostTrait for HostCallbacks {
         if ime_proxy.is_none() {
             *ime_proxy = match self.try_create_ime_proxy(input_type, multiline) {
                 Err(ref e) => {
-                    error!("Couold not show keyboard because of {e:?}");
+                    error!("Could not show keyboard because of {e:?}");
                     None
                 },
                 Ok(proxy) => Some(proxy),