Skip to content

fix: remove unnecessary error wrapper #24

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 1, 2025
Merged

fix: remove unnecessary error wrapper #24

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,16 @@ jobs:
steps:
- name: Checkout
uses: actions/checkout@v4
- name: Cache Rust
uses: actions/cache@v4
with:
path: |
~/.rustup/toolchains
~/.cargo/registry
~/.cargo/git
target
key: ${{ runner.os }}-rust-${{ steps.toolchain.outputs.cachekey }}
restore-keys: ${{ runner.os }}-rust-

- name: Install Rust Toolchain
uses: dtolnay/rust-toolchain@master
Expand Down
7 changes: 3 additions & 4 deletions crates/rust-mcp-sdk/src/mcp_runtimes/client_runtime.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,10 +128,9 @@ impl McpClient for ClientRuntime {

let main_task = tokio::spawn(async move {
let sender = self_clone.sender().await.read().await;
let sender = sender.as_ref().ok_or(crate::error::McpSdkError::SdkError(
schema_utils::SdkError::connection_closed(),
))?;

let sender = sender
.as_ref()
.ok_or(schema_utils::SdkError::connection_closed())?;
while let Some(mcp_message) = stream.next().await {
let self_ref = &*self_clone;

Expand Down
6 changes: 3 additions & 3 deletions crates/rust-mcp-sdk/src/mcp_runtimes/server_runtime.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,9 +84,9 @@ impl McpServer for ServerRuntime {
}

let sender = self.sender().await.read().await;
let sender = sender.as_ref().ok_or(crate::error::McpSdkError::SdkError(
schema_utils::SdkError::connection_closed(),
))?;
let sender = sender
.as_ref()
.ok_or(schema_utils::SdkError::connection_closed())?;

self.handler.on_server_started(self).await;

Expand Down
12 changes: 6 additions & 6 deletions crates/rust-mcp-sdk/src/mcp_traits/mcp_client.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,9 +172,9 @@ pub trait McpClient: Sync + Send {
/// Otherwise, it returns the result from the server.
async fn request(&self, request: RequestFromClient) -> SdkResult<ResultFromServer> {
let sender = self.sender().await.read().await;
let sender = sender.as_ref().ok_or(crate::error::McpSdkError::SdkError(
schema_utils::SdkError::connection_closed(),
))?;
let sender = sender
.as_ref()
.ok_or(schema_utils::SdkError::connection_closed())?;

// Send the request and receive the response.
let response = sender
Expand All @@ -198,9 +198,9 @@ pub trait McpClient: Sync + Send {
/// the transport layer and does not wait for any acknowledgement or result.
async fn send_notification(&self, notification: NotificationFromClient) -> SdkResult<()> {
let sender = self.sender().await.read().await;
let sender = sender.as_ref().ok_or(crate::error::McpSdkError::SdkError(
schema_utils::SdkError::connection_closed(),
))?;
let sender = sender
.as_ref()
.ok_or(schema_utils::SdkError::connection_closed())?;
sender
.send(
MessageFromClient::NotificationFromClient(notification),
Expand Down
Loading