rename macro

isabelatkinson · isabelatkinson · commit 6376b329cca0 · 2024-02-21T12:41:29.000-07:00
diff --git a/src/operation.rs b/src/operation.rs
@@ -97,13 +97,13 @@ impl<'a, O> OperationResponse<'a, O> {
     }
 }
 
-macro_rules! sync {
+macro_rules! handle_response_sync {
     ($result:block) => {
         let result = || $result;
         OperationResponse::Sync(result())
     };
 }
-use sync;
+use handle_response_sync;
 
 /// A trait modeling the behavior of a server side operation.
 ///
diff --git a/src/operation/abort_transaction.rs b/src/operation/abort_transaction.rs
@@ -11,7 +11,7 @@ use crate::{
     ClientSession,
 };
 
-use super::{sync, OperationResponse, OperationWithDefaults, WriteConcernOnlyBody};
+use super::{handle_response_sync, OperationResponse, OperationWithDefaults, WriteConcernOnlyBody};
 
 pub(crate) struct AbortTransaction {
     write_concern: Option<WriteConcern>,
@@ -56,7 +56,7 @@ impl OperationWithDefaults for AbortTransaction {
         _description: &'a StreamDescription,
         _session: Option<&'a mut ClientSession>,
     ) -> OperationResponse<'a, Self::O> {
-        sync! {{
+        handle_response_sync! {{
             let response: WriteConcernOnlyBody = response.body()?;
             response.validate()
         }}
diff --git a/src/operation/aggregate.rs b/src/operation/aggregate.rs
@@ -13,7 +13,7 @@ use crate::{
 };
 
 use super::{
-    sync,
+    handle_response_sync,
     CursorBody,
     OperationResponse,
     OperationWithDefaults,
@@ -98,7 +98,7 @@ impl OperationWithDefaults for Aggregate {
         description: &'a StreamDescription,
         _session: Option<&mut ClientSession>,
     ) -> OperationResponse<'static, Self::O> {
-        sync! {{
+        handle_response_sync! {{
             let cursor_response: CursorBody = response.body()?;
 
             if self.is_out_or_merge() {
diff --git a/src/operation/aggregate/change_stream.rs b/src/operation/aggregate/change_stream.rs
@@ -9,7 +9,7 @@ use crate::{
     ClientSession,
 };
 
-use super::{sync, Aggregate, OperationResponse};
+use super::{handle_response_sync, Aggregate, OperationResponse};
 
 pub(crate) struct ChangeStreamAggregate {
     inner: Aggregate,
@@ -89,7 +89,7 @@ impl OperationWithDefaults for ChangeStreamAggregate {
         description: &'a StreamDescription,
         session: Option<&'a mut ClientSession>,
     ) -> OperationResponse<'static, Self::O> {
-        sync! {{
+        handle_response_sync! {{
             let op_time = response
                 .raw_body()
                 .get("operationTime")?
diff --git a/src/operation/commit_transaction.rs b/src/operation/commit_transaction.rs
@@ -10,7 +10,7 @@ use crate::{
     ClientSession,
 };
 
-use super::{sync, OperationResponse, WriteConcernOnlyBody};
+use super::{handle_response_sync, OperationResponse, WriteConcernOnlyBody};
 
 pub(crate) struct CommitTransaction {
     options: Option<TransactionOptions>,
@@ -49,7 +49,7 @@ impl OperationWithDefaults for CommitTransaction {
         _description: &StreamDescription,
         _session: Option<&mut ClientSession>,
     ) -> OperationResponse<'static, Self::O> {
-        sync! {{
+        handle_response_sync! {{
             let response: WriteConcernOnlyBody = response.body()?;
             response.validate()
         }}
diff --git a/src/operation/count.rs b/src/operation/count.rs
@@ -11,7 +11,7 @@ use crate::{
     ClientSession,
 };
 
-use super::{sync, OperationResponse};
+use super::{handle_response_sync, OperationResponse};
 
 pub(crate) struct Count {
     ns: Namespace,
@@ -51,7 +51,7 @@ impl OperationWithDefaults for Count {
         _description: &StreamDescription,
         _session: Option<&mut ClientSession>,
     ) -> OperationResponse<'static, Self::O> {
-        sync! {{
+        handle_response_sync! {{
             let response_body: ResponseBody = response.body()?;
             Ok(response_body.n)
         }}
diff --git a/src/operation/count_documents.rs b/src/operation/count_documents.rs
@@ -13,7 +13,13 @@ use crate::{
     Namespace,
 };
 
-use super::{sync, OperationResponse, OperationWithDefaults, Retryability, SingleCursorResult};
+use super::{
+    handle_response_sync,
+    OperationResponse,
+    OperationWithDefaults,
+    Retryability,
+    SingleCursorResult,
+};
 
 pub(crate) struct CountDocuments {
     aggregate: Aggregate,
@@ -95,7 +101,7 @@ impl OperationWithDefaults for CountDocuments {
         _description: &StreamDescription,
         _session: Option<&mut ClientSession>,
     ) -> OperationResponse<'static, Self::O> {
-        sync! {{
+        handle_response_sync! {{
             let response: SingleCursorResult<Body> = response.body()?;
             Ok(response.0.map(|r| r.n).unwrap_or(0))
         }}
diff --git a/src/operation/create.rs b/src/operation/create.rs
@@ -15,7 +15,7 @@ use crate::{
     Namespace,
 };
 
-use super::{sync, OperationResponse};
+use super::{handle_response_sync, OperationResponse};
 
 #[derive(Debug)]
 pub(crate) struct Create {
@@ -56,7 +56,7 @@ impl OperationWithDefaults for Create {
         _description: &StreamDescription,
         _session: Option<&mut ClientSession>,
     ) -> OperationResponse<'static, Self::O> {
-        sync! {{
+        handle_response_sync! {{
             let response: WriteConcernOnlyBody = response.body()?;
             response.validate()
         }}
diff --git a/src/operation/create_indexes.rs b/src/operation/create_indexes.rs
@@ -10,7 +10,7 @@ use crate::{
     Namespace,
 };
 
-use super::{sync, OperationResponse, WriteConcernOnlyBody};
+use super::{handle_response_sync, OperationResponse, WriteConcernOnlyBody};
 
 #[derive(Debug)]
 pub(crate) struct CreateIndexes {
@@ -77,7 +77,7 @@ impl OperationWithDefaults for CreateIndexes {
         _description: &'a StreamDescription,
         _session: Option<&mut ClientSession>,
     ) -> OperationResponse<'static, Self::O> {
-        sync! {{
+        handle_response_sync! {{
             let response: WriteConcernOnlyBody = response.body()?;
             response.validate()?;
             let index_names = self.indexes.iter().filter_map(|i| i.get_name()).collect();
diff --git a/src/operation/delete.rs b/src/operation/delete.rs
@@ -16,7 +16,7 @@ use crate::{
     ClientSession,
 };
 
-use super::{sync, OperationResponse};
+use super::{handle_response_sync, OperationResponse};
 
 #[derive(Debug)]
 pub(crate) struct Delete {
@@ -88,7 +88,7 @@ impl OperationWithDefaults for Delete {
         _description: &StreamDescription,
         _session: Option<&mut ClientSession>,
     ) -> OperationResponse<'static, Self::O> {
-        sync! {{
+        handle_response_sync! {{
             let response: WriteResponseBody = response.body()?;
             response.validate().map_err(convert_bulk_errors)?;
 
diff --git a/src/operation/distinct.rs b/src/operation/distinct.rs
@@ -11,7 +11,7 @@ use crate::{
     ClientSession,
 };
 
-use super::{sync, OperationResponse};
+use super::{handle_response_sync, OperationResponse};
 
 pub(crate) struct Distinct {
     ns: Namespace,
@@ -77,7 +77,7 @@ impl OperationWithDefaults for Distinct {
         _description: &StreamDescription,
         _session: Option<&mut ClientSession>,
     ) -> OperationResponse<'static, Self::O> {
-        sync! {{
+        handle_response_sync! {{
             let response: Response = response.body()?;
             Ok(response.values)
         }}
diff --git a/src/operation/drop_collection.rs b/src/operation/drop_collection.rs
@@ -15,7 +15,7 @@ use crate::{
     Namespace,
 };
 
-use super::{sync, OperationResponse};
+use super::{handle_response_sync, OperationResponse};
 
 #[derive(Debug)]
 pub(crate) struct DropCollection {
@@ -56,7 +56,7 @@ impl OperationWithDefaults for DropCollection {
         _description: &StreamDescription,
         _session: Option<&mut ClientSession>,
     ) -> OperationResponse<'static, Self::O> {
-        sync! {{
+        handle_response_sync! {{
             let response: WriteConcernOnlyBody = response.body()?;
             response.validate()
         }}
diff --git a/src/operation/drop_database.rs b/src/operation/drop_database.rs
@@ -15,7 +15,7 @@ use crate::{
     ClientSession,
 };
 
-use super::{sync, OperationResponse};
+use super::{handle_response_sync, OperationResponse};
 
 #[derive(Debug)]
 pub(crate) struct DropDatabase {
@@ -63,7 +63,7 @@ impl OperationWithDefaults for DropDatabase {
         _description: &StreamDescription,
         _session: Option<&mut ClientSession>,
     ) -> OperationResponse<'static, Self::O> {
-        sync! {{
+        handle_response_sync! {{
             let response: WriteConcernOnlyBody = response.body()?;
             response.validate()
         }}
diff --git a/src/operation/drop_indexes.rs b/src/operation/drop_indexes.rs
@@ -8,7 +8,7 @@ use crate::{
     Namespace,
 };
 
-use super::{sync, OperationResponse};
+use super::{handle_response_sync, OperationResponse};
 
 pub(crate) struct DropIndexes {
     ns: Namespace,
@@ -49,7 +49,7 @@ impl OperationWithDefaults for DropIndexes {
         _description: &StreamDescription,
         _session: Option<&mut ClientSession>,
     ) -> OperationResponse<'static, Self::O> {
-        sync! {{ Ok(()) }}
+        handle_response_sync! {{ Ok(()) }}
     }
 
     fn write_concern(&self) -> Option<&WriteConcern> {
diff --git a/src/operation/find.rs b/src/operation/find.rs
@@ -15,7 +15,7 @@ use crate::{
     Namespace,
 };
 
-use super::{sync, OperationResponse};
+use super::{handle_response_sync, OperationResponse};
 
 #[derive(Debug)]
 pub(crate) struct Find {
@@ -112,7 +112,7 @@ impl OperationWithDefaults for Find {
         description: &'a StreamDescription,
         _session: Option<&mut ClientSession>,
     ) -> OperationResponse<'static, Self::O> {
-        sync! {{
+        handle_response_sync! {{
             let response: CursorBody = response.body()?;
 
             // The comment should only be propagated to getMore calls on 4.4+.
diff --git a/src/operation/find_and_modify.rs b/src/operation/find_and_modify.rs
@@ -31,7 +31,7 @@ use crate::{
     ClientSession,
 };
 
-use super::{sync, OperationResponse};
+use super::{handle_response_sync, OperationResponse};
 
 pub(crate) struct FindAndModify<'a, R, T: DeserializeOwned> {
     ns: Namespace,
@@ -147,7 +147,7 @@ impl<'a, R: Serialize, T: DeserializeOwned> OperationWithDefaults for FindAndMod
         _description: &StreamDescription,
         _session: Option<&mut ClientSession>,
     ) -> OperationResponse<'static, Self::O> {
-        sync! {{
+        handle_response_sync! {{
             #[derive(Debug, Deserialize)]
             pub(crate) struct Response {
                 value: RawBson,
diff --git a/src/operation/get_more.rs b/src/operation/get_more.rs
@@ -16,7 +16,7 @@ use crate::{
     Namespace,
 };
 
-use super::{sync, OperationResponse};
+use super::{handle_response_sync, OperationResponse};
 
 #[derive(Debug)]
 pub(crate) struct GetMore<'conn> {
@@ -90,7 +90,7 @@ impl<'conn> OperationWithDefaults for GetMore<'conn> {
         _description: &StreamDescription,
         _session: Option<&mut ClientSession>,
     ) -> OperationResponse<'static, Self::O> {
-        sync! {{
+        handle_response_sync! {{
             let response: GetMoreResponseBody = response.body()?;
 
             Ok(GetMoreResult {
diff --git a/src/operation/insert.rs b/src/operation/insert.rs
@@ -16,7 +16,12 @@ use crate::{
     Namespace,
 };
 
-use super::{sync, OperationResponse, COMMAND_OVERHEAD_SIZE, MAX_ENCRYPTED_WRITE_SIZE};
+use super::{
+    handle_response_sync,
+    OperationResponse,
+    COMMAND_OVERHEAD_SIZE,
+    MAX_ENCRYPTED_WRITE_SIZE,
+};
 
 #[derive(Debug)]
 pub(crate) struct Insert<'a, T> {
@@ -129,7 +134,7 @@ impl<'a, T: Serialize> OperationWithDefaults for Insert<'a, T> {
         _description: &'b StreamDescription,
         _session: Option<&mut ClientSession>,
     ) -> OperationResponse<'static, Self::O> {
-        sync! {{
+        handle_response_sync! {{
             let response: WriteResponseBody = raw_response.body_utf8_lossy()?;
 
             let mut map = HashMap::new();
diff --git a/src/operation/list_collections.rs b/src/operation/list_collections.rs
@@ -8,7 +8,7 @@ use crate::{
     ClientSession,
 };
 
-use super::{sync, OperationResponse};
+use super::{handle_response_sync, OperationResponse};
 
 #[derive(Debug)]
 pub(crate) struct ListCollections {
@@ -66,7 +66,7 @@ impl OperationWithDefaults for ListCollections {
         description: &'a StreamDescription,
         _session: Option<&mut ClientSession>,
     ) -> OperationResponse<'static, Self::O> {
-        sync! {{
+        handle_response_sync! {{
             let response: CursorBody = raw_response.body()?;
             Ok(CursorSpecification::new(
                 response.cursor,
diff --git a/src/operation/list_databases.rs b/src/operation/list_databases.rs
@@ -11,7 +11,7 @@ use crate::{
     ClientSession,
 };
 
-use super::{sync, OperationResponse};
+use super::{handle_response_sync, OperationResponse};
 
 #[derive(Debug)]
 pub(crate) struct ListDatabases {
@@ -61,7 +61,7 @@ impl OperationWithDefaults for ListDatabases {
         _description: &StreamDescription,
         _session: Option<&mut ClientSession>,
     ) -> OperationResponse<'static, Self::O> {
-        sync! {{
+        handle_response_sync! {{
             let response: Response = raw_response.body()?;
             Ok(response.databases)
         }}
diff --git a/src/operation/list_indexes.rs b/src/operation/list_indexes.rs
@@ -10,7 +10,7 @@ use crate::{
     Namespace,
 };
 
-use super::{sync, CursorBody, OperationResponse, Retryability};
+use super::{handle_response_sync, CursorBody, OperationResponse, Retryability};
 
 pub(crate) struct ListIndexes {
     ns: Namespace,
@@ -51,7 +51,7 @@ impl OperationWithDefaults for ListIndexes {
         description: &'a StreamDescription,
         _session: Option<&mut ClientSession>,
     ) -> OperationResponse<'static, Self::O> {
-        sync! {{
+        handle_response_sync! {{
             let response: CursorBody = raw_response.body()?;
             Ok(CursorSpecification::new(
                 response.cursor,
diff --git a/src/operation/raw_output.rs b/src/operation/raw_output.rs
diff --git a/src/operation/run_command.rs b/src/operation/run_command.rs
diff --git a/src/operation/run_cursor_command.rs b/src/operation/run_cursor_command.rs
diff --git a/src/operation/search_index.rs b/src/operation/search_index.rs
diff --git a/src/operation/update.rs b/src/operation/update.rs

Original file line number	Diff line number	Diff line change
`@@ -97,13 +97,13 @@ impl<'a, O> OperationResponse<'a, O> {`
`97`	`97`	`}`
`98`	`98`	`}`
`99`	`99`
`100`		`-macro_rules! sync {`
	`100`	`+macro_rules! handle_response_sync {`
`101`	`101`	`($result:block) => {`
`102`	`102`	`let result = \|\| $result;`
`103`	`103`	`OperationResponse::Sync(result())`
`104`	`104`	`};`
`105`	`105`	`}`
`106`		`-use sync;`
	`106`	`+use handle_response_sync;`
`107`	`107`
`108`	`108`	`/// A trait modeling the behavior of a server side operation.`
`109`	`109`	`///`