From 7a473d0eda76884974db6e28a07b69653ed9d2e3 Mon Sep 17 00:00:00 2001
From: "Dustin J. Mitchell" <dustin@v.igoro.us>
Date: Thu, 10 Feb 2022 01:01:02 +0000
Subject: [PATCH] simplify imports

---
 lib/src/lib.rs        | 12 ++++++++++++
 lib/src/replica.rs    |  5 +----
 lib/src/stringlist.rs |  2 +-
 lib/src/task.rs       |  5 +----
 lib/src/tasklist.rs   |  2 +-
 lib/src/uuid.rs       |  2 +-
 lib/src/uuidlist.rs   |  2 +-
 7 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/lib/src/lib.rs b/lib/src/lib.rs
index bb4ebe905..b1456e73b 100644
--- a/lib/src/lib.rs
+++ b/lib/src/lib.rs
@@ -15,3 +15,15 @@ pub mod task;
 pub mod tasklist;
 pub mod uuid;
 pub mod uuidlist;
+
+pub(crate) mod types {
+    pub(crate) use crate::replica::TCReplica;
+    pub(crate) use crate::result::TCResult;
+    pub(crate) use crate::status::TCStatus;
+    pub(crate) use crate::string::TCString;
+    pub(crate) use crate::stringlist::TCStringList;
+    pub(crate) use crate::task::TCTask;
+    pub(crate) use crate::tasklist::TCTaskList;
+    pub(crate) use crate::uuid::TCUuid;
+    pub(crate) use crate::uuidlist::TCUuidList;
+}
diff --git a/lib/src/replica.rs b/lib/src/replica.rs
index 5119ea520..619dc2c46 100644
--- a/lib/src/replica.rs
+++ b/lib/src/replica.rs
@@ -1,9 +1,6 @@
 use crate::traits::*;
+use crate::types::*;
 use crate::util::err_to_tcstring;
-use crate::{
-    result::TCResult, status::TCStatus, string::TCString, task::TCTask, tasklist::TCTaskList,
-    uuid::TCUuid, uuidlist::TCUuidList,
-};
 use std::ptr::NonNull;
 use taskchampion::{Replica, StorageConfig};
 
diff --git a/lib/src/stringlist.rs b/lib/src/stringlist.rs
index 3ee3be48e..b0d3ea8d4 100644
--- a/lib/src/stringlist.rs
+++ b/lib/src/stringlist.rs
@@ -1,5 +1,5 @@
-use crate::string::TCString;
 use crate::traits::*;
+use crate::types::*;
 use std::ptr::NonNull;
 
 /// TCStringList represents a list of strings.
diff --git a/lib/src/task.rs b/lib/src/task.rs
index 50acf04c8..8f4055a8a 100644
--- a/lib/src/task.rs
+++ b/lib/src/task.rs
@@ -1,9 +1,6 @@
 use crate::traits::*;
+use crate::types::*;
 use crate::util::err_to_tcstring;
-use crate::{
-    replica::TCReplica, result::TCResult, status::TCStatus, string::TCString,
-    stringlist::TCStringList, uuid::TCUuid,
-};
 use chrono::{DateTime, TimeZone, Utc};
 use std::convert::TryFrom;
 use std::ops::Deref;
diff --git a/lib/src/tasklist.rs b/lib/src/tasklist.rs
index c383139fe..a3cdf536a 100644
--- a/lib/src/tasklist.rs
+++ b/lib/src/tasklist.rs
@@ -1,5 +1,5 @@
-use crate::task::TCTask;
 use crate::traits::*;
+use crate::types::*;
 use std::ptr::NonNull;
 
 /// TCTaskList represents a list of tasks.
diff --git a/lib/src/uuid.rs b/lib/src/uuid.rs
index 415e9501a..63be3823c 100644
--- a/lib/src/uuid.rs
+++ b/lib/src/uuid.rs
@@ -1,5 +1,5 @@
 use crate::traits::*;
-use crate::{result::TCResult, string::TCString};
+use crate::types::*;
 use libc;
 use taskchampion::Uuid;
 
diff --git a/lib/src/uuidlist.rs b/lib/src/uuidlist.rs
index 862ece88e..4b6684299 100644
--- a/lib/src/uuidlist.rs
+++ b/lib/src/uuidlist.rs
@@ -1,5 +1,5 @@
 use crate::traits::*;
-use crate::uuid::TCUuid;
+use crate::types::*;
 
 /// TCUuidList represents a list of uuids.
 ///