From e78303b01af641863d480afe436799cdc16fabc4 Mon Sep 17 00:00:00 2001
From: Zhang Junyang <junyang@stu.pku.edu.cn>
Date: Mon, 14 Oct 2024 10:48:25 +0800
Subject: [PATCH] Fix OSDK lint warnings from the new tool-chain

---
 osdk/src/commands/new/mod.rs | 2 +-
 osdk/src/config/manifest.rs  | 2 +-
 osdk/src/util.rs             | 2 ++
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/osdk/src/commands/new/mod.rs b/osdk/src/commands/new/mod.rs
index 2f9e78e2a..3ea282e91 100644
--- a/osdk/src/commands/new/mod.rs
+++ b/osdk/src/commands/new/mod.rs
@@ -170,7 +170,7 @@ fn get_src_path<'a>(cargo_metadata: &'a serde_json::Value, crate_name: &str) ->
 
     let target = &targets[0];
     let src_path = target.get("src_path").unwrap();
-    return src_path.as_str().unwrap();
+    src_path.as_str().unwrap()
 }
 
 fn get_workspace_root(cargo_metadata: &serde_json::Value) -> &str {
diff --git a/osdk/src/config/manifest.rs b/osdk/src/config/manifest.rs
index dfc99d76e..5e6836eed 100644
--- a/osdk/src/config/manifest.rs
+++ b/osdk/src/config/manifest.rs
@@ -168,7 +168,7 @@ impl<'de> Deserialize<'de> for TomlManifest {
             {
                 struct FieldVisitor;
 
-                impl<'de> de::Visitor<'de> for FieldVisitor {
+                impl de::Visitor<'_> for FieldVisitor {
                     type Value = Field;
 
                     fn expecting(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
diff --git a/osdk/src/util.rs b/osdk/src/util.rs
index 0ff06dc44..59cc678e1 100644
--- a/osdk/src/util.rs
+++ b/osdk/src/util.rs
@@ -248,4 +248,6 @@ pub fn trace_panic_from_log(qemu_log: File, bin_path: PathBuf) {
             }
         }
     }
+    addr2line_proc.kill().unwrap();
+    addr2line_proc.wait().unwrap();
 }