fix(rmcp): use ServerConfig in cancellation test by DaleSeo · Pull Request #1273 · modelcontextprotocol/rust-sdk · GitHub
Skip to content

fix(rmcp): use ServerConfig in cancellation test - #1273

Merged
alexhancock merged 1 commit into
mainfrom
fix/cancellation-test-server-config
Sep 15, 2026
Merged

alexhancock merged 1 commit into
mainfrom
fix/cancellation-test-server-config

Conversation

@DaleSeo

@DaleSeo DaleSeo commented Sep 14, 2026

Copy link
Copy Markdown
Member

Motivation and Context

#1262 and #1266 were both green on their own branches and merged cleanly, but together they do not compile because of a semantic merge conflict. Since neither diff touched the other's lines, Git merged them without any issues, and main ended up with a reference to a type that was no longer in scope:

error[E0433]: cannot find type `InitializeResult` in this scope
  --> crates/rmcp/tests/test_cancelled_response.rs:221:20

ServerConfig is an alias for the same type (pub type ServerConfig = InitializeResult) and is already imported here, so switching to it fixes the build and keeps #1266's intent intact.

How Has This Been Tested?

CI

Breaking Changes

None.

Types of changes

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to change)
  • Documentation update

Checklist

  • I have read the MCP Documentation
  • My code follows the repository's style guidelines
  • New and existing tests pass locally
  • I have added appropriate error handling
  • I have added or updated documentation as needed

@github-actions github-actions Bot added the T-test Testing related changes label Sep 14, 2026
@DaleSeo DaleSeo self-assigned this Sep 14, 2026
@DaleSeo
DaleSeo marked this pull request as ready for review September 14, 2026 21:03
@DaleSeo
DaleSeo requested a review from a team as a code owner September 14, 2026 21:03
@alexhancock
alexhancock merged commit 0550e13 into main Sep 15, 2026
24 checks passed
@alexhancock
alexhancock deleted the fix/cancellation-test-server-config branch September 15, 2026 15:18
@github-actions github-actions Bot mentioned this pull request Sep 15, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

T-test Testing related changes

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants