commit 9b85c9d249d9c7ce47960ec51d576a7103259c20
author jmjoy <jmjoy@apache.org> Thu Jul 13 09:25:07 2023 +0800
committer GitHub <noreply@github.com> Thu Jul 13 09:25:07 2023 +0800
tree bd0dbb7e4f3a4675e007ee14bd894b8038dc4059
parent 295bdb806a26105cecccb377af014e57ff23fec5

Update nightly channel and format. (#84)

.github/workflows/rust.yml

diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
index 5fd122f..73bd75c 100644
--- a/.github/workflows/rust.yml
+++ b/.github/workflows/rust.yml
@@ -30,7 +30,7 @@
   RUSTFLAGS: "-D warnings"
   LLVM_CONFIG_PATH: llvm-config-10
   RUST_STABLE_TOOLCHAIN: "1.65"
-  RUST_NIGHTLY_TOOLCHAIN: "nightly-2023-01-28"
+  RUST_NIGHTLY_TOOLCHAIN: "nightly-2023-07-12"
 
 jobs:
   required:

src/execute.rs

diff --git a/src/execute.rs b/src/execute.rs
index 779afbd..de1e9a0 100644
--- a/src/execute.rs
+++ b/src/execute.rs
@@ -281,7 +281,9 @@
 
     let mut prev_execute_data_ptr = execute_data.as_mut_ptr();
     loop {
-        let Some(prev_execute_data) = (unsafe { ExecuteData::try_from_mut_ptr(prev_execute_data_ptr) }) else {
+        let Some(prev_execute_data) =
+            (unsafe { ExecuteData::try_from_mut_ptr(prev_execute_data_ptr) })
+        else {
             return None;
         };
         let func_name = prev_execute_data.func().get_function_name();
@@ -331,7 +333,7 @@
         execute_data: *mut sys::zend_execute_data,
     ) -> sys::zend_observer_fcall_handlers {
         let Some(execute_data) = ExecuteData::try_from_mut_ptr(execute_data) else {
-            return Default::default()
+            return Default::default();
         };
 
         let (function_name, class_name) = match get_function_and_class_name(execute_data) {

src/plugin/plugin_amqplib.rs

diff --git a/src/plugin/plugin_amqplib.rs b/src/plugin/plugin_amqplib.rs
index ddeabce..eeab1fc 100644
--- a/src/plugin/plugin_amqplib.rs
+++ b/src/plugin/plugin_amqplib.rs
@@ -111,7 +111,11 @@
     }
 
     fn get_peer(this: &mut ZObj) -> String {
-        let Some(io) = this.get_property("connection").as_z_obj().and_then(|connection| connection.get_property("io").as_z_obj()) else {
+        let Some(io) = this
+            .get_property("connection")
+            .as_z_obj()
+            .and_then(|connection| connection.get_property("io").as_z_obj())
+        else {
             return "unknown:0".to_owned();
         };
         let host = io

src/plugin/plugin_curl.rs

diff --git a/src/plugin/plugin_curl.rs b/src/plugin/plugin_curl.rs
index c921c96..1b8142e 100644
--- a/src/plugin/plugin_curl.rs
+++ b/src/plugin/plugin_curl.rs
@@ -319,10 +319,10 @@
                     debug!(multi_id, "curl multi spans count: {}", spans.len());
                     loop {
                         let Some((cid, mut span)) = spans.pop() else {
-                            break
+                            break;
                         };
                         let Some(ch) = info.curl_handles.remove(&cid) else {
-                            continue
+                            continue;
                         };
                         Self::finish_exit_span(&mut span, &ch)?;
                     }