diff --git a/services/cram-console/src/main.rs b/services/cram-console/src/main.rs index 92158b142..268f88050 100644 --- a/services/cram-console/src/main.rs +++ b/services/cram-console/src/main.rs @@ -20,10 +20,10 @@ use std::thread; use cmds::*; use cram_hal_service::keyboard; use graphics_server::Gid; -use ux_api::minigfx::GlyphStyle; -use ux_api::minigfx::*; use locales::t; use num_traits::*; +use ux_api::minigfx::GlyphStyle; +use ux_api::minigfx::*; use xous::{CID, Message, msg_scalar_unpack, send_message}; const SERVER_NAME_STATUS_GID: &str = "_Status bar GID receiver_"; diff --git a/services/gam/src/contexts.rs b/services/gam/src/contexts.rs index d39175606..d650f7099 100644 --- a/services/gam/src/contexts.rs +++ b/services/gam/src/contexts.rs @@ -6,8 +6,8 @@ use enum_dispatch::enum_dispatch; use gam::MAIN_MENU_NAME; use ime_plugin_api::{ImeFrontEndApi, ImefDescriptor}; use log::info; -use ux_api::service::api::*; use ux_api::minigfx::*; +use ux_api::service::api::*; use xous_ipc::Buffer; use crate::api::Opcode; diff --git a/services/gam/src/main.rs b/services/gam/src/main.rs index 7e3b8c2ef..65422008d 100644 --- a/services/gam/src/main.rs +++ b/services/gam/src/main.rs @@ -21,8 +21,8 @@ use cram_hal_service::trng; use gam::{MAIN_MENU_NAME, ROOTKEY_MODAL_NAME}; use log::info; use num_traits::*; -use ux_api::service::api::*; use ux_api::minigfx::*; +use ux_api::service::api::*; use xous::{msg_blocking_scalar_unpack, msg_scalar_unpack}; use xous_ipc::Buffer; diff --git a/services/gam/src/modal.rs b/services/gam/src/modal.rs index e69920897..eed33aa8a 100644 --- a/services/gam/src/modal.rs +++ b/services/gam/src/modal.rs @@ -25,8 +25,8 @@ pub use bip39entry::*; pub use blitstr2::GlyphStyle; use enum_dispatch::enum_dispatch; use num_traits::*; -use ux_api::service::api::*; use ux_api::minigfx::*; +use ux_api::service::api::*; use xous_ipc::Buffer; use crate::Gam; diff --git a/services/graphics-server/src/testing.rs b/services/graphics-server/src/testing.rs index 5f32265c0..947a2da6d 100644 --- a/services/graphics-server/src/testing.rs +++ b/services/graphics-server/src/testing.rs @@ -1,8 +1,8 @@ use core::fmt::Write; +use num_traits::*; use ux_api::minigfx::GlyphStyle; use ux_api::minigfx::*; -use num_traits::*; #[derive(Debug, num_derive::FromPrimitive, num_derive::ToPrimitive)] enum TestType {