Browse Source

system: add prelude

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
pull/316/head
Paolo Bonzini 9 months ago
parent
commit
c0eb26603d
  1. 2
      rust/hw/char/pl011/src/device.rs
  2. 5
      rust/hw/timer/hpet/src/device.rs
  3. 1
      rust/system/meson.build
  4. 5
      rust/system/src/lib.rs
  5. 8
      rust/system/src/prelude.rs

2
rust/hw/char/pl011/src/device.rs

@ -10,7 +10,7 @@ use common::prelude::*;
use hwcore::{prelude::*, ClockEvent, IRQState};
use migration::{self, prelude::*};
use qom::{prelude::*, ObjectImpl, Owned, ParentField, ParentInit};
use system::{hwaddr, MemoryRegion, MemoryRegionOps, MemoryRegionOpsBuilder};
use system::prelude::*;
use util::prelude::*;
use crate::registers::{self, Interrupt, RegisterOffset};

5
rust/hw/timer/hpet/src/device.rs

@ -16,8 +16,9 @@ use hwcore::prelude::*;
use migration::{self, prelude::*};
use qom::{prelude::*, ObjectImpl, ParentField, ParentInit};
use system::{
bindings::{address_space_memory, address_space_stl_le, hwaddr},
MemoryRegion, MemoryRegionOps, MemoryRegionOpsBuilder, MEMTXATTRS_UNSPECIFIED,
bindings::{address_space_memory, address_space_stl_le},
MEMTXATTRS_UNSPECIFIED,
prelude::*,
};
use util::prelude::*;

1
rust/system/meson.build

@ -30,6 +30,7 @@ _system_rs = static_library(
'src/lib.rs',
'src/bindings.rs',
'src/memory.rs',
'src/prelude.rs',
],
{'.': _system_bindings_inc_rs}
),

5
rust/system/src/lib.rs

@ -4,3 +4,8 @@ pub mod bindings;
mod memory;
pub use memory::*;
// preserve one-item-per-"use" syntax, it is clearer
// for prelude-like modules
#[rustfmt::skip]
pub mod prelude;

8
rust/system/src/prelude.rs

@ -0,0 +1,8 @@
//! Essential types and traits intended for blanket imports.
// Core memory types
pub use crate::memory::hwaddr;
pub use crate::memory::MemoryRegion;
pub use crate::memory::MemoryRegionOps;
pub use crate::memory::MemoryRegionOpsBuilder;
pub use crate::memory::MemTxAttrs;
Loading…
Cancel
Save