From: Paolo Bonzini Date: Tue, 4 Nov 2025 15:44:52 +0000 (+0100) Subject: chardev: add prelude X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cd6e5449dadd57bd87dd8e56d51e18431065c623;p=thirdparty%2Fqemu.git chardev: add prelude Signed-off-by: Paolo Bonzini --- diff --git a/rust/chardev/meson.build b/rust/chardev/meson.build index 6b681c609a..54bb296252 100644 --- a/rust/chardev/meson.build +++ b/rust/chardev/meson.build @@ -30,6 +30,7 @@ _chardev_rs = static_library( 'src/lib.rs', 'src/bindings.rs', 'src/chardev.rs', + 'src/prelude.rs', ], {'.': _chardev_bindings_inc_rs} ), diff --git a/rust/chardev/src/lib.rs b/rust/chardev/src/lib.rs index 2e549f99d9..93a2872593 100644 --- a/rust/chardev/src/lib.rs +++ b/rust/chardev/src/lib.rs @@ -4,3 +4,8 @@ pub mod bindings; mod chardev; pub use chardev::*; + +// preserve one-item-per-"use" syntax, it is clearer +// for prelude-like modules +#[rustfmt::skip] +pub mod prelude; diff --git a/rust/chardev/src/prelude.rs b/rust/chardev/src/prelude.rs index 9f0b561bfa..f949d92539 100644 --- a/rust/chardev/src/prelude.rs +++ b/rust/chardev/src/prelude.rs @@ -1,3 +1,5 @@ //! Essential types and traits intended for blanket imports. -pub use crate::chardev::{Chardev, CharFrontend, Event}; \ No newline at end of file +pub use crate::chardev::Chardev; +pub use crate::chardev::CharFrontend; +pub use crate::chardev::Event; diff --git a/rust/hw/char/pl011/src/device.rs b/rust/hw/char/pl011/src/device.rs index 2e4ccc9b23..ff929e6099 100644 --- a/rust/hw/char/pl011/src/device.rs +++ b/rust/hw/char/pl011/src/device.rs @@ -5,7 +5,7 @@ use std::{ffi::CStr, mem::size_of}; use bql::BqlRefCell; -use chardev::{CharFrontend, Chardev, Event}; +use chardev::prelude::*; use common::prelude::*; use hwcore::{prelude::*, ClockEvent, IRQState}; use migration::{self, prelude::*};