refactor: flat is better than nested

kxxt · Jun 27, 2023 · 700dbbf · 700dbbf
1 parent 63a8b51
commit 700dbbf
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 10 deletions.
diff --git a/examples/01-synthesize-txt-files.rs b/examples/01-synthesize-txt-files.rs
@@ -7,8 +7,8 @@ use tokio::{
 };
 
 use aspeak::{
-    synthesizer::{RestSynthesizer, SynthesizerConfig},
-    AudioFormat, AuthOptionsBuilder, TextOptions, TextOptionsBuilder,
+    AudioFormat, AuthOptionsBuilder, RestSynthesizer, SynthesizerConfig, TextOptions,
+    TextOptionsBuilder,
 };
 
 #[tokio::main(flavor = "current_thread")]

diff --git a/examples/02-rssl.rs b/examples/02-rssl.rs
@@ -1,8 +1,7 @@
 use std::{env, error::Error};
 
 use aspeak::{
-    synthesizer::SynthesizerConfig, AudioFormat, AuthOptionsBuilder, RichSsmlOptionsBuilder,
-    TextOptionsBuilder,
+    AudioFormat, AuthOptionsBuilder, RichSsmlOptionsBuilder, SynthesizerConfig, TextOptionsBuilder,
 };
 use rodio::{Decoder, OutputStream, Sink};
 use rustyline::error::ReadlineError;

diff --git a/examples/03-rest-synthesizer-simple.rs b/examples/03-rest-synthesizer-simple.rs
@@ -1,5 +1,5 @@
 use aspeak::{
-    get_rest_endpoint_by_region, synthesizer::SynthesizerConfig, AudioFormat, AuthOptionsBuilder,
+    get_rest_endpoint_by_region, AudioFormat, AuthOptionsBuilder, SynthesizerConfig,
     TextOptionsBuilder,
 };
 

diff --git a/examples/04-websocket-synthesizer-simple.rs b/examples/04-websocket-synthesizer-simple.rs
@@ -1,5 +1,5 @@
 use aspeak::{
-    get_websocket_endpoint_by_region, synthesizer::SynthesizerConfig, AudioFormat, AuthOptionsBuilder,
+    get_websocket_endpoint_by_region, AudioFormat, AuthOptionsBuilder, SynthesizerConfig,
     TextOptionsBuilder,
 };
 

diff --git a/src/lib.rs b/src/lib.rs
@@ -108,9 +108,11 @@ mod net;
 mod parse;
 mod ssml;
 pub mod synthesizer;
+pub use synthesizer::*;
 mod types;
 mod utils;
 pub mod voice;
+pub use voice::*;
 
 /// Get the official websocket endpoint by its region (e.g. `eastus`)
 pub fn get_websocket_endpoint_by_region(region: &str) -> String {
@@ -127,7 +129,6 @@ pub use auth::*;
 use phf::phf_map;
 pub use ssml::*;
 pub use types::*;
-pub use voice::Voice;
 
 #[cfg(feature = "python")]
 pub mod python;

diff --git a/src/main.rs b/src/main.rs
@@ -10,9 +10,8 @@ use std::{
 use cli::{commands::Command, Cli};
 
 use aspeak::{
-    synthesizer::{SynthesizerConfig, UnifiedSynthesizer},
-    voice::{VoiceListAPIAuth, VoiceListAPIEndpoint, VoiceListAPIError, VoiceListAPIErrorKind},
-    AudioFormat, Voice, QUALITY_MAP,
+    AudioFormat, SynthesizerConfig, UnifiedSynthesizer, Voice, VoiceListAPIAuth,
+    VoiceListAPIEndpoint, VoiceListAPIError, VoiceListAPIErrorKind, QUALITY_MAP,
 };
 use clap::Parser;
 use color_eyre::{