common: don't expose types directly

src/commands/queue/add.rs

@@ -2,7 +2,7 @@ use serde::{Deserialize, Serialize};
 
 use crate::{
     commands::{Command, Request, RequestParserError, RequestParserResult, ResponseParserError},
-    common::{SongPosition, Uri},
+    common::types::{SongPosition, Uri},
     request_tokenizer::RequestTokenizer,
     response_tokenizer::ResponseAttributes,
 };

src/commands/queue/addid.rs

@@ -2,7 +2,7 @@ use serde::{Deserialize, Serialize};
 
 use crate::{
     commands::{Command, Request, RequestParserError, RequestParserResult, ResponseParserError},
-    common::{SongId, SongPosition, Uri},
+    common::types::{SongId, SongPosition, Uri},
     request_tokenizer::RequestTokenizer,
     response_tokenizer::{ResponseAttributes, get_next_and_parse_property},
 };

src/commands/queue/addtagid.rs

@@ -5,7 +5,7 @@ use crate::{
     commands::{
         Command, RequestParserError, RequestParserResult, ResponseAttributes, ResponseParserError,
     },
-    common::{SongId, TagName, TagValue},
+    common::types::{SongId, TagName, TagValue},
     request_tokenizer::RequestTokenizer,
 };
 

src/commands/queue/cleartagid.rs

@@ -3,7 +3,7 @@ use serde::{Deserialize, Serialize};
 use crate::{
     Request,
     commands::{Command, RequestParserError, RequestParserResult, ResponseParserError},
-    common::{SongId, TagName},
+    common::types::{SongId, TagName},
     request_tokenizer::RequestTokenizer,
     response_tokenizer::ResponseAttributes,
 };

src/commands/queue/delete.rs

@@ -3,7 +3,7 @@ use std::str::FromStr;
 use crate::{
     Request,
     commands::{Command, RequestParserError, RequestParserResult, ResponseParserError},
-    common::OneOrRange,
+    common::types::OneOrRange,
     request_tokenizer::RequestTokenizer,
     response_tokenizer::ResponseAttributes,
 };

src/commands/queue/deleteid.rs

@@ -1,7 +1,7 @@
 use crate::{
     Request,
     commands::{Command, RequestParserError, RequestParserResult, ResponseParserError},
-    common::SongId,
+    common::types::SongId,
     request_tokenizer::RequestTokenizer,
     response_tokenizer::ResponseAttributes,
 };

src/commands/queue/move_.rs

@@ -5,7 +5,7 @@ use crate::{
     commands::{
         Command, RequestParserError, RequestParserResult, ResponseAttributes, ResponseParserError,
     },
-    common::{AbsouluteRelativeSongPosition, OneOrRange},
+    common::types::{AbsouluteRelativeSongPosition, OneOrRange},
     request_tokenizer::RequestTokenizer,
 };
 

src/commands/queue/moveid.rs

@@ -5,7 +5,7 @@ use crate::{
     commands::{
         Command, RequestParserError, RequestParserResult, ResponseAttributes, ResponseParserError,
     },
-    common::{AbsouluteRelativeSongPosition, SongId},
+    common::types::{AbsouluteRelativeSongPosition, SongId},
     request_tokenizer::RequestTokenizer,
 };
 

src/commands/queue/playlistfind.rs

