Merge branch 'v1.0' into micn/hermitize-mcp

* v1.0: remove use of bare unwrap() in error propagation (#600)
block · Jan 16, 2025 · 9d3e54c · 9d3e54c
2 parents 512146b + 4860adb
commit 9d3e54c
Showing 1 changed file with 10 additions and 2 deletions.
diff --git a/crates/mcp-client/src/client.rs b/crates/mcp-client/src/client.rs
@@ -143,7 +143,11 @@ where
             .call(request)
             .await
             .map_err(|e| Error::McpServerError {
-                server: self.server_info.as_ref().unwrap().name.clone(),
+                server: self
+                    .server_info
+                    .as_ref()
+                    .map(|s| s.name.clone())
+                    .unwrap_or("".to_string()),
                 method: method.to_string(),
                 // we don't need include params because it can be really large
                 source: Box::new(e.into()),
@@ -205,7 +209,11 @@ where
             .call(notification)
             .await
             .map_err(|e| Error::McpServerError {
-                server: self.server_info.as_ref().unwrap().name.clone(),
+                server: self
+                    .server_info
+                    .as_ref()
+                    .map(|s| s.name.clone())
+                    .unwrap_or("".to_string()),
                 method: method.to_string(),
                 // we don't need include params because it can be really large
                 source: Box::new(e.into()),