From 02c24a50d2881ce20ff135b1e9d64109deaddd2b Mon Sep 17 00:00:00 2001
From: Dorota Czaplejewicz <dorota.czaplejewicz@puri.sm>
Date: Tue, 14 Jan 2020 11:38:44 +0000
Subject: [PATCH] submission: Remove wildcard reexport

---
 src/submission.rs | 9 ++++-----
 src/vkeyboard.rs  | 4 +---
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/src/submission.rs b/src/submission.rs
index fd82ba83..db7e6cc4 100644
--- a/src/submission.rs
+++ b/src/submission.rs
@@ -18,11 +18,7 @@
  * */
 
 use ::imservice::IMService;
-//use ::vkeyboard::VirtualKeyboard;
-
-/// Temporary reexport to keep stuff based directly on virtual-keyboard working
-/// until a unified handler appears and prompts a rework.
-pub use vkeyboard::*;
+use ::vkeyboard::VirtualKeyboard;
 
 /// Gathers stuff defined in C or called by C
 pub mod c {
@@ -93,6 +89,9 @@ pub mod c {
     }
 }
 
+#[derive(Clone, Copy)]
+pub struct Timestamp(pub u32);
+
 pub struct Submission {
     // used by C callbacks internally, TODO: make use with virtual keyboard
     #[allow(dead_code)]
diff --git a/src/vkeyboard.rs b/src/vkeyboard.rs
index 791814e4..aac5d18f 100644
--- a/src/vkeyboard.rs
+++ b/src/vkeyboard.rs
@@ -2,6 +2,7 @@
 
 use ::keyboard::{ KeyCode, PressType };
 use ::layout::c::LevelKeyboard;
+use ::submission::Timestamp;
 
 /// Gathers stuff defined in C or called by C
 pub mod c {
@@ -28,9 +29,6 @@ pub mod c {
     }
 }
 
-#[derive(Clone, Copy)]
-pub struct Timestamp(pub u32);
-
 /// Layout-independent backend. TODO: Have one instance per program or seat
 pub struct VirtualKeyboard(pub c::ZwpVirtualKeyboardV1);