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

OHOS: Clean up some compile warnings (#38240)

Browse source 
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>
This commit is contained in:
Narfinger 2025-07-24 12:29:49 +09:00 • committed by GitHub
parent bb5cb57099
commit 6ace7ad577
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 10 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
components/fonts/font.rs
View file

@ -914,7 +914,10 @@ pub struct FontBaseline {
/// ]; /// ];
/// let mapped_weight = apply_font_config_to_style_mapping(&mapping, weight as f64); /// 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 { pub(crate) fn map_platform_values_to_style_values(mapping: &[(f64, f64)], value: f64) -> f64 {
if value < mapping[0].0 { if value < mapping[0].0 {
return mapping[0].1; return mapping[0].1;

4
components/script/dom/console.rs
View file

@ -4,7 +4,7 @@
use std::convert::TryFrom; use std::convert::TryFrom;
use std::ptr::{self, NonNull}; use std::ptr::{self, NonNull};
use std::{io, slice}; use std::slice;
use devtools_traits::{ use devtools_traits::{
ConsoleMessage, ConsoleMessageArgument, ConsoleMessageBuilder, LogLevel, ConsoleMessage, ConsoleMessageArgument, ConsoleMessageBuilder, LogLevel,
@ -115,6 +115,7 @@ fn with_stderr_lock<F>(f: F)
where where
F: FnOnce(), F: FnOnce(),
{ {
use std::io;
let stderr = io::stderr(); let stderr = io::stderr();
let _handle = stderr.lock(); let _handle = stderr.lock();
f() f()
@ -343,6 +344,7 @@ fn stringify_handle_values(messages: &[HandleValue]) -> DOMString {
/// to the logger. As `Console::method` and `Console::send_string_message` /// to the logger. As `Console::method` and `Console::send_string_message`
/// already forwards all messages to the logger with appropriate level /// already forwards all messages to the logger with appropriate level
/// this does not need to do anything for these targets. /// this does not need to do anything for these targets.
#[allow(unused_variables)]
fn console_message_to_stdout(global: &GlobalScope, message: &DOMString) { fn console_message_to_stdout(global: &GlobalScope, message: &DOMString) {
#[cfg(not(any(target_os = "android", target_env = "ohos")))] #[cfg(not(any(target_os = "android", target_env = "ohos")))]
{ {

1
ports/servoshell/egl/app_state.rs
View file

@ -702,6 +702,7 @@ pub(crate) struct XrDiscoveryWebXrRegistry {
} }
#[cfg(feature = "webxr")] #[cfg(feature = "webxr")]
#[cfg_attr(target_env = "ohos", allow(dead_code))]
impl XrDiscoveryWebXrRegistry { impl XrDiscoveryWebXrRegistry {
pub(crate) fn new(xr_discovery: Option<servo::webxr::Discovery>) -> Self { pub(crate) fn new(xr_discovery: Option<servo::webxr::Discovery>) -> Self {
Self { Self {

3
ports/servoshell/egl/ohos.rs
View file

@ -818,6 +818,7 @@ struct HostCallbacks {
ime_proxy: RefCell<Option<ohos_ime::ImeProxy>>, ime_proxy: RefCell<Option<ohos_ime::ImeProxy>>,
} }
#[allow(dead_code)]
#[derive(Debug)] #[derive(Debug)]
enum ImeError { enum ImeError {
TextEditorProxy(CreateTextEditorProxyError), TextEditorProxy(CreateTextEditorProxyError),
@ -1007,7 +1008,7 @@ impl HostTrait for HostCallbacks {
if ime_proxy.is_none() { if ime_proxy.is_none() {
*ime_proxy = match self.try_create_ime_proxy(input_type, multiline) { *ime_proxy = match self.try_create_ime_proxy(input_type, multiline) {
Err(ref e) => { Err(ref e) => {
error!("Couold not show keyboard because of {e:?}"); error!("Could not show keyboard because of {e:?}");
None None
}, },
Ok(proxy) => Some(proxy), Ok(proxy) => Some(proxy),