Merge pull request #62 from cipherstash/ross/send_bounds

Add +Send bounds to enable use with tokio

Author: coderdan

Cargo.lock

@@ -24,7 +24,7 @@ repository = "https://github.com/cipherstash/cipherstash-dynamodb"
 # and it will keep the alphabetic ordering for you.
 
 [dependencies]
-cipherstash-client = { version = "0.10", registry = "cipherstash" }
+cipherstash-client = { version = "0.12", registry = "cipherstash" }
 cipherstash-dynamodb-derive = { version = "0.7", path = "cipherstash-dynamodb-derive", registry = "cipherstash" }
 
 aws-sdk-dynamodb = "1.3.0"

Cargo.toml

@@ -57,7 +57,7 @@ pub(crate) fn derive_searchable(input: DeriveInput) -> Result<TokenStream, syn::
                 std::borrow::Cow::Borrowed(&[#(#protected_indexes_impl,)*])
             }
 
-            fn index_by_name(index_name: &str, index_type: cipherstash_dynamodb::IndexType) -> Option<Box<dyn cipherstash_dynamodb::traits::ComposableIndex>> {
+            fn index_by_name(index_name: &str, index_type: cipherstash_dynamodb::IndexType) -> Option<Box<dyn cipherstash_dynamodb::traits::ComposableIndex + Send>> {
                 match ( index_name, index_type ) {
                     #(#indexes_impl,)*
                     _ => None,

cipherstash-dynamodb-derive/src/searchable.rs

@@ -19,7 +19,7 @@ use std::{borrow::Cow, collections::HashMap, ops::Deref};
 /// The combination of plaintext, index, name and index type for a particular field
 pub type UnsealedIndex = (
     ComposablePlaintext,
-    Box<dyn ComposableIndex>,
+    Box<dyn ComposableIndex + Send>,
     Cow<'static, str>,
     IndexType,
 );

src/crypto/sealer.rs

@@ -26,7 +26,7 @@ pub struct QueryBuilder<S, B = ()> {
 pub struct PreparedQuery {
     index_name: String,
     type_name: String,
-    composed_index: Box<dyn ComposableIndex>,
+    composed_index: Box<dyn ComposableIndex + Send>,
     plaintext: ComposablePlaintext,
 }
 
@@ -161,7 +161,7 @@ where
 
 pub struct PreparedQueryBuilder {
     pub type_name: Cow<'static, str>,
-    pub index_by_name: fn(&str, IndexType) -> Option<Box<dyn ComposableIndex>>,
+    pub index_by_name: fn(&str, IndexType) -> Option<Box<dyn ComposableIndex + Send>>,
 }
 
 impl PreparedQueryBuilder {

src/encrypted_table/query.rs

@@ -126,7 +126,7 @@ pub trait Searchable: Encryptable {
     fn index_by_name(
         _index_name: &str,
         _index_type: IndexType,
-    ) -> Option<Box<dyn ComposableIndex>> {
+    ) -> Option<Box<dyn ComposableIndex + Send>> {
         None
     }
 }