@@ -3,7 +3,7 @@ use serde::{Deserialize, Serialize};
 use crate::{
     Request,
     commands::{Command, RequestParserError, RequestParserResult, ResponseParserError},
-    common::{Sort, WindowRange},
+    common::types::{Sort, WindowRange},
     filter::Filter,
     request_tokenizer::RequestTokenizer,
     response_tokenizer::ResponseAttributes,

src/commands/queue/playlistid.rs

@@ -1,7 +1,7 @@
 use crate::{
     Request,
     commands::{Command, RequestParserError, RequestParserResult, ResponseParserError},
-    common::SongId,
+    common::types::SongId,
     request_tokenizer::RequestTokenizer,
     response_tokenizer::ResponseAttributes,
 };

src/commands/queue/playlistinfo.rs

@@ -1,7 +1,7 @@
 use crate::{
     Request,
     commands::{Command, RequestParserError, RequestParserResult, ResponseParserError},
-    common::OneOrRange,
+    common::types::OneOrRange,
     request_tokenizer::RequestTokenizer,
     response_tokenizer::ResponseAttributes,
 };

src/commands/queue/playlistsearch.rs

@@ -3,7 +3,7 @@ use serde::{Deserialize, Serialize};
 use crate::{
     Request,
     commands::{Command, RequestParserError, RequestParserResult, ResponseParserError},
-    common::{Sort, WindowRange},
+    common::types::{Sort, WindowRange},
     filter::Filter,
     request_tokenizer::RequestTokenizer,
     response_tokenizer::ResponseAttributes,

src/commands/queue/plchanges.rs

@@ -3,7 +3,7 @@ use serde::{Deserialize, Serialize};
 use crate::{
     Request,
     commands::{Command, RequestParserError, RequestParserResult, ResponseParserError},
-    common::{PlaylistVersion, WindowRange},
+    common::types::{PlaylistVersion, WindowRange},
     request_tokenizer::RequestTokenizer,
     response_tokenizer::ResponseAttributes,
 };

src/commands/queue/plchangesposid.rs

@@ -3,7 +3,7 @@ use serde::{Deserialize, Serialize};
 use crate::{
     Request,
     commands::{Command, RequestParserError, RequestParserResult, ResponseParserError},
-    common::{PlaylistVersion, WindowRange},
+    common::types::{PlaylistVersion, WindowRange},
     request_tokenizer::RequestTokenizer,
     response_tokenizer::ResponseAttributes,
 };

src/commands/queue/prio.rs

@@ -3,7 +3,7 @@ use serde::{Deserialize, Serialize};
 use crate::{
     Request,
     commands::{Command, RequestParserError, RequestParserResult, ResponseParserError},
-    common::{Priority, WindowRange},
+    common::types::{Priority, WindowRange},
     request_tokenizer::RequestTokenizer,
     response_tokenizer::ResponseAttributes,
 };

src/commands/queue/prioid.rs

@@ -3,7 +3,7 @@ use serde::{Deserialize, Serialize};
 use crate::{
     Request,
     commands::{Command, RequestParserError, RequestParserResult, ResponseParserError},
-    common::{Priority, SongId},
+    common::types::{Priority, SongId},
     request_tokenizer::RequestTokenizer,
     response_tokenizer::ResponseAttributes,
 };

src/commands/queue/rangeid.rs

@@ -3,7 +3,7 @@ use serde::{Deserialize, Serialize};
 use crate::{
     Request,
     commands::{Command, RequestParserError, RequestParserResult, ResponseParserError},
-    common::{SongId, TimeInterval},
+    common::types::{SongId, TimeInterval},
     request_tokenizer::RequestTokenizer,
     response_tokenizer::ResponseAttributes,
 };

src/commands/queue/shuffle.rs

@@ -1,7 +1,7 @@
 use crate::{
     Request,
     commands::{Command, RequestParserError, RequestParserResult, ResponseParserError},
-    common::OneOrRange,
+    common::types::OneOrRange,
     request_tokenizer::RequestTokenizer,
     response_tokenizer::ResponseAttributes,
 };

src/commands/queue/swap.rs

@@ -3,7 +3,7 @@ use serde::{Deserialize, Serialize};
 use crate::{
     Request,
     commands::{Command, RequestParserError, RequestParserResult, ResponseParserError},
-    common::SongPosition,
+    common::types::SongPosition,
     request_tokenizer::RequestTokenizer,
     response_tokenizer::ResponseAttributes,
 };

src/commands/queue/swapid.rs

@@ -3,7 +3,7 @@ use serde::{Deserialize, Serialize};
 use crate::{
     Request,
     commands::{Command, RequestParserError, RequestParserResult, ResponseParserError},
-    common::SongId,
+    common::types::SongId,
     request_tokenizer::RequestTokenizer,
     response_tokenizer::ResponseAttributes,
 };