Add Send + Sync boundaries for parameters

Helps with spawning code.

src/result.rs

@@ -77,7 +77,7 @@ pub struct QueryResult<'a> {
 
 impl<'a> QueryResult<'a> {
     pub(crate) fn new(
-        token_stream: Pin<Box<dyn Stream<Item = crate::Result<ReceivedToken>> + 'a>>,
+        token_stream: Pin<Box<dyn Stream<Item = crate::Result<ReceivedToken>> + Send + 'a>>,
     ) -> Self {
         let stream = QueryStream::new(token_stream);
 

src/tds/codec/token/token_env_change.rs

@@ -35,8 +35,8 @@ uint_enum! {
 }
 
 pub struct CollationInfo {
-    lcid_encoding: Option<&'static dyn Encoding>,
-    sortid_encoding: Option<&'static dyn Encoding>,
+    lcid_encoding: Option<&'static (dyn Encoding + Send + Sync)>,
+    sortid_encoding: Option<&'static (dyn Encoding + Send + Sync)>,
 }
 
 impl CollationInfo {

src/tds/collation.rs

@@ -26,7 +26,7 @@ impl Collation {
     }
 
     /// return an encoding for a given collation
-    pub fn encoding(&self) -> Option<&'static dyn Encoding> {
+    pub fn encoding(&self) -> Option<&'static (dyn Encoding + Send + Sync)> {
         if self.sort_id == 0 {
             lcid_to_encoding(self.lcid())
         } else {
@@ -44,7 +44,7 @@ impl Collation {
 /// 3. replace: Encoding.UNICODE with encoding::all::UTF16_LE
 //
 /// the unimplemented!() one's are not supported by rust-encoding
-pub fn lcid_to_encoding(locale: u16) -> Option<&'static dyn Encoding> {
+pub fn lcid_to_encoding(locale: u16) -> Option<&'static (dyn Encoding + Send + Sync)> {
     match locale {
         0x0401 => Some(encoding::all::WINDOWS_1256),
         0x0402 => Some(encoding::all::WINDOWS_1251),
@@ -265,7 +265,7 @@ pub fn lcid_to_encoding(locale: u16) -> Option<&'static dyn Encoding> {
 /// generate the code below from source code:
 /// 1. (regex)replace .*\((.*?),.*?,(.*?)\) with $1 => $2
 /// 2. see above/as above
-pub fn sortid_to_encoding(sort_id: u8) -> Option<&'static dyn Encoding> {
+pub fn sortid_to_encoding(sort_id: u8) -> Option<&'static (dyn Encoding + Send + Sync)> {
     match sort_id {
         // 30 | 31 | 32 | 33 | 34 | 35 => Some(encoding::all::WINDOWS_437),
         // 40 | 41 | 42 | 43 | 44 | 45 | 49 => Some(encoding::all::WINDOWS_850),

src/tds/stream/query.rs

@@ -1,6 +1,6 @@
 use crate::tds::{codec::DoneStatus, stream::ReceivedToken};
 use crate::{row::ColumnType, Column, Error, Row};
-use futures::{ready, Stream, StreamExt, TryStreamExt};
+use futures::{ready, stream::BoxStream, Stream, StreamExt, TryStreamExt};
 use std::{
     fmt::Debug,
     pin::Pin,
@@ -18,7 +18,7 @@ pub(crate) enum QueryStreamState {
 
 /// A stream of rows, needed for queries returning data.
 pub struct QueryStream<'a> {
-    token_stream: Pin<Box<dyn Stream<Item = crate::Result<ReceivedToken>> + 'a>>,
+    token_stream: BoxStream<'a, crate::Result<ReceivedToken>>,
     current_columns: Option<Arc<Vec<Column>>>,
     previous_columns: Option<Arc<Vec<Column>>>,
     pub(crate) state: QueryStreamState,
@@ -29,7 +29,7 @@ impl<'a> Debug for QueryStream<'a> {
         f.debug_struct("Querystream")
             .field(
                 "token_stream",
-                &"Pin<Box<dyn Stream<Item = crate::Result<ReceivedToken>> + 'a>>",
+                &"BoxStream<'a, crate::Result<ReceivedToken>>",
             )
             .field("current_columns", &self.current_columns)
             .field("previous_columns", &self.previous_columns)
@@ -39,9 +39,7 @@ impl<'a> Debug for QueryStream<'a> {
 }
 
 impl<'a> QueryStream<'a> {
-    pub(crate) fn new(
-        token_stream: Pin<Box<dyn Stream<Item = crate::Result<ReceivedToken>> + 'a>>,
-    ) -> Self {
+    pub(crate) fn new(token_stream: BoxStream<'a, crate::Result<ReceivedToken>>) -> Self {
         Self {
             token_stream,
             current_columns: None,

src/tds/stream/token.rs

@@ -8,10 +8,9 @@ use crate::{
     },
     Error, SqlReadBytes, TokenType,
 };
-use futures::{Stream, TryStreamExt};
+use futures::{stream::BoxStream, TryStreamExt};
 use std::{
     convert::TryFrom,
-    pin::Pin,
     sync::{atomic::Ordering, Arc},
 };
 use tokio::io::AsyncReadExt;
@@ -166,8 +165,8 @@ impl<'a> TokenStream<'a> {
         Ok(ReceivedToken::SSPI(sspi))
     }
 
-    pub fn try_unfold(self) -> Pin<Box<dyn Stream<Item = crate::Result<ReceivedToken>> + 'a>> {
-        let s = futures::stream::try_unfold(self, |mut this| async move {
+    pub fn try_unfold(self) -> BoxStream<'a, crate::Result<ReceivedToken>> {
+        let stream = futures::stream::try_unfold(self, |mut this| async move {
             if this.conn.is_eof() {
                 return Ok(None);
             }
@@ -199,6 +198,6 @@ impl<'a> TokenStream<'a> {
             Ok(Some((token, this)))
         });
 
-        Box::pin(s)
+        Box::pin(stream)
     }
 }

src/to_sql.rs

@@ -6,7 +6,7 @@ use std::borrow::Cow;
 use uuid::Uuid;
 
 /// A conversion trait to a TDS type.
-pub trait ToSql {
+pub trait ToSql: Send + Sync {
     /// Convert to a value understood by the SQL Server.
     fn to_sql(&self) -> ColumnData<'_>;
 }