From 70cb6e0b07fb4eeb56f10b369d38a91a38cce9e3 Mon Sep 17 00:00:00 2001
From: Bill Fraser <bill@wfraser.dev>
Date: Wed, 13 Nov 2024 15:36:27 -0800
Subject: [PATCH] clean up re-exports a bit

---
 src/default_async_client.rs |  4 ++--
 src/default_client.rs       |  4 ++--
 src/lib.rs                  | 13 ++++++-------
 tests/noop_client.rs        |  1 -
 4 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/src/default_async_client.rs b/src/default_async_client.rs
index b8bcd75..2a0a0fa 100644
--- a/src/default_async_client.rs
+++ b/src/default_async_client.rs
@@ -15,8 +15,8 @@ use std::str::FromStr;
 use std::sync::Arc;
 use bytes::Bytes;
 use futures::{FutureExt, TryFutureExt, TryStreamExt};
-use crate::async_client_trait::{AppAuthClient, HttpClient, HttpRequestResultRaw, NoauthClient, TeamAuthClient, UserAuthClient};
-use crate::client_trait_common::{HttpRequest, TeamSelect};
+use crate::async_client_trait::{AppAuthClient, HttpClient, HttpRequest, HttpRequestResultRaw,
+    NoauthClient, TeamAuthClient, TeamSelect, UserAuthClient};
 use crate::default_client_common::impl_set_path_root;
 use crate::Error;
 use crate::oauth2::{Authorization, TokenCache};
diff --git a/src/default_client.rs b/src/default_client.rs
index b8769cf..8ecfc8e 100644
--- a/src/default_client.rs
+++ b/src/default_client.rs
@@ -18,8 +18,8 @@ use std::fmt::Write;
 use std::str::FromStr;
 use std::sync::Arc;
 use futures::FutureExt;
-use crate::client_trait::{AppAuthClient, HttpClient, HttpRequestResultRaw, NoauthClient, TeamAuthClient, UserAuthClient};
-use crate::client_trait_common::{HttpRequest, TeamSelect};
+use crate::client_trait::{AppAuthClient, HttpClient, HttpRequest, HttpRequestResultRaw,
+    NoauthClient, TeamAuthClient, TeamSelect, UserAuthClient};
 use crate::default_client_common::impl_set_path_root;
 
 macro_rules! impl_update_token {
diff --git a/src/lib.rs b/src/lib.rs
index 30ee32e..e99ab1e 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -44,30 +44,29 @@ if_feature! { "default_client",
 if_feature! { "default_async_client", pub mod default_async_client; }
 
 #[cfg(any(feature = "default_client", feature = "default_async_client"))]
-pub(crate) mod default_client_common;
+mod default_client_common;
 
-pub mod client_trait_common;
+mod client_trait_common;
 
 pub mod client_trait;
 
 pub mod async_client_trait;
 
-pub(crate) mod client_helpers;
+mod client_helpers;
 
 pub mod oauth2;
 
-mod generated;
-
 // You need to run the Stone generator to create this module.
+mod generated;
 pub use generated::*;
 
 #[cfg(feature = "async_routes")]
 #[cfg(not(feature = "sync_routes_in_root"))]
-pub use generated::async_routes::*;
+pub use async_routes::*;
 
 #[cfg(feature = "sync_routes")]
 #[cfg(feature = "sync_routes_in_root")]
-pub use generated::sync_routes::*;
+pub use sync_routes::*;
 
 mod error;
 pub use error::{BoxedError, Error, NoError};
diff --git a/tests/noop_client.rs b/tests/noop_client.rs
index 46c24ee..df114a5 100644
--- a/tests/noop_client.rs
+++ b/tests/noop_client.rs
@@ -1,6 +1,5 @@
 use std::fmt::{Debug, Display, Formatter};
 use dropbox_sdk::client_trait::*;
-use dropbox_sdk::client_trait_common::HttpRequest;
 
 macro_rules! noop_client {
     ($name:ident) => {