From 503f54b28357161fabfe1b4038120ade2ef353ea Mon Sep 17 00:00:00 2001 From: Kaiyi Li Date: Tue, 22 Aug 2023 15:10:51 -0700 Subject: [PATCH] gpu_display: correct how Metrics is imported Change-Id: I3c6e8c7b36940bf04cba1f4a0ef1e2fd469d8ee8 Reviewed-on: https://chromium-review.googlesource.com/c/crosvm/crosvm/+/4804686 Reviewed-by: Vikram Auradkar --- gpu_display/src/gpu_display_win/mod.rs | 2 +- gpu_display/src/gpu_display_win/surface.rs | 2 +- gpu_display/src/sys/windows.rs | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/gpu_display/src/gpu_display_win/mod.rs b/gpu_display/src/gpu_display_win/mod.rs index 6630a987e6..7021d5d578 100644 --- a/gpu_display/src/gpu_display_win/mod.rs +++ b/gpu_display/src/gpu_display_win/mod.rs @@ -28,7 +28,7 @@ use base::SendTube; use euclid::size2; use euclid::Size2D; use math_util::Size2DCheckedCast; -use metrics::Metrics; +use metrics::sys::windows::Metrics; pub use surface::NoopSurface as Surface; use vm_control::gpu::DisplayMode; use vm_control::gpu::DisplayParameters; diff --git a/gpu_display/src/gpu_display_win/surface.rs b/gpu_display/src/gpu_display_win/surface.rs index c59b906218..743c0be4c4 100644 --- a/gpu_display/src/gpu_display_win/surface.rs +++ b/gpu_display/src/gpu_display_win/surface.rs @@ -6,7 +6,7 @@ use std::sync::Weak; use anyhow::Result; use euclid::Size2D; -use metrics::Metrics; +use metrics::sys::windows::Metrics; use super::window::Window; use super::window_message_processor::HandleWindowMessage; diff --git a/gpu_display/src/sys/windows.rs b/gpu_display/src/sys/windows.rs index e8d619dc28..5762602dec 100644 --- a/gpu_display/src/sys/windows.rs +++ b/gpu_display/src/sys/windows.rs @@ -9,7 +9,7 @@ use base::RawDescriptor; use base::ReadNotifier; use base::SendTube; use base::WaitContext; -use metrics::Metrics; +use metrics::sys::windows::Metrics; use crate::gpu_display_win::DisplayProperties; use crate::gpu_display_win::DisplayWin;