diff --git a/src/imservice.rs b/src/imservice.rs index b59dad66..d55f2ba7 100644 --- a/src/imservice.rs +++ b/src/imservice.rs @@ -1,11 +1,10 @@ -#[macro_use] -mod bitflags; - use std::boxed::Box; use std::ffi::CString; use std::num::Wrapping; use std::string::String; +use super::bitflags; + /// Gathers stuff defined in C or called by C pub mod c { use super::*; @@ -221,7 +220,7 @@ pub enum ContentPurpose { impl ContentPurpose { fn from_num(num: u32) -> Option { - use ContentPurpose::*; + use self::ContentPurpose::*; match num { 0 => Some(Normal), 1 => Some(Alpha), @@ -241,7 +240,7 @@ impl ContentPurpose { } } fn as_num(self: &ContentPurpose) -> u32 { - use ContentPurpose::*; + use self::ContentPurpose::*; match self { Normal => 0, Alpha => 1, diff --git a/src/lib.rs b/src/lib.rs new file mode 100644 index 00000000..499a1a03 --- /dev/null +++ b/src/lib.rs @@ -0,0 +1,3 @@ +#[macro_use] +mod bitflags; +mod imservice; diff --git a/src/meson.build b/src/meson.build index 4e5e07ab..2d7fa5c3 100644 --- a/src/meson.build +++ b/src/meson.build @@ -69,7 +69,7 @@ deps = [ # Replacement for eekboard-server rslib = static_library( 'rslib', - sources: ['imservice.rs'], + sources: ['lib.rs'], rust_crate_type: 'staticlib' )