Skip to content

Commit

Permalink
backend/sys: Fix import for cargo test without client_system
Browse files Browse the repository at this point in the history
Import `ObjectData` and `ObjectId` from submodule instead of
`crate::client` so they'll be the `sys` variants regardless of compile
options.

Fixes #782.
  • Loading branch information
ids1024 committed Feb 7, 2025
1 parent f55d302 commit 491f50c
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion wayland-backend/src/sys/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ use std::sync::Arc;
use wayland_sys::client::wl_proxy;

Check warning on line 5 in wayland-backend/src/sys/mod.rs

View workflow job for this annotation

GitHub Actions / coverage-tests (server_system)

unused import: `wayland_sys::client::wl_proxy`
use wayland_sys::common::{wl_argument, wl_array};

use crate::client::{ObjectData, ObjectId};
use crate::protocol::{ArgumentType, Interface};

Check warning on line 8 in wayland-backend/src/sys/mod.rs

View workflow job for this annotation

GitHub Actions / coverage-tests (server_system)

unused import: `Interface`

#[cfg(any(test, feature = "client_system"))]
Expand Down Expand Up @@ -37,6 +36,8 @@ unsafe fn free_arrays(signature: &[ArgumentType], arglist: &[wl_argument]) {
#[cfg(any(test, feature = "client_system"))]
#[path = "../client_api.rs"]
pub mod client;
#[cfg(any(test, feature = "client_system"))]
use client::{ObjectData, ObjectId};

// API complements for FFI

Expand Down

0 comments on commit 491f50c

Please sign in to comment.