fix clippy error (#52)

* fix clippy Signed-off-by: Yang Keao <keao.yang@yahoo.com> * run cargo format Signed-off-by: Yang Keao <keao.yang@yahoo.com>
tikv · Feb 10, 2021 · dec67fd · dec67fd
1 parent 54f0f33
commit dec67fd
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 27 deletions.
diff --git a/src/profiler.rs b/src/profiler.rs
@@ -137,7 +137,7 @@ extern "C" fn perf_signal_handler(_signal: c_int) {
             }
 
             let current_thread = unsafe { libc::pthread_self() };
-            let mut name = [0 as libc::c_char; MAX_THREAD_NAME];
+            let mut name = [0_i8; MAX_THREAD_NAME];
             let name_ptr = &mut name as *mut [libc::c_char] as *mut libc::c_char;
 
             write_thread_name(current_thread, &mut name);

diff --git a/src/report.rs b/src/report.rs
@@ -236,43 +236,53 @@ mod protobuf {
                         let sys_name = symbol.sys_name();
                         let filename = symbol.filename();
                         let lineno = symbol.lineno();
-                        let mut function = protos::Function::default();
-                        let id = fn_tbl.len() as u64 + 1;
-                        function.id = id;
-                        function.name = *strings.get(name.as_str()).unwrap() as i64;
-                        function.system_name = *strings.get(sys_name.as_ref()).unwrap() as i64;
-                        function.filename = *strings.get(filename.as_ref()).unwrap() as i64;
-                        functions.insert(name, id);
-                        let mut line = protos::Line::default();
-                        line.function_id = id;
-                        line.line = lineno as i64;
-                        let mut loc = protos::Location::default();
-                        loc.id = id;
-                        loc.line = vec![line];
+                        let function_id = fn_tbl.len() as u64 + 1;
+                        let function = protos::Function {
+                            id: function_id,
+                            name: *strings.get(name.as_str()).unwrap() as i64,
+                            system_name: *strings.get(sys_name.as_ref()).unwrap() as i64,
+                            filename: *strings.get(filename.as_ref()).unwrap() as i64,
+                            ..protos::Function::default()
+                        };
+                        functions.insert(name, function_id);
+                        let line = protos::Line {
+                            function_id,
+                            line: lineno as i64,
+                        };
+                        let loc = protos::Location {
+                            id: function_id,
+                            line: vec![line],
+                            ..protos::Location::default()
+                        };
                         // the fn_tbl has the same length with loc_tbl
                         fn_tbl.push(function);
                         loc_tbl.push(loc);
                         // current frame locations
-                        locs.push(id);
+                        locs.push(function_id);
                     }
                 }
-                let mut sample = protos::Sample::default();
-                sample.location_id = locs;
-                sample.value = vec![*count as i64];
+                let sample = protos::Sample {
+                    location_id: locs,
+                    value: vec![*count as i64],
+                    ..protos::Sample::default()
+                };
                 samples.push(sample);
             }
             let (type_idx, unit_idx) = (str_tbl.len(), str_tbl.len() + 1);
             str_tbl.push("cpu".to_owned());
             str_tbl.push("count".to_owned());
-            let mut sample_type = protos::ValueType::default();
-            sample_type.r#type = type_idx as i64;
-            sample_type.unit = unit_idx as i64;
-            let mut profile = protos::Profile::default();
-            profile.sample_type = vec![sample_type];
-            profile.sample = samples;
-            profile.string_table = str_tbl;
-            profile.function = fn_tbl;
-            profile.location = loc_tbl;
+            let sample_type = protos::ValueType {
+                r#type: type_idx as i64,
+                unit: unit_idx as i64,
+            };
+            let profile = protos::Profile {
+                sample_type: vec![sample_type],
+                sample: samples,
+                string_table: str_tbl,
+                function: fn_tbl,
+                location: loc_tbl,
+                ..protos::Profile::default()
+            };
             Ok(profile)
         }
     }