Fixed type mismatch using multiple AsRef

Author: MindFlavor

CHANGELOG.md

@@ -1,3 +1,11 @@
+## [0.4.2](https://github.com/MindFlavor/AzureSDKForRust/releases/tag/0.4.2) (2017-07-05)
+
+**Bugfix:**
+
+* Corrected a type mistake in multiple ```AsRef<str>``` parameters.
+* Implemented ```AsRef<str>``` in Cosmos document and collection.
+* Fixed type mismatch in examples (in README.md too).
+
 ## [0.4.1](https://github.com/MindFlavor/AzureSDKForRust/releases/tag/0.4.1) (2017-07-05)
 
 **Implemented features:**

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name           = "azure_sdk_for_rust"
-version        = "0.4.1"
+version        = "0.4.2"
 description    = "Rust wrappers around Microsoft Azure REST APIs"
 readme         = "README.md"
 authors        = ["Francesco Cogno <francesco.cogno@outlook.com>", "Dong Liu <doliu@microsoft.com>"]

Cargo.toml

@@ -4,14 +4,14 @@
 
 [![Crate](https://img.shields.io/crates/v/azure_sdk_for_rust.svg)](https://crates.io/crates/azure_sdk_for_rust) [![legal](https://img.shields.io/crates/l/azure_sdk_for_rust.svg)](LICENSE) [![cratedown](https://img.shields.io/crates/d/azure_sdk_for_rust.svg)](https://crates.io/crates/azure_sdk_for_rust) [![cratelastdown](https://img.shields.io/crates/dv/azure_sdk_for_rust.svg)](https://crates.io/crates/azure_sdk_for_rust)
 
-[![tag](https://img.shields.io/github/tag/mindflavor/AzureSDKForRust.svg)](https://github.com/MindFlavor/AzureSDKForRust/tree/0.4.1)
-[![release](https://img.shields.io/github/release/mindflavor/AzureSDKForRust.svg)](https://github.com/MindFlavor/AzureSDKForRust/tree/0.4.1)
-[![commitssince](https://img.shields.io/github/commits-since/mindflavor/AzureSDKForRust/0.4.1.svg)](https://img.shields.io/github/commits-since/mindflavor/AzureSDKForRust/0.4.1.svg)
+[![tag](https://img.shields.io/github/tag/mindflavor/AzureSDKForRust.svg)](https://github.com/MindFlavor/AzureSDKForRust/tree/0.4.2)
+[![release](https://img.shields.io/github/release/mindflavor/AzureSDKForRust.svg)](https://github.com/MindFlavor/AzureSDKForRust/tree/0.4.2)
+[![commitssince](https://img.shields.io/github/commits-since/mindflavor/AzureSDKForRust/0.4.2.svg)](https://img.shields.io/github/commits-since/mindflavor/AzureSDKForRust/0.4.2.svg)
 
 ## Introduction
 Microsoft Azure expose its technologies via REST API. These APIs are easily consumable from any language (good) but are weakly typed. With this library and its related [crate](https://crates.io/crates/azure_sdk_for_rust/) you can exploit the power of Microsoft Azure from Rust in a idiomatic way.
 
-This crate relies heavily on the excellent crate called [Hyper](https://github.com/hyperium/hyper). As of this library version [0.4.1](https://github.com/MindFlavor/AzureSDKForRust/releases/tag/0.4.1) all the methods are future-aware. That is, I'm using the latest Hyper code.
+This crate relies heavily on the excellent crate called [Hyper](https://github.com/hyperium/hyper). As of this library version [0.4.2](https://github.com/MindFlavor/AzureSDKForRust/releases/tag/0.4.2) all the methods are future-aware. That is, I'm using the latest Hyper code.
 
 Rust, however, still requires you to Box every future returned by a method. The alternative is to use the ```impl Trait``` feature which is nightly-only. Since I've used it everywhere this library will require a nightly Rust compiler until the ```impl Trait``` makes its way to the stable channel. Also since I'm using an unstable feature these is a very good chance of this code to break in the future.
 
@@ -163,7 +163,7 @@ fn code() -> Result<(), Box<Error>> {
     // The method create_document will return, upon success,
     // the document attributes.
     let document_attributes = core.run(
-        client.create_document(&database, &collection, false, None, &doc),
+        client.create_document_as_entity(&database, &collection, false, None, &doc),
     )?;
     println!("document_attributes == {:?}", document_attributes);
 

README.md

@@ -134,7 +134,7 @@ fn code() -> Result<(), Box<Error>> {
     // The method create_document will return, upon success,
     // the document attributes.
     let document_attributes = core.run(
-        client.create_document(&database, &collection, false, None, &doc),
+        client.create_document_as_entity(&database, &collection, false, None, &doc),
     )?;
     println!("document_attributes == {:?}", document_attributes);
 

examples/document00.rs

@@ -72,18 +72,26 @@ fn code() -> Result<(), Box<Error>> {
             a_timestamp: chrono::Utc::now().timestamp(),
         };
 
-        println!("Adding one entity");
-        core.run(
+        // let's add an entity. we ignore the errors at this point and just
+        // notify the user.
+        match core.run(
             client.create_document_as_entity(&database_name, &collection_name, false, None, &doc),
-        );
+        ) {
+            Ok(_) => {
+                println!("entity added");
+            }
+            Err(error) => {
+                println!("entity add failed (maybe already there?) {:?}", error);
+            }
+        };
     }
 
     // let's get 3 entries at a time
     let mut ldo = LIST_DOCUMENTS_OPTIONS_DEFAULT.clone();
     ldo.max_item_count = Some(3);
 
     let (entries, ldah) = core.run(
-        client.list_documents::<_, MySampleStructOwned>(&database_name, &collection_name, &ldo),
+        client.list_documents::<_, _, MySampleStructOwned>(&database_name, &collection_name, &ldo),
     ).unwrap();
 
     assert_eq!(entries.documents.len(), 3);
@@ -98,9 +106,14 @@ fn code() -> Result<(), Box<Error>> {
         let mut ldo = LIST_DOCUMENTS_OPTIONS_DEFAULT.clone();
         ldo.continuation_token = Some(&ct);
 
-        let (entries, ldah) = core.run(
-            client.list_documents::<_, MySampleStructOwned>(&database_name, &collection_name, &ldo),
-        ).unwrap();
+        let (entries, ldah) =
+            core.run(
+                client.list_documents::<_, _, MySampleStructOwned>(
+                    &database_name,
+                    &collection_name,
+                    &ldo,
+                ),
+            ).unwrap();
 
         assert_eq!(entries.documents.len(), 2);
         println!("entries == {:?}\nldah = {:?}", entries, ldah);
@@ -112,31 +125,25 @@ fn code() -> Result<(), Box<Error>> {
         let gdo = GET_DOCUMENT_OPTIONS_DEFAULT.clone();
         let id = format!("unique_id{}", 3);
 
-        let (entry, gdah) =
-            core.run(
-                client.get_document::<_, MySampleStructOwned>(
-                    &database_name,
-                    &collection_name,
-                    &id,
-                    &gdo,
-                ),
-            ).unwrap();
+        let (entry, gdah) = core.run(client.get_document::<_, _, _, MySampleStructOwned>(
+            &database_name,
+            &collection_name,
+            &id,
+            &gdo,
+        )).unwrap();
 
         assert_eq!(entry.is_some(), true);
         println!("entry == {:?}\ngdah == {:?}", entry, gdah);
 
         // This id should not be found. We expect None as result
         let id = format!("unique_id{}", 100);
 
-        let (entry, gdah) =
-            core.run(
-                client.get_document::<_, MySampleStructOwned>(
-                    &database_name,
-                    &collection_name,
-                    &id,
-                    &gdo,
-                ),
-            ).unwrap();
+        let (entry, gdah) = core.run(client.get_document::<_, _, _, MySampleStructOwned>(
+            &database_name,
+            &collection_name,
+            &id,
+            &gdo,
+        )).unwrap();
 
         assert_eq!(entry.is_some(), false);
         println!("entry == {:?}\ngdah == {:?}", entry, gdah);

examples/document_entries00.rs

@@ -576,17 +576,19 @@ impl<'a> Client {
         )
     }
 
-    pub fn create_document_as_str<T, S>(
+    pub fn create_document_as_str<T, S1, S2, S3>(
         &self,
-        database: S,
-        collection: S,
+        database: S1,
+        collection: S2,
         is_upsert: bool,
         indexing_directive: Option<IndexingDirective>,
-        document_str: S,
+        document_str: S3,
     ) -> impl Future<Item = DocumentAttributes, Error = AzureError>
     where
         T: Serialize,
-        S: AsRef<str>,
+        S1: AsRef<str>,
+        S2: AsRef<str>,
+        S3: AsRef<str>,
     {
         let database = database.as_ref();
         let collection = collection.as_ref();
@@ -613,17 +615,18 @@ impl<'a> Client {
         })
     }
 
-    pub fn create_document_as_entity<T, S>(
+    pub fn create_document_as_entity<T, S1, S2>(
         &self,
-        database: S,
-        collection: S,
+        database: S1,
+        collection: S2,
         is_upsert: bool,
         indexing_directive: Option<IndexingDirective>,
         document: &T,
     ) -> impl Future<Item = DocumentAttributes, Error = AzureError>
     where
         T: Serialize,
-        S: AsRef<str>,
+        S1: AsRef<str>,
+        S2: AsRef<str>,
     {
         let database = database.as_ref();
         let collection = collection.as_ref();
@@ -700,10 +703,10 @@ impl<'a> Client {
     }
 
 
-    pub fn list_documents<'b, S, T>(
+    pub fn list_documents<'b, S1, S2, T>(
         &self,
-        database: S,
-        collection: S,
+        database: S1,
+        collection: S2,
         ldo: &ListDocumentsOptions,
     ) -> impl Future<
         Item = (
@@ -713,7 +716,8 @@ impl<'a> Client {
         Error = AzureError,
     >
     where
-        S: AsRef<str>,
+        S1: AsRef<str>,
+        S2: AsRef<str>,
         T: DeserializeOwned,
     {
         let database = database.as_ref();
@@ -809,15 +813,17 @@ impl<'a> Client {
         Ok(self.hyper_client.request(request))
     }
 
-    pub fn get_document<S, T>(
+    pub fn get_document<S1, S2, S3, T>(
         &self,
-        database: S,
-        collection: S,
-        document_id: S,
+        database: S1,
+        collection: S2,
+        document_id: S3,
         gdo: &GetDocumentOptions,
     ) -> impl Future<Item = (Option<Document<T>>, GetDocumentAdditionalHeaders), Error = AzureError>
     where
-        S: AsRef<str>,
+        S1: AsRef<str>,
+        S2: AsRef<str>,
+        S3: AsRef<str>,
         T: DeserializeOwned,
     {
         let database = database.as_ref();

src/azure/cosmos/client.rs

@@ -121,3 +121,9 @@ impl Deref for Collection {
         &self.id
     }
 }
+
+impl AsRef<str> for Collection {
+    fn as_ref(&self) -> &str {
+        &self.id
+    }
+}

src/azure/cosmos/collection.rs

@@ -24,3 +24,9 @@ impl Deref for Database {
         &self.id
     }
 }
+
+impl AsRef<str> for Database {
+    fn as_ref(&self) -> &str {
+        &self.id
+    }
+}