Fix Rustls features

.github/workflows/linux.yml

@@ -61,6 +61,23 @@ jobs:
           command: test
           args: --no-fail-fast --no-default-features --features "rocksdb cluster enterprise reqwest_blocking" --all
 
+      - name: check build (reqwest_blocking_rustls)
+        uses: actions-rs/cargo@v1
+        env:
+          RUST_LOG: arangors=trace
+        with:
+          command: check
+          args: --no-default-features --features "rocksdb cluster enterprise reqwest_blocking_rustls" --all
+
+      - name: test (reqwest_blocking_rustls)
+        uses: actions-rs/cargo@v1
+        env:
+          RUST_LOG: arangors=trace
+        timeout-minutes: 40
+        with:
+          command: test
+          args: --no-fail-fast --no-default-features --features "rocksdb cluster enterprise reqwest_blocking_rustls" --all
+
       - name: check build (default features)
         uses: actions-rs/cargo@v1
         env:
@@ -112,6 +129,23 @@ jobs:
           command: test
           args: --no-fail-fast --no-default-features --features "rocksdb cluster enterprise reqwest_async" --all
 
+      - name: check build (reqwest_async_rustls)
+        uses: actions-rs/cargo@v1
+        env:
+          RUST_LOG: arangors=trace
+        with:
+          command: check
+          args: --no-default-features --features "rocksdb cluster enterprise reqwest_async_rustls" --all
+
+      - name: test (reqwest_async_rustls)
+        uses: actions-rs/cargo@v1
+        env:
+          RUST_LOG: arangors=trace
+        timeout-minutes: 40
+        with:
+          command: test
+          args: --no-fail-fast --no-default-features --features "rocksdb cluster enterprise reqwest_async" --all
+
       - name: check build (surf_async)
         uses: actions-rs/cargo@v1
         env:

examples/analyzer.rs

@@ -11,7 +11,7 @@ const URL: &str = "http://localhost:8529";
 
 #[cfg_attr(feature = "reqwest_async", tokio::main)]
 #[cfg_attr(feature = "surf_async", async_std::main)]
-#[cfg_attr(feature = "reqwest_blocking", maybe_async::must_be_sync)]
+#[cfg_attr(feature = "blocking", maybe_async::must_be_sync)]
 async fn main() -> Result<(), Error> {
     let analyzer_name = "test_analyzer".to_string();
 
@@ -35,9 +35,3 @@ async fn main() -> Result<(), Error> {
 
     Ok(())
 }
-#[cfg(not(any(
-    feature = "reqwest_blocking",
-    feature = "reqwest_async",
-    feature = "surf_async"
-)))]
-fn main() {}

examples/aql.rs

@@ -23,7 +23,7 @@ struct User {
 
 #[cfg_attr(feature = "reqwest_async", tokio::main)]
 #[cfg_attr(feature = "surf_async", async_std::main)]
-#[cfg_attr(feature = "reqwest_blocking", maybe_async::must_be_sync)]
+#[cfg_attr(feature = "blocking", maybe_async::must_be_sync)]
 async fn main() {
     env_logger::init();
 
@@ -93,10 +93,3 @@ async fn main() {
     let result: Vec<User> = database.aql_query(aql).await.unwrap();
     println!("{:?}", result);
 }
-
-#[cfg(not(any(
-    feature = "reqwest_blocking",
-    feature = "reqwest_async",
-    feature = "surf_async"
-)))]
-fn main() {}

examples/collection.rs

@@ -9,7 +9,7 @@ const URL: &str = "http://localhost:8529";
 
 #[cfg_attr(feature = "reqwest_async", tokio::main)]
 #[cfg_attr(feature = "surf_async", async_std::main)]
-#[cfg_attr(feature = "reqwest_blocking", maybe_async::must_be_sync)]
+#[cfg_attr(feature = "blocking", maybe_async::must_be_sync)]
 async fn main() -> Result<(), Error> {
     let collection_name = "test_collection_create_and_drop";
 
@@ -31,9 +31,3 @@ async fn main() -> Result<(), Error> {
 
     Ok(())
 }
-#[cfg(not(any(
-    feature = "reqwest_blocking",
-    feature = "reqwest_async",
-    feature = "surf_async"
-)))]
-fn main() {}

examples/database.rs

@@ -9,7 +9,7 @@ const URL: &str = "http://localhost:8529";
 
 #[cfg_attr(feature = "reqwest_async", tokio::main)]
 #[cfg_attr(feature = "surf_async", async_std::main)]
-#[cfg_attr(feature = "reqwest_blocking", maybe_async::must_be_sync)]
+#[cfg_attr(feature = "blocking", maybe_async::must_be_sync)]
 async fn main() -> Result<(), Error> {
     let conn = Connection::establish_jwt(URL, "username", "password").await?;
     let database = conn.db("test_db").await?;
@@ -25,10 +25,3 @@ async fn main() -> Result<(), Error> {
 
     Ok(())
 }
-
-#[cfg(not(any(
-    feature = "reqwest_blocking",
-    feature = "reqwest_async",
-    feature = "surf_async"
-)))]
-fn main() {}

examples/document.rs

@@ -23,7 +23,7 @@ struct User {
 
 #[cfg_attr(feature = "reqwest_async", tokio::main)]
 #[cfg_attr(feature = "surf_async", async_std::main)]
-#[cfg_attr(feature = "reqwest_blocking", maybe_async::must_be_sync)]
+#[cfg_attr(feature = "blocking", maybe_async::must_be_sync)]
 async fn main() -> Result<(), Error> {
     let collection_name = "test_collection_document_example";
 
@@ -146,10 +146,3 @@ async fn main() -> Result<(), Error> {
 
     Ok(())
 }
-
-#[cfg(not(any(
-    feature = "reqwest_blocking",
-    feature = "reqwest_async",
-    feature = "surf_async"
-)))]
-fn main() {}

examples/transaction.rs

@@ -14,7 +14,7 @@ const URL: &str = "http://localhost:8529";
 
 #[cfg_attr(feature = "reqwest_async", tokio::main)]
 #[cfg_attr(feature = "surf_async", async_std::main)]
-#[cfg_attr(feature = "reqwest_blocking", maybe_async::must_be_sync)]
+#[cfg_attr(feature = "blocking", maybe_async::must_be_sync)]
 async fn main() -> Result<(), Error> {
     let conn = Connection::establish_jwt(URL, "username", "password").await?;
     let database = conn.db("test_db").await?;

examples/view.rs

@@ -11,7 +11,7 @@ const URL: &str = "http://localhost:8529";
 
 #[cfg_attr(feature = "reqwest_async", tokio::main)]
 #[cfg_attr(feature = "surf_async", async_std::main)]
-#[cfg_attr(feature = "reqwest_blocking", maybe_async::must_be_sync)]
+#[cfg_attr(feature = "blocking", maybe_async::must_be_sync)]
 async fn main() -> Result<(), Error> {
     let collection_name = "test_collection".to_string();
 
@@ -48,9 +48,3 @@ async fn main() -> Result<(), Error> {
 
     Ok(())
 }
-#[cfg(not(any(
-    feature = "reqwest_blocking",
-    feature = "reqwest_async",
-    feature = "surf_async"
-)))]
-fn main() {}

src/collection/options.rs

@@ -72,7 +72,7 @@ pub struct CreateOptions<'a> {
 
     /// Optional object that specifies the collection level schema for
     /// documents. The attribute keys rule, level and message must follow the
-    /// rules documented in Document Schema Validation https://www.arangodb.com/docs/devel/document-schema-validation.html
+    /// rules documented in Document Schema Validation <https://www.arangodb.com/docs/devel/document-schema-validation.html>
     #[serde(skip_serializing_if = "Option::is_none")]
     #[builder(default, setter(strip_option))]
     schema: Option<serde_json::Value>,

src/connection/mod.rs

@@ -84,7 +84,12 @@ pub struct Version {
     pub license: String,
 }
 
-#[cfg(any(feature = "reqwest_async", feature = "reqwest_blocking"))]
+#[cfg(any(
+    feature = "reqwest_async",
+    feature = "reqwest_blocking",
+    feature = "reqwest_async_rustls",
+    feature = "reqwest_blocking_rustls"
+))]
 pub type Connection = GenericConnection<uclient::reqwest::ReqwestClient>;
 
 #[cfg(feature = "surf_async")]

src/lib.rs

@@ -406,6 +406,8 @@ compile_error!(
 #[cfg(any(
     feature = "reqwest_async",
     feature = "reqwest_blocking",
+    feature = "reqwest_async_rustls",
+    feature = "reqwest_blocking_rustls",
     feature = "surf_async"
 ))]
 pub use crate::connection::Connection;

tests/analyzer.rs

@@ -66,7 +66,7 @@ async fn create_ngram_analyzer<C: ClientExt>(
 }
 
 #[maybe_async::test(
-    any(feature = "reqwest_blocking"),
+    any(feature = "blocking"),
     async(any(feature = "reqwest_async"), tokio::test),
     async(any(feature = "surf_async"), async_std::test)
 )]
@@ -88,7 +88,7 @@ async fn test_create_and_drop_norm_analyzer() {
 }
 
 #[maybe_async::test(
-    any(feature = "reqwest_blocking"),
+    any(feature = "blocking"),
     async(any(feature = "reqwest_async"), tokio::test),
     async(any(feature = "surf_async"), async_std::test)
 )]
@@ -110,7 +110,7 @@ async fn test_create_and_drop_ngram_analyzer() {
 }
 
 #[maybe_async::test(
-    any(feature = "reqwest_blocking"),
+    any(feature = "blocking"),
     async(any(feature = "reqwest_async"), tokio::test),
     async(any(feature = "surf_async"), async_std::test)
 )]
@@ -141,7 +141,7 @@ async fn test_list_analyzer() {
 }
 
 #[maybe_async::test(
-    any(feature = "reqwest_blocking"),
+    any(feature = "blocking"),
     async(any(feature = "reqwest_async"), tokio::test),
     async(any(feature = "surf_async"), async_std::test)
 )]

tests/aql.rs

@@ -18,7 +18,7 @@ struct User {
 }
 
 #[maybe_async::test(
-    any(feature = "reqwest_blocking"),
+    any(feature = "blocking"),
     async(any(feature = "reqwest_async"), tokio::test),
     async(any(feature = "surf_async"), async_std::test)
 )]
@@ -35,7 +35,7 @@ async fn test_aql_str() {
 }
 
 #[maybe_async::test(
-    any(feature = "reqwest_blocking"),
+    any(feature = "blocking"),
     async(any(feature = "reqwest_async"), tokio::test),
     async(any(feature = "surf_async"), async_std::test)
 )]
@@ -52,7 +52,7 @@ async fn test_aql() {
 }
 
 #[maybe_async::test(
-    any(feature = "reqwest_blocking"),
+    any(feature = "blocking"),
     async(any(feature = "reqwest_async"), tokio::test),
     async(any(feature = "surf_async"), async_std::test)
 )]
@@ -71,7 +71,7 @@ async fn test_aql_bind_vars() {
 }
 
 #[maybe_async::test(
-    any(feature = "reqwest_blocking"),
+    any(feature = "blocking"),
     async(any(feature = "reqwest_async"), tokio::test),
     async(any(feature = "surf_async"), async_std::test)
 )]