Merge pull request #4695 from weiznich/reduce_generic_code

Reduce generic code instanciation in one of the postgres connection functions

Author: pksunkara

diesel/src/mysql/connection/mod.rs

@@ -218,15 +218,30 @@ fn update_transaction_manager_status<T>(
     instrumentation: &mut DynInstrumentation,
     query: &dyn DebugQuery,
 ) -> QueryResult<T> {
-    if let Err(Error::DatabaseError(DatabaseErrorKind::SerializationFailure, _)) = query_result {
-        transaction_manager
-            .status
-            .set_requires_rollback_maybe_up_to_top_level(true)
+    fn non_generic_inner(
+        query_result: Result<(), &Error>,
+        transaction_manager: &mut AnsiTransactionManager,
+        instrumentation: &mut DynInstrumentation,
+        query: &dyn DebugQuery,
+    ) {
+        if let Err(Error::DatabaseError(DatabaseErrorKind::SerializationFailure, _)) = query_result
+        {
+            transaction_manager
+                .status
+                .set_requires_rollback_maybe_up_to_top_level(true)
+        }
+        instrumentation.on_connection_event(InstrumentationEvent::FinishQuery {
+            query,
+            error: query_result.err(),
+        });
     }
-    instrumentation.on_connection_event(InstrumentationEvent::FinishQuery {
+
+    non_generic_inner(
+        query_result.as_ref().map(|_| ()),
+        transaction_manager,
+        instrumentation,
         query,
-        error: query_result.as_ref().err(),
-    });
+    );
     query_result
 }
 

diesel/src/pg/connection/mod.rs

@@ -332,20 +332,30 @@ fn update_transaction_manager_status<T>(
             }
         }
     }
-    non_generic_inner(conn, query_result.is_err());
-    if let Err(ref e) = query_result {
-        conn.instrumentation
-            .on_connection_event(InstrumentationEvent::FinishQuery {
-                query: source,
-                error: Some(e),
-            });
-    } else if final_call {
-        conn.instrumentation
-            .on_connection_event(InstrumentationEvent::FinishQuery {
-                query: source,
-                error: None,
-            });
+
+    fn non_generic_instrumentation(
+        query_result: Result<(), &Error>,
+        conn: &mut ConnectionAndTransactionManager,
+        source: &dyn DebugQuery,
+        final_call: bool,
+    ) {
+        if let Err(e) = query_result {
+            conn.instrumentation
+                .on_connection_event(InstrumentationEvent::FinishQuery {
+                    query: source,
+                    error: Some(e),
+                });
+        } else if final_call {
+            conn.instrumentation
+                .on_connection_event(InstrumentationEvent::FinishQuery {
+                    query: source,
+                    error: None,
+                });
+        }
     }
+
+    non_generic_inner(conn, query_result.is_err());
+    non_generic_instrumentation(query_result.as_ref().map(|_| ()), conn, source, final_call);
     query_result
 }