Skip to content

Commit b919fba

Browse files
authored
fix: remove unnecessary error wrapper (#24)
1 parent f8bb8f2 commit b919fba

File tree

4 files changed

+22
-13
lines changed

4 files changed

+22
-13
lines changed

.github/workflows/ci.yml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,16 @@ jobs:
2121
steps:
2222
- name: Checkout
2323
uses: actions/checkout@v4
24+
- name: Cache Rust
25+
uses: actions/cache@v4
26+
with:
27+
path: |
28+
~/.rustup/toolchains
29+
~/.cargo/registry
30+
~/.cargo/git
31+
target
32+
key: ${{ runner.os }}-rust-${{ steps.toolchain.outputs.cachekey }}
33+
restore-keys: ${{ runner.os }}-rust-
2434

2535
- name: Install Rust Toolchain
2636
uses: dtolnay/rust-toolchain@master

crates/rust-mcp-sdk/src/mcp_runtimes/client_runtime.rs

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -128,10 +128,9 @@ impl McpClient for ClientRuntime {
128128

129129
let main_task = tokio::spawn(async move {
130130
let sender = self_clone.sender().await.read().await;
131-
let sender = sender.as_ref().ok_or(crate::error::McpSdkError::SdkError(
132-
schema_utils::SdkError::connection_closed(),
133-
))?;
134-
131+
let sender = sender
132+
.as_ref()
133+
.ok_or(schema_utils::SdkError::connection_closed())?;
135134
while let Some(mcp_message) = stream.next().await {
136135
let self_ref = &*self_clone;
137136

crates/rust-mcp-sdk/src/mcp_runtimes/server_runtime.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -84,9 +84,9 @@ impl McpServer for ServerRuntime {
8484
}
8585

8686
let sender = self.sender().await.read().await;
87-
let sender = sender.as_ref().ok_or(crate::error::McpSdkError::SdkError(
88-
schema_utils::SdkError::connection_closed(),
89-
))?;
87+
let sender = sender
88+
.as_ref()
89+
.ok_or(schema_utils::SdkError::connection_closed())?;
9090

9191
self.handler.on_server_started(self).await;
9292

crates/rust-mcp-sdk/src/mcp_traits/mcp_client.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -172,9 +172,9 @@ pub trait McpClient: Sync + Send {
172172
/// Otherwise, it returns the result from the server.
173173
async fn request(&self, request: RequestFromClient) -> SdkResult<ResultFromServer> {
174174
let sender = self.sender().await.read().await;
175-
let sender = sender.as_ref().ok_or(crate::error::McpSdkError::SdkError(
176-
schema_utils::SdkError::connection_closed(),
177-
))?;
175+
let sender = sender
176+
.as_ref()
177+
.ok_or(schema_utils::SdkError::connection_closed())?;
178178

179179
// Send the request and receive the response.
180180
let response = sender
@@ -198,9 +198,9 @@ pub trait McpClient: Sync + Send {
198198
/// the transport layer and does not wait for any acknowledgement or result.
199199
async fn send_notification(&self, notification: NotificationFromClient) -> SdkResult<()> {
200200
let sender = self.sender().await.read().await;
201-
let sender = sender.as_ref().ok_or(crate::error::McpSdkError::SdkError(
202-
schema_utils::SdkError::connection_closed(),
203-
))?;
201+
let sender = sender
202+
.as_ref()
203+
.ok_or(schema_utils::SdkError::connection_closed())?;
204204
sender
205205
.send(
206206
MessageFromClient::NotificationFromClient(notification),

0 commit comments

Comments
 (0)