Skip to content

chore: add #[non_exhaustive] to remaining public structs#768

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
DaleSeo merged 4 commits into from
Mar 26, 2026
Merged

chore: add #[non_exhaustive] to remaining public structs #768

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
cd81c8c
chore: add #[non_exhaustive] to remaining public structs
DaleSeo Mar 22, 2026
3ca62fd
chore: add #[non_exhaustive] to remaining public types
DaleSeo Mar 22, 2026
8f0be99
chore: enable exhaustive_structs/enums clippy lints
DaleSeo Mar 22, 2026
ce49fc9
test: add untagged ServerResult deserialization regression tests
DaleSeo Mar 26, 2026
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
8 changes: 2 additions & 6 deletions conformance/src/bin/client.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -252,12 +252,8 @@ async fn perform_oauth_flow_preregistered(
manager.set_metadata(metadata);

// Configure with pre-registered credentials
let config = rmcp::transport::auth::OAuthClientConfig {
client_id: client_id.to_string(),
client_secret: Some(client_secret.to_string()),
scopes: vec![],
redirect_uri: REDIRECT_URI.to_string(),
};
let config = rmcp::transport::auth::OAuthClientConfig::new(client_id, REDIRECT_URI)
.with_client_secret(client_secret);
manager.configure_client(config)?;

let scopes = manager.select_scopes(None, &[]);
Expand Down
5 changes: 1 addition & 4 deletions conformance/src/bin/server.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -818,10 +818,7 @@ async fn main() -> anyhow::Result<()> {
tracing::info!("Starting conformance server on {}", bind_addr);

let server = ConformanceServer::new();
let config = StreamableHttpServerConfig {
stateful_mode: true,
..Default::default()
};
let config = StreamableHttpServerConfig::default();
let service = StreamableHttpService::new(
move || Ok(server.clone()),
LocalSessionManager::default().into(),
Expand Down
4 changes: 4 additions & 0 deletions crates/rmcp/Cargo.toml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,10 @@ readme = { workspace = true }
description = "Rust SDK for Model Context Protocol"
documentation = "https://docs.rs/rmcp"

[lints.clippy]
exhaustive_structs = "warn"
exhaustive_enums = "warn"

[package.metadata.docs.rs]
all-features = true
rustdoc-args = ["--cfg", "docsrs"]
Expand Down
2 changes: 2 additions & 0 deletions crates/rmcp/src/handler/server/common.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -138,6 +138,7 @@ where
}
}

#[expect(clippy::exhaustive_structs, reason = "intentionally exhaustive")]
pub struct Extension<T>(pub T);

impl<C, T> FromContextPart<C> for Extension<T>
Expand DownExpand Up@@ -182,6 +183,7 @@ where
}
}

#[expect(clippy::exhaustive_structs, reason = "intentionally exhaustive")]
pub struct RequestId(pub crate::model::RequestId);

impl<C> FromContextPart<C> for RequestId
Expand Down
3 changes: 3 additions & 0 deletions crates/rmcp/src/handler/server/prompt.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -20,6 +20,7 @@ use crate::{
};

/// Context for prompt retrieval operations
#[non_exhaustive]
pub struct PromptContext<'a, S> {
pub server: &'a S,
pub name: String,
Expand DownExpand Up@@ -117,6 +118,7 @@ impl<T: IntoGetPromptResult> IntoGetPromptResult for Result<T, crate::ErrorData>
// Future wrapper that automatically handles IntoGetPromptResult conversion
pin_project_lite::pin_project! {
#[project = IntoGetPromptResultFutProj]
#[non_exhaustive]
pub enum IntoGetPromptResultFut<F, R> {
Pending {
#[pin]
Expand DownExpand Up@@ -151,6 +153,7 @@ where
}

// Prompt-specific extractor for prompt name
#[expect(clippy::exhaustive_structs, reason = "intentionally exhaustive")]
pub struct PromptName(pub String);

impl<S> FromContextPart<PromptContext<'_, S>> for PromptName {
Expand Down
1 change: 1 addition & 0 deletions crates/rmcp/src/handler/server/router.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -13,6 +13,7 @@ use crate::{
pub mod prompt;
pub mod tool;

#[non_exhaustive]
pub struct Router<S> {
pub tool_router: tool::ToolRouter<S>,
pub prompt_router: prompt::PromptRouter<S>,
Expand Down
3 changes: 3 additions & 0 deletions crates/rmcp/src/handler/server/router/prompt.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,6 +6,7 @@ use crate::{
service::{MaybeBoxFuture, MaybeSend},
};

#[non_exhaustive]
pub struct PromptRoute<S> {
#[allow(clippy::type_complexity)]
pub get: Arc<DynGetPromptHandler<S>>,
Expand DownExpand Up@@ -90,6 +91,7 @@ where
}

/// Adapter for functions generated by the #\[prompt\] macro
#[expect(clippy::exhaustive_structs, reason = "intentionally exhaustive")]
pub struct PromptAttrGenerateFunctionAdapter;

impl<S, F> IntoPromptRoute<S, PromptAttrGenerateFunctionAdapter> for F
Expand All@@ -103,6 +105,7 @@ where
}

#[derive(Debug)]
#[non_exhaustive]
pub struct PromptRouter<S> {
#[allow(clippy::type_complexity)]
pub map: std::collections::HashMap<Cow<'static, str>, PromptRoute<S>>,
Expand Down
4 changes: 4 additions & 0 deletions crates/rmcp/src/handler/server/router/tool.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -136,6 +136,7 @@ use crate::{
service::{MaybeBoxFuture, MaybeSend},
};

#[non_exhaustive]
pub struct ToolRoute<S> {
#[allow(clippy::type_complexity)]
pub call: Arc<DynCallToolHandler<S>>,
Expand DownExpand Up@@ -216,6 +217,7 @@ where
}
}

#[expect(clippy::exhaustive_structs, reason = "intentionally exhaustive")]
pub struct ToolAttrGenerateFunctionAdapter;
impl<S, F> IntoToolRoute<S, ToolAttrGenerateFunctionAdapter> for F
where
Expand DownExpand Up@@ -251,6 +253,7 @@ where
}
}

#[non_exhaustive]
pub struct WithToolAttr<C, S, A>
where
C: CallToolHandler<S, A> + MaybeSend + Clone + 'static,
Expand DownExpand Up@@ -292,6 +295,7 @@ where
}
}
#[derive(Debug)]
#[non_exhaustive]
pub struct ToolRouter<S> {
#[allow(clippy::type_complexity)]
pub map: std::collections::HashMap<Cow<'static, str>, ToolRoute<S>>,
Expand Down
3 changes: 3 additions & 0 deletions crates/rmcp/src/handler/server/tool.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -29,6 +29,7 @@ pub fn parse_json_object<T: DeserializeOwned>(input: JsonObject) -> Result<T, cr
)
})
}
#[non_exhaustive]
pub struct ToolCallContext<'s, S> {
pub request_context: RequestContext<RoleServer>,
pub service: &'s S,
Expand DownExpand Up@@ -104,6 +105,7 @@ impl<T: IntoCallToolResult> IntoCallToolResult for Result<T, crate::ErrorData> {

pin_project_lite::pin_project! {
#[project = IntoCallToolResultFutProj]
#[non_exhaustive]
pub enum IntoCallToolResultFut<F, R> {
Pending {
#[pin]
Expand DownExpand Up@@ -163,6 +165,7 @@ pub type DynCallToolHandler<S> =
-> futures::future::LocalBoxFuture<'s, Result<CallToolResult, crate::ErrorData>>;

// Tool-specific extractor for tool name
#[expect(clippy::exhaustive_structs, reason = "intentionally exhaustive")]
pub struct ToolName(pub Cow<'static, str>);

impl<S> FromContextPart<ToolCallContext<'_, S>> for ToolName {
Expand Down
1 change: 1 addition & 0 deletions crates/rmcp/src/handler/server/wrapper/json.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,6 +14,7 @@ use crate::{
/// serialized as structured JSON content with an associated schema.
/// The framework will place the JSON in the `structured_content` field
/// of the tool result rather than the regular `content` field.
#[expect(clippy::exhaustive_structs, reason = "intentionally exhaustive")]
pub struct Json<T>(pub T);

// Implement JsonSchema for Json<T> to delegate to T's schema
Expand Down
1 change: 1 addition & 0 deletions crates/rmcp/src/handler/server/wrapper/parameters.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -42,6 +42,7 @@ use schemars::JsonSchema;
/// - Returns appropriate error responses if deserialization fails
#[derive(Debug, Clone, serde::Serialize, serde::Deserialize)]
#[serde(transparent)]
#[expect(clippy::exhaustive_structs, reason = "intentionally exhaustive")]
pub struct Parameters<P>(pub P);

impl<P: JsonSchema> JsonSchema for Parameters<P> {
Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
chore: add #[non_exhaustive] to remaining public structs by DaleSeo · Pull Request #768 · modelcontextprotocol/rust-sdk · GitHub
Skip to content
chore: add #[non_exhaustive] to remaining public structs#768

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

DaleSeo
merged 4 commits into

from

Mar 26, 2026
 Merged


chore: add #[non_exhaustive] to remaining public structs
#768
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
cd81c8c

chore: add #[non_exhaustive] to remaining public structs


DaleSeo Mar 22, 2026
3ca62fd

chore: add #[non_exhaustive] to remaining public types


DaleSeo Mar 22, 2026
8f0be99

chore: enable exhaustive_structs/enums clippy lints


DaleSeo Mar 22, 2026
ce49fc9

test: add untagged ServerResult deserialization regression tests


DaleSeo Mar 26, 2026

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


8 changes: 2 additions & 6 deletions
conformance/src/bin/client.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -252,12 +252,8 @@ async fn perform_oauth_flow_preregistered(
 manager.set_metadata(metadata);

 // Configure with pre-registered credentials
 let config = rmcp::transport::auth::OAuthClientConfig {
 client_id: client_id.to_string(),
 client_secret: Some(client_secret.to_string()),
 scopes: vec![],
 redirect_uri: REDIRECT_URI.to_string(),
 };
 let config = rmcp::transport::auth::OAuthClientConfig::new(client_id, REDIRECT_URI)
 .with_client_secret(client_secret);
 manager.configure_client(config)?;

 let scopes = manager.select_scopes(None, &[]);
Expand Down

5 changes: 1 addition & 4 deletions
conformance/src/bin/server.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -818,10 +818,7 @@ async fn main() -> anyhow::Result<()> {
 tracing::info!("Starting conformance server on {}", bind_addr);

 let server = ConformanceServer::new();
 let config = StreamableHttpServerConfig {
 stateful_mode: true,
 ..Default::default()
 };
 let config = StreamableHttpServerConfig::default();
 let service = StreamableHttpService::new(
 move || Ok(server.clone()),
 LocalSessionManager::default().into(),
Expand Down

4 changes: 4 additions & 0 deletions
crates/rmcp/Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,10 @@ readme = { workspace = true }
description = "Rust SDK for Model Context Protocol"
documentation = "https://docs.rs/rmcp"

[lints.clippy]
exhaustive_structs = "warn"
exhaustive_enums = "warn"

[package.metadata.docs.rs]
all-features = true
rustdoc-args = ["--cfg", "docsrs"]
Expand Down

2 changes: 2 additions & 0 deletions
crates/rmcp/src/handler/server/common.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -138,6 +138,7 @@ where
 }
}

#[expect(clippy::exhaustive_structs, reason = "intentionally exhaustive")]
pub struct Extension<T>(pub T);

impl<C, T> FromContextPart<C> for Extension<T>
Expand DownExpand Up@@ -182,6 +183,7 @@ where
 }
}

#[expect(clippy::exhaustive_structs, reason = "intentionally exhaustive")]
pub struct RequestId(pub crate::model::RequestId);

impl<C> FromContextPart<C> for RequestId
Expand Down

3 changes: 3 additions & 0 deletions
crates/rmcp/src/handler/server/prompt.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -20,6 +20,7 @@ use crate::{
};

/// Context for prompt retrieval operations
#[non_exhaustive]
pub struct PromptContext<'a, S> {
 pub server: &'a S,
 pub name: String,
Expand DownExpand Up@@ -117,6 +118,7 @@ impl<T: IntoGetPromptResult> IntoGetPromptResult for Result<T, crate::ErrorData>
// Future wrapper that automatically handles IntoGetPromptResult conversion
pin_project_lite::pin_project! {
 #[project = IntoGetPromptResultFutProj]
 #[non_exhaustive]
 pub enum IntoGetPromptResultFut<F, R> {
 Pending {
 #[pin]
Expand DownExpand Up@@ -151,6 +153,7 @@ where
}

// Prompt-specific extractor for prompt name
#[expect(clippy::exhaustive_structs, reason = "intentionally exhaustive")]
pub struct PromptName(pub String);

impl<S> FromContextPart<PromptContext<'_, S>> for PromptName {
Expand Down

1 change: 1 addition & 0 deletions
crates/rmcp/src/handler/server/router.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,6 +13,7 @@ use crate::{
pub mod prompt;
pub mod tool;

#[non_exhaustive]
pub struct Router<S> {
 pub tool_router: tool::ToolRouter<S>,
 pub prompt_router: prompt::PromptRouter<S>,
Expand Down

3 changes: 3 additions & 0 deletions
crates/rmcp/src/handler/server/router/prompt.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,6 +6,7 @@ use crate::{
 service::{MaybeBoxFuture, MaybeSend},
};

#[non_exhaustive]
pub struct PromptRoute<S> {
 #[allow(clippy::type_complexity)]
 pub get: Arc<DynGetPromptHandler<S>>,
Expand DownExpand Up@@ -90,6 +91,7 @@ where
}

/// Adapter for functions generated by the #\[prompt\] macro
#[expect(clippy::exhaustive_structs, reason = "intentionally exhaustive")]
pub struct PromptAttrGenerateFunctionAdapter;

impl<S, F> IntoPromptRoute<S, PromptAttrGenerateFunctionAdapter> for F
Expand All@@ -103,6 +105,7 @@ where
}

#[derive(Debug)]
#[non_exhaustive]
pub struct PromptRouter<S> {
 #[allow(clippy::type_complexity)]
 pub map: std::collections::HashMap<Cow<'static, str>, PromptRoute<S>>,
Expand Down

4 changes: 4 additions & 0 deletions
crates/rmcp/src/handler/server/router/tool.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -136,6 +136,7 @@ use crate::{
 service::{MaybeBoxFuture, MaybeSend},
};

#[non_exhaustive]
pub struct ToolRoute<S> {
 #[allow(clippy::type_complexity)]
 pub call: Arc<DynCallToolHandler<S>>,
Expand DownExpand Up@@ -216,6 +217,7 @@ where
 }
}

#[expect(clippy::exhaustive_structs, reason = "intentionally exhaustive")]
pub struct ToolAttrGenerateFunctionAdapter;
impl<S, F> IntoToolRoute<S, ToolAttrGenerateFunctionAdapter> for F
where
Expand DownExpand Up@@ -251,6 +253,7 @@ where
 }
}

#[non_exhaustive]
pub struct WithToolAttr<C, S, A>
where
 C: CallToolHandler<S, A> + MaybeSend + Clone + 'static,
Expand DownExpand Up@@ -292,6 +295,7 @@ where
 }
}
#[derive(Debug)]
#[non_exhaustive]
pub struct ToolRouter<S> {
 #[allow(clippy::type_complexity)]
 pub map: std::collections::HashMap<Cow<'static, str>, ToolRoute<S>>,
Expand Down

3 changes: 3 additions & 0 deletions
crates/rmcp/src/handler/server/tool.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -29,6 +29,7 @@ pub fn parse_json_object<T: DeserializeOwned>(input: JsonObject) -> Result<T, cr
 )
 })
}
#[non_exhaustive]
pub struct ToolCallContext<'s, S> {
 pub request_context: RequestContext<RoleServer>,
 pub service: &'s S,
Expand DownExpand Up@@ -104,6 +105,7 @@ impl<T: IntoCallToolResult> IntoCallToolResult for Result<T, crate::ErrorData> {

pin_project_lite::pin_project! {
 #[project = IntoCallToolResultFutProj]
 #[non_exhaustive]
 pub enum IntoCallToolResultFut<F, R> {
 Pending {
 #[pin]
Expand DownExpand Up@@ -163,6 +165,7 @@ pub type DynCallToolHandler<S> =
 -> futures::future::LocalBoxFuture<'s, Result<CallToolResult, crate::ErrorData>>;

// Tool-specific extractor for tool name
#[expect(clippy::exhaustive_structs, reason = "intentionally exhaustive")]
pub struct ToolName(pub Cow<'static, str>);

impl<S> FromContextPart<ToolCallContext<'_, S>> for ToolName {
Expand Down

1 change: 1 addition & 0 deletions
crates/rmcp/src/handler/server/wrapper/json.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,6 +14,7 @@ use crate::{
/// serialized as structured JSON content with an associated schema.
/// The framework will place the JSON in the `structured_content` field
/// of the tool result rather than the regular `content` field.
#[expect(clippy::exhaustive_structs, reason = "intentionally exhaustive")]
pub struct Json<T>(pub T);

// Implement JsonSchema for Json<T> to delegate to T's schema
Expand Down

1 change: 1 addition & 0 deletions
crates/rmcp/src/handler/server/wrapper/parameters.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -42,6 +42,7 @@ use schemars::JsonSchema;
/// - Returns appropriate error responses if deserialization fails
#[derive(Debug, Clone, serde::Serialize, serde::Deserialize)]
#[serde(transparent)]
#[expect(clippy::exhaustive_structs, reason = "intentionally exhaustive")]
pub struct Parameters<P>(pub P);

impl<P: JsonSchema> JsonSchema for Parameters<P> {
Expand Down
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Force GitHub README to respect dark mode
(function() {
var style = document.createElement('style');
style.textContent = '
.markdown-body {
color-scheme: dark light;
}
.markdown-body pre { background: #161b22 !important; }
.markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }
.markdown-body table th, .markdown-body table td { border-color: #30363d !important; }
.markdown-body img { background: #0d1117; }
.markdown-body blockquote { border-left-color: #8b949e; }
.markdown-body hr { border-color: #30363d; }
';
document.head.appendChild(style);
})();
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
chore: add #[non_exhaustive] to remaining public structs by DaleSeo · Pull Request #768 · modelcontextprotocol/rust-sdk · GitHub
Skip to content
chore: add #[non_exhaustive] to remaining public structs#768

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

DaleSeo
merged 4 commits into

from

Mar 26, 2026
 Merged


chore: add #[non_exhaustive] to remaining public structs
#768
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
cd81c8c

chore: add #[non_exhaustive] to remaining public structs


DaleSeo Mar 22, 2026
3ca62fd

chore: add #[non_exhaustive] to remaining public types


DaleSeo Mar 22, 2026
8f0be99

chore: enable exhaustive_structs/enums clippy lints


DaleSeo Mar 22, 2026
ce49fc9

test: add untagged ServerResult deserialization regression tests


DaleSeo Mar 26, 2026

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


8 changes: 2 additions & 6 deletions
conformance/src/bin/client.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -252,12 +252,8 @@ async fn perform_oauth_flow_preregistered(
 manager.set_metadata(metadata);

 // Configure with pre-registered credentials
 let config = rmcp::transport::auth::OAuthClientConfig {
 client_id: client_id.to_string(),
 client_secret: Some(client_secret.to_string()),
 scopes: vec![],
 redirect_uri: REDIRECT_URI.to_string(),
 };
 let config = rmcp::transport::auth::OAuthClientConfig::new(client_id, REDIRECT_URI)
 .with_client_secret(client_secret);
 manager.configure_client(config)?;

 let scopes = manager.select_scopes(None, &[]);
Expand Down

5 changes: 1 addition & 4 deletions
conformance/src/bin/server.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -818,10 +818,7 @@ async fn main() -> anyhow::Result<()> {
 tracing::info!("Starting conformance server on {}", bind_addr);

 let server = ConformanceServer::new();
 let config = StreamableHttpServerConfig {
 stateful_mode: true,
 ..Default::default()
 };
 let config = StreamableHttpServerConfig::default();
 let service = StreamableHttpService::new(
 move || Ok(server.clone()),
 LocalSessionManager::default().into(),
Expand Down

4 changes: 4 additions & 0 deletions
crates/rmcp/Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,10 @@ readme = { workspace = true }
description = "Rust SDK for Model Context Protocol"
documentation = "https://docs.rs/rmcp"

[lints.clippy]
exhaustive_structs = "warn"
exhaustive_enums = "warn"

[package.metadata.docs.rs]
all-features = true
rustdoc-args = ["--cfg", "docsrs"]
Expand Down

2 changes: 2 additions & 0 deletions
crates/rmcp/src/handler/server/common.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -138,6 +138,7 @@ where
 }
}

#[expect(clippy::exhaustive_structs, reason = "intentionally exhaustive")]
pub struct Extension<T>(pub T);

impl<C, T> FromContextPart<C> for Extension<T>
Expand DownExpand Up@@ -182,6 +183,7 @@ where
 }
}

#[expect(clippy::exhaustive_structs, reason = "intentionally exhaustive")]
pub struct RequestId(pub crate::model::RequestId);

impl<C> FromContextPart<C> for RequestId
Expand Down

3 changes: 3 additions & 0 deletions
crates/rmcp/src/handler/server/prompt.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -20,6 +20,7 @@ use crate::{
};

/// Context for prompt retrieval operations
#[non_exhaustive]
pub struct PromptContext<'a, S> {
 pub server: &'a S,
 pub name: String,
Expand DownExpand Up@@ -117,6 +118,7 @@ impl<T: IntoGetPromptResult> IntoGetPromptResult for Result<T, crate::ErrorData>
// Future wrapper that automatically handles IntoGetPromptResult conversion
pin_project_lite::pin_project! {
 #[project = IntoGetPromptResultFutProj]
 #[non_exhaustive]
 pub enum IntoGetPromptResultFut<F, R> {
 Pending {
 #[pin]
Expand DownExpand Up@@ -151,6 +153,7 @@ where
}

// Prompt-specific extractor for prompt name
#[expect(clippy::exhaustive_structs, reason = "intentionally exhaustive")]
pub struct PromptName(pub String);

impl<S> FromContextPart<PromptContext<'_, S>> for PromptName {
Expand Down

1 change: 1 addition & 0 deletions
crates/rmcp/src/handler/server/router.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,6 +13,7 @@ use crate::{
pub mod prompt;
pub mod tool;

#[non_exhaustive]
pub struct Router<S> {
 pub tool_router: tool::ToolRouter<S>,
 pub prompt_router: prompt::PromptRouter<S>,
Expand Down

3 changes: 3 additions & 0 deletions
crates/rmcp/src/handler/server/router/prompt.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,6 +6,7 @@ use crate::{
 service::{MaybeBoxFuture, MaybeSend},
};

#[non_exhaustive]
pub struct PromptRoute<S> {
 #[allow(clippy::type_complexity)]
 pub get: Arc<DynGetPromptHandler<S>>,
Expand DownExpand Up@@ -90,6 +91,7 @@ where
}

/// Adapter for functions generated by the #\[prompt\] macro
#[expect(clippy::exhaustive_structs, reason = "intentionally exhaustive")]
pub struct PromptAttrGenerateFunctionAdapter;

impl<S, F> IntoPromptRoute<S, PromptAttrGenerateFunctionAdapter> for F
Expand All@@ -103,6 +105,7 @@ where
}

#[derive(Debug)]
#[non_exhaustive]
pub struct PromptRouter<S> {
 #[allow(clippy::type_complexity)]
 pub map: std::collections::HashMap<Cow<'static, str>, PromptRoute<S>>,
Expand Down

4 changes: 4 additions & 0 deletions
crates/rmcp/src/handler/server/router/tool.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -136,6 +136,7 @@ use crate::{
 service::{MaybeBoxFuture, MaybeSend},
};

#[non_exhaustive]
pub struct ToolRoute<S> {
 #[allow(clippy::type_complexity)]
 pub call: Arc<DynCallToolHandler<S>>,
Expand DownExpand Up@@ -216,6 +217,7 @@ where
 }
}

#[expect(clippy::exhaustive_structs, reason = "intentionally exhaustive")]
pub struct ToolAttrGenerateFunctionAdapter;
impl<S, F> IntoToolRoute<S, ToolAttrGenerateFunctionAdapter> for F
where
Expand DownExpand Up@@ -251,6 +253,7 @@ where
 }
}

#[non_exhaustive]
pub struct WithToolAttr<C, S, A>
where
 C: CallToolHandler<S, A> + MaybeSend + Clone + 'static,
Expand DownExpand Up@@ -292,6 +295,7 @@ where
 }
}
#[derive(Debug)]
#[non_exhaustive]
pub struct ToolRouter<S> {
 #[allow(clippy::type_complexity)]
 pub map: std::collections::HashMap<Cow<'static, str>, ToolRoute<S>>,
Expand Down

3 changes: 3 additions & 0 deletions
crates/rmcp/src/handler/server/tool.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -29,6 +29,7 @@ pub fn parse_json_object<T: DeserializeOwned>(input: JsonObject) -> Result<T, cr
 )
 })
}
#[non_exhaustive]
pub struct ToolCallContext<'s, S> {
 pub request_context: RequestContext<RoleServer>,
 pub service: &'s S,
Expand DownExpand Up@@ -104,6 +105,7 @@ impl<T: IntoCallToolResult> IntoCallToolResult for Result<T, crate::ErrorData> {

pin_project_lite::pin_project! {
 #[project = IntoCallToolResultFutProj]
 #[non_exhaustive]
 pub enum IntoCallToolResultFut<F, R> {
 Pending {
 #[pin]
Expand DownExpand Up@@ -163,6 +165,7 @@ pub type DynCallToolHandler<S> =
 -> futures::future::LocalBoxFuture<'s, Result<CallToolResult, crate::ErrorData>>;

// Tool-specific extractor for tool name
#[expect(clippy::exhaustive_structs, reason = "intentionally exhaustive")]
pub struct ToolName(pub Cow<'static, str>);

impl<S> FromContextPart<ToolCallContext<'_, S>> for ToolName {
Expand Down

1 change: 1 addition & 0 deletions
crates/rmcp/src/handler/server/wrapper/json.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,6 +14,7 @@ use crate::{
/// serialized as structured JSON content with an associated schema.
/// The framework will place the JSON in the `structured_content` field
/// of the tool result rather than the regular `content` field.
#[expect(clippy::exhaustive_structs, reason = "intentionally exhaustive")]
pub struct Json<T>(pub T);

// Implement JsonSchema for Json<T> to delegate to T's schema
Expand Down

1 change: 1 addition & 0 deletions
crates/rmcp/src/handler/server/wrapper/parameters.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -42,6 +42,7 @@ use schemars::JsonSchema;
/// - Returns appropriate error responses if deserialization fails
#[derive(Debug, Clone, serde::Serialize, serde::Deserialize)]
#[serde(transparent)]
#[expect(clippy::exhaustive_structs, reason = "intentionally exhaustive")]
pub struct Parameters<P>(pub P);

impl<P: JsonSchema> JsonSchema for Parameters<P> {
Expand Down
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Highlight search terms from Google/DuckDuckGo/Bing referrer
(function() {
var ref = document.referrer;
var terms = [];
if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {
var url = new URL(ref);
var q = url.searchParams.get('q') || url.searchParams.get('p');
if (q) {
terms = q.split(/\s+/).filter(function(t) { return t.length > 2; });
}
}
if (terms.length === 0) return;
var style = document.createElement('style');
style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';
document.head.appendChild(style);
function highlight(node) {
if (node.nodeType === 3) { // text node
var text = node.textContent;
var found = false;
terms.forEach(function(term) {
var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi');
if (regex.test(text)) {
found = true;
var frag = document.createDocumentFragment();
var parts = text.split(regex);
parts.forEach(function(part, i) {
if (i % 2 === 0) {
frag.appendChild(document.createTextNode(part));
} else {
var span = document.createElement('span');
span.className = 'userscript-highlight';
span.textContent = part;
frag.appendChild(span);
}
});
node.parentNode.replaceChild(frag, node);
}
});
} else if (node.nodeType === 1 && node.childNodes) { // element
var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];
if (!skipTags.includes(node.tagName)) {
Array.from(node.childNodes).forEach(highlight);
}
}
}
highlight(document.body);
// Re-highlight on dynamic content
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1 || node.nodeType === 3) highlight(node);
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
chore: add #[non_exhaustive] to remaining public structs by DaleSeo · Pull Request #768 · modelcontextprotocol/rust-sdk · GitHub
Skip to content
chore: add #[non_exhaustive] to remaining public structs#768

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

DaleSeo
merged 4 commits into

from

Mar 26, 2026
 Merged


chore: add #[non_exhaustive] to remaining public structs
#768
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
cd81c8c

chore: add #[non_exhaustive] to remaining public structs


DaleSeo Mar 22, 2026
3ca62fd

chore: add #[non_exhaustive] to remaining public types


DaleSeo Mar 22, 2026
8f0be99

chore: enable exhaustive_structs/enums clippy lints


DaleSeo Mar 22, 2026
ce49fc9

test: add untagged ServerResult deserialization regression tests


DaleSeo Mar 26, 2026

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


8 changes: 2 additions & 6 deletions
conformance/src/bin/client.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -252,12 +252,8 @@ async fn perform_oauth_flow_preregistered(
 manager.set_metadata(metadata);

 // Configure with pre-registered credentials
 let config = rmcp::transport::auth::OAuthClientConfig {
 client_id: client_id.to_string(),
 client_secret: Some(client_secret.to_string()),
 scopes: vec![],
 redirect_uri: REDIRECT_URI.to_string(),
 };
 let config = rmcp::transport::auth::OAuthClientConfig::new(client_id, REDIRECT_URI)
 .with_client_secret(client_secret);
 manager.configure_client(config)?;

 let scopes = manager.select_scopes(None, &[]);
Expand Down

5 changes: 1 addition & 4 deletions
conformance/src/bin/server.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -818,10 +818,7 @@ async fn main() -> anyhow::Result<()> {
 tracing::info!("Starting conformance server on {}", bind_addr);

 let server = ConformanceServer::new();
 let config = StreamableHttpServerConfig {
 stateful_mode: true,
 ..Default::default()
 };
 let config = StreamableHttpServerConfig::default();
 let service = StreamableHttpService::new(
 move || Ok(server.clone()),
 LocalSessionManager::default().into(),
Expand Down

4 changes: 4 additions & 0 deletions
crates/rmcp/Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,10 @@ readme = { workspace = true }
description = "Rust SDK for Model Context Protocol"
documentation = "https://docs.rs/rmcp"

[lints.clippy]
exhaustive_structs = "warn"
exhaustive_enums = "warn"

[package.metadata.docs.rs]
all-features = true
rustdoc-args = ["--cfg", "docsrs"]
Expand Down

2 changes: 2 additions & 0 deletions
crates/rmcp/src/handler/server/common.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -138,6 +138,7 @@ where
 }
}

#[expect(clippy::exhaustive_structs, reason = "intentionally exhaustive")]
pub struct Extension<T>(pub T);

impl<C, T> FromContextPart<C> for Extension<T>
Expand DownExpand Up@@ -182,6 +183,7 @@ where
 }
}

#[expect(clippy::exhaustive_structs, reason = "intentionally exhaustive")]
pub struct RequestId(pub crate::model::RequestId);

impl<C> FromContextPart<C> for RequestId
Expand Down

3 changes: 3 additions & 0 deletions
crates/rmcp/src/handler/server/prompt.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -20,6 +20,7 @@ use crate::{
};

/// Context for prompt retrieval operations
#[non_exhaustive]
pub struct PromptContext<'a, S> {
 pub server: &'a S,
 pub name: String,
Expand DownExpand Up@@ -117,6 +118,7 @@ impl<T: IntoGetPromptResult> IntoGetPromptResult for Result<T, crate::ErrorData>
// Future wrapper that automatically handles IntoGetPromptResult conversion
pin_project_lite::pin_project! {
 #[project = IntoGetPromptResultFutProj]
 #[non_exhaustive]
 pub enum IntoGetPromptResultFut<F, R> {
 Pending {
 #[pin]
Expand DownExpand Up@@ -151,6 +153,7 @@ where
}

// Prompt-specific extractor for prompt name
#[expect(clippy::exhaustive_structs, reason = "intentionally exhaustive")]
pub struct PromptName(pub String);

impl<S> FromContextPart<PromptContext<'_, S>> for PromptName {
Expand Down

1 change: 1 addition & 0 deletions
crates/rmcp/src/handler/server/router.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,6 +13,7 @@ use crate::{
pub mod prompt;
pub mod tool;

#[non_exhaustive]
pub struct Router<S> {
 pub tool_router: tool::ToolRouter<S>,
 pub prompt_router: prompt::PromptRouter<S>,
Expand Down

3 changes: 3 additions & 0 deletions
crates/rmcp/src/handler/server/router/prompt.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,6 +6,7 @@ use crate::{
 service::{MaybeBoxFuture, MaybeSend},
};

#[non_exhaustive]
pub struct PromptRoute<S> {
 #[allow(clippy::type_complexity)]
 pub get: Arc<DynGetPromptHandler<S>>,
Expand DownExpand Up@@ -90,6 +91,7 @@ where
}

/// Adapter for functions generated by the #\[prompt\] macro
#[expect(clippy::exhaustive_structs, reason = "intentionally exhaustive")]
pub struct PromptAttrGenerateFunctionAdapter;

impl<S, F> IntoPromptRoute<S, PromptAttrGenerateFunctionAdapter> for F
Expand All@@ -103,6 +105,7 @@ where
}

#[derive(Debug)]
#[non_exhaustive]
pub struct PromptRouter<S> {
 #[allow(clippy::type_complexity)]
 pub map: std::collections::HashMap<Cow<'static, str>, PromptRoute<S>>,
Expand Down

4 changes: 4 additions & 0 deletions
crates/rmcp/src/handler/server/router/tool.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -136,6 +136,7 @@ use crate::{
 service::{MaybeBoxFuture, MaybeSend},
};

#[non_exhaustive]
pub struct ToolRoute<S> {
 #[allow(clippy::type_complexity)]
 pub call: Arc<DynCallToolHandler<S>>,
Expand DownExpand Up@@ -216,6 +217,7 @@ where
 }
}

#[expect(clippy::exhaustive_structs, reason = "intentionally exhaustive")]
pub struct ToolAttrGenerateFunctionAdapter;
impl<S, F> IntoToolRoute<S, ToolAttrGenerateFunctionAdapter> for F
where
Expand DownExpand Up@@ -251,6 +253,7 @@ where
 }
}

#[non_exhaustive]
pub struct WithToolAttr<C, S, A>
where
 C: CallToolHandler<S, A> + MaybeSend + Clone + 'static,
Expand DownExpand Up@@ -292,6 +295,7 @@ where
 }
}
#[derive(Debug)]
#[non_exhaustive]
pub struct ToolRouter<S> {
 #[allow(clippy::type_complexity)]
 pub map: std::collections::HashMap<Cow<'static, str>, ToolRoute<S>>,
Expand Down

3 changes: 3 additions & 0 deletions
crates/rmcp/src/handler/server/tool.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -29,6 +29,7 @@ pub fn parse_json_object<T: DeserializeOwned>(input: JsonObject) -> Result<T, cr
 )
 })
}
#[non_exhaustive]
pub struct ToolCallContext<'s, S> {
 pub request_context: RequestContext<RoleServer>,
 pub service: &'s S,
Expand DownExpand Up@@ -104,6 +105,7 @@ impl<T: IntoCallToolResult> IntoCallToolResult for Result<T, crate::ErrorData> {

pin_project_lite::pin_project! {
 #[project = IntoCallToolResultFutProj]
 #[non_exhaustive]
 pub enum IntoCallToolResultFut<F, R> {
 Pending {
 #[pin]
Expand DownExpand Up@@ -163,6 +165,7 @@ pub type DynCallToolHandler<S> =
 -> futures::future::LocalBoxFuture<'s, Result<CallToolResult, crate::ErrorData>>;

// Tool-specific extractor for tool name
#[expect(clippy::exhaustive_structs, reason = "intentionally exhaustive")]
pub struct ToolName(pub Cow<'static, str>);

impl<S> FromContextPart<ToolCallContext<'_, S>> for ToolName {
Expand Down

1 change: 1 addition & 0 deletions
crates/rmcp/src/handler/server/wrapper/json.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,6 +14,7 @@ use crate::{
/// serialized as structured JSON content with an associated schema.
/// The framework will place the JSON in the `structured_content` field
/// of the tool result rather than the regular `content` field.
#[expect(clippy::exhaustive_structs, reason = "intentionally exhaustive")]
pub struct Json<T>(pub T);

// Implement JsonSchema for Json<T> to delegate to T's schema
Expand Down

1 change: 1 addition & 0 deletions
crates/rmcp/src/handler/server/wrapper/parameters.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -42,6 +42,7 @@ use schemars::JsonSchema;
/// - Returns appropriate error responses if deserialization fails
#[derive(Debug, Clone, serde::Serialize, serde::Deserialize)]
#[serde(transparent)]
#[expect(clippy::exhaustive_structs, reason = "intentionally exhaustive")]
pub struct Parameters<P>(pub P);

impl<P: JsonSchema> JsonSchema for Parameters<P> {
Expand Down
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Strip utm_, fbclid, gclid, etc. from all links on page
(function() {
var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',
'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',
'ref', 'ref_src', 'source', 'medium', 'campaign'];
function cleanUrl(url) {
try {
var u = new URL(url, window.location.origin);
var changed = false;
trackingParams.forEach(function(p) {
if (u.searchParams.has(p)) {
u.searchParams.delete(p);
changed = true;
}
});
return changed ? u.toString() : url;
} catch (e) {
return url;
}
}
function cleanLinks() {
document.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
cleanLinks();
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1) {
if (node.tagName === 'A') cleanLinks();
node.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '
chore: add #[non_exhaustive] to remaining public structs by DaleSeo · Pull Request #768 · modelcontextprotocol/rust-sdk · GitHub
Skip to content
chore: add #[non_exhaustive] to remaining public structs#768

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

DaleSeo
merged 4 commits into

from

Mar 26, 2026
 Merged


chore: add #[non_exhaustive] to remaining public structs
#768
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
cd81c8c

chore: add #[non_exhaustive] to remaining public structs


DaleSeo Mar 22, 2026
3ca62fd

chore: add #[non_exhaustive] to remaining public types


DaleSeo Mar 22, 2026
8f0be99

chore: enable exhaustive_structs/enums clippy lints


DaleSeo Mar 22, 2026
ce49fc9

test: add untagged ServerResult deserialization regression tests


DaleSeo Mar 26, 2026

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


8 changes: 2 additions & 6 deletions
conformance/src/bin/client.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -252,12 +252,8 @@ async fn perform_oauth_flow_preregistered(
 manager.set_metadata(metadata);

 // Configure with pre-registered credentials
 let config = rmcp::transport::auth::OAuthClientConfig {
 client_id: client_id.to_string(),
 client_secret: Some(client_secret.to_string()),
 scopes: vec![],
 redirect_uri: REDIRECT_URI.to_string(),
 };
 let config = rmcp::transport::auth::OAuthClientConfig::new(client_id, REDIRECT_URI)
 .with_client_secret(client_secret);
 manager.configure_client(config)?;

 let scopes = manager.select_scopes(None, &[]);
Expand Down

5 changes: 1 addition & 4 deletions
conformance/src/bin/server.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -818,10 +818,7 @@ async fn main() -> anyhow::Result<()> {
 tracing::info!("Starting conformance server on {}", bind_addr);

 let server = ConformanceServer::new();
 let config = StreamableHttpServerConfig {
 stateful_mode: true,
 ..Default::default()
 };
 let config = StreamableHttpServerConfig::default();
 let service = StreamableHttpService::new(
 move || Ok(server.clone()),
 LocalSessionManager::default().into(),
Expand Down

4 changes: 4 additions & 0 deletions
crates/rmcp/Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,10 @@ readme = { workspace = true }
description = "Rust SDK for Model Context Protocol"
documentation = "https://docs.rs/rmcp"

[lints.clippy]
exhaustive_structs = "warn"
exhaustive_enums = "warn"

[package.metadata.docs.rs]
all-features = true
rustdoc-args = ["--cfg", "docsrs"]
Expand Down

2 changes: 2 additions & 0 deletions
crates/rmcp/src/handler/server/common.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -138,6 +138,7 @@ where
 }
}

#[expect(clippy::exhaustive_structs, reason = "intentionally exhaustive")]
pub struct Extension<T>(pub T);

impl<C, T> FromContextPart<C> for Extension<T>
Expand DownExpand Up@@ -182,6 +183,7 @@ where
 }
}

#[expect(clippy::exhaustive_structs, reason = "intentionally exhaustive")]
pub struct RequestId(pub crate::model::RequestId);

impl<C> FromContextPart<C> for RequestId
Expand Down

3 changes: 3 additions & 0 deletions
crates/rmcp/src/handler/server/prompt.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -20,6 +20,7 @@ use crate::{
};

/// Context for prompt retrieval operations
#[non_exhaustive]
pub struct PromptContext<'a, S> {
 pub server: &'a S,
 pub name: String,
Expand DownExpand Up@@ -117,6 +118,7 @@ impl<T: IntoGetPromptResult> IntoGetPromptResult for Result<T, crate::ErrorData>
// Future wrapper that automatically handles IntoGetPromptResult conversion
pin_project_lite::pin_project! {
 #[project = IntoGetPromptResultFutProj]
 #[non_exhaustive]
 pub enum IntoGetPromptResultFut<F, R> {
 Pending {
 #[pin]
Expand DownExpand Up@@ -151,6 +153,7 @@ where
}

// Prompt-specific extractor for prompt name
#[expect(clippy::exhaustive_structs, reason = "intentionally exhaustive")]
pub struct PromptName(pub String);

impl<S> FromContextPart<PromptContext<'_, S>> for PromptName {
Expand Down

1 change: 1 addition & 0 deletions
crates/rmcp/src/handler/server/router.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,6 +13,7 @@ use crate::{
pub mod prompt;
pub mod tool;

#[non_exhaustive]
pub struct Router<S> {
 pub tool_router: tool::ToolRouter<S>,
 pub prompt_router: prompt::PromptRouter<S>,
Expand Down

3 changes: 3 additions & 0 deletions
crates/rmcp/src/handler/server/router/prompt.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,6 +6,7 @@ use crate::{
 service::{MaybeBoxFuture, MaybeSend},
};

#[non_exhaustive]
pub struct PromptRoute<S> {
 #[allow(clippy::type_complexity)]
 pub get: Arc<DynGetPromptHandler<S>>,
Expand DownExpand Up@@ -90,6 +91,7 @@ where
}

/// Adapter for functions generated by the #\[prompt\] macro
#[expect(clippy::exhaustive_structs, reason = "intentionally exhaustive")]
pub struct PromptAttrGenerateFunctionAdapter;

impl<S, F> IntoPromptRoute<S, PromptAttrGenerateFunctionAdapter> for F
Expand All@@ -103,6 +105,7 @@ where
}

#[derive(Debug)]
#[non_exhaustive]
pub struct PromptRouter<S> {
 #[allow(clippy::type_complexity)]
 pub map: std::collections::HashMap<Cow<'static, str>, PromptRoute<S>>,
Expand Down

4 changes: 4 additions & 0 deletions
crates/rmcp/src/handler/server/router/tool.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -136,6 +136,7 @@ use crate::{
 service::{MaybeBoxFuture, MaybeSend},
};

#[non_exhaustive]
pub struct ToolRoute<S> {
 #[allow(clippy::type_complexity)]
 pub call: Arc<DynCallToolHandler<S>>,
Expand DownExpand Up@@ -216,6 +217,7 @@ where
 }
}

#[expect(clippy::exhaustive_structs, reason = "intentionally exhaustive")]
pub struct ToolAttrGenerateFunctionAdapter;
impl<S, F> IntoToolRoute<S, ToolAttrGenerateFunctionAdapter> for F
where
Expand DownExpand Up@@ -251,6 +253,7 @@ where
 }
}

#[non_exhaustive]
pub struct WithToolAttr<C, S, A>
where
 C: CallToolHandler<S, A> + MaybeSend + Clone + 'static,
Expand DownExpand Up@@ -292,6 +295,7 @@ where
 }
}
#[derive(Debug)]
#[non_exhaustive]
pub struct ToolRouter<S> {
 #[allow(clippy::type_complexity)]
 pub map: std::collections::HashMap<Cow<'static, str>, ToolRoute<S>>,
Expand Down

3 changes: 3 additions & 0 deletions
crates/rmcp/src/handler/server/tool.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -29,6 +29,7 @@ pub fn parse_json_object<T: DeserializeOwned>(input: JsonObject) -> Result<T, cr
 )
 })
}
#[non_exhaustive]
pub struct ToolCallContext<'s, S> {
 pub request_context: RequestContext<RoleServer>,
 pub service: &'s S,
Expand DownExpand Up@@ -104,6 +105,7 @@ impl<T: IntoCallToolResult> IntoCallToolResult for Result<T, crate::ErrorData> {

pin_project_lite::pin_project! {
 #[project = IntoCallToolResultFutProj]
 #[non_exhaustive]
 pub enum IntoCallToolResultFut<F, R> {
 Pending {
 #[pin]
Expand DownExpand Up@@ -163,6 +165,7 @@ pub type DynCallToolHandler<S> =
 -> futures::future::LocalBoxFuture<'s, Result<CallToolResult, crate::ErrorData>>;

// Tool-specific extractor for tool name
#[expect(clippy::exhaustive_structs, reason = "intentionally exhaustive")]
pub struct ToolName(pub Cow<'static, str>);

impl<S> FromContextPart<ToolCallContext<'_, S>> for ToolName {
Expand Down

1 change: 1 addition & 0 deletions
crates/rmcp/src/handler/server/wrapper/json.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,6 +14,7 @@ use crate::{
/// serialized as structured JSON content with an associated schema.
/// The framework will place the JSON in the `structured_content` field
/// of the tool result rather than the regular `content` field.
#[expect(clippy::exhaustive_structs, reason = "intentionally exhaustive")]
pub struct Json<T>(pub T);

// Implement JsonSchema for Json<T> to delegate to T's schema
Expand Down

1 change: 1 addition & 0 deletions
crates/rmcp/src/handler/server/wrapper/parameters.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -42,6 +42,7 @@ use schemars::JsonSchema;
/// - Returns appropriate error responses if deserialization fails
#[derive(Debug, Clone, serde::Serialize, serde::Deserialize)]
#[serde(transparent)]
#[expect(clippy::exhaustive_structs, reason = "intentionally exhaustive")]
pub struct Parameters<P>(pub P);

impl<P: JsonSchema> JsonSchema for Parameters<P> {
Expand Down
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Auto-enable theater mode on YouTube
(function() {
function tryTheater() {
var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]');
if (btn && !btn.classList.contains('activated')) {
btn.click();
}
}
// Try immediately
tryTheater();
// Try after navigation (SPA)
var lastUrl = location.href;
setInterval(function() {
if (location.href !== lastUrl) {
lastUrl = location.href;
setTimeout(tryTheater, 500);
}
}, 1000);
// Also try on player load
var observer = new MutationObserver(tryTheater);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
chore: add #[non_exhaustive] to remaining public structs by DaleSeo · Pull Request #768 · modelcontextprotocol/rust-sdk · GitHub
Skip to content
chore: add #[non_exhaustive] to remaining public structs#768

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

DaleSeo
merged 4 commits into

from

Mar 26, 2026
 Merged


chore: add #[non_exhaustive] to remaining public structs
#768
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
cd81c8c

chore: add #[non_exhaustive] to remaining public structs


DaleSeo Mar 22, 2026
3ca62fd

chore: add #[non_exhaustive] to remaining public types


DaleSeo Mar 22, 2026
8f0be99

chore: enable exhaustive_structs/enums clippy lints


DaleSeo Mar 22, 2026
ce49fc9

test: add untagged ServerResult deserialization regression tests


DaleSeo Mar 26, 2026

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


8 changes: 2 additions & 6 deletions
conformance/src/bin/client.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -252,12 +252,8 @@ async fn perform_oauth_flow_preregistered(
 manager.set_metadata(metadata);

 // Configure with pre-registered credentials
 let config = rmcp::transport::auth::OAuthClientConfig {
 client_id: client_id.to_string(),
 client_secret: Some(client_secret.to_string()),
 scopes: vec![],
 redirect_uri: REDIRECT_URI.to_string(),
 };
 let config = rmcp::transport::auth::OAuthClientConfig::new(client_id, REDIRECT_URI)
 .with_client_secret(client_secret);
 manager.configure_client(config)?;

 let scopes = manager.select_scopes(None, &[]);
Expand Down

5 changes: 1 addition & 4 deletions
conformance/src/bin/server.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -818,10 +818,7 @@ async fn main() -> anyhow::Result<()> {
 tracing::info!("Starting conformance server on {}", bind_addr);

 let server = ConformanceServer::new();
 let config = StreamableHttpServerConfig {
 stateful_mode: true,
 ..Default::default()
 };
 let config = StreamableHttpServerConfig::default();
 let service = StreamableHttpService::new(
 move || Ok(server.clone()),
 LocalSessionManager::default().into(),
Expand Down

4 changes: 4 additions & 0 deletions
crates/rmcp/Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,10 @@ readme = { workspace = true }
description = "Rust SDK for Model Context Protocol"
documentation = "https://docs.rs/rmcp"

[lints.clippy]
exhaustive_structs = "warn"
exhaustive_enums = "warn"

[package.metadata.docs.rs]
all-features = true
rustdoc-args = ["--cfg", "docsrs"]
Expand Down

2 changes: 2 additions & 0 deletions
crates/rmcp/src/handler/server/common.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -138,6 +138,7 @@ where
 }
}

#[expect(clippy::exhaustive_structs, reason = "intentionally exhaustive")]
pub struct Extension<T>(pub T);

impl<C, T> FromContextPart<C> for Extension<T>
Expand DownExpand Up@@ -182,6 +183,7 @@ where
 }
}

#[expect(clippy::exhaustive_structs, reason = "intentionally exhaustive")]
pub struct RequestId(pub crate::model::RequestId);

impl<C> FromContextPart<C> for RequestId
Expand Down

3 changes: 3 additions & 0 deletions
crates/rmcp/src/handler/server/prompt.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -20,6 +20,7 @@ use crate::{
};

/// Context for prompt retrieval operations
#[non_exhaustive]
pub struct PromptContext<'a, S> {
 pub server: &'a S,
 pub name: String,
Expand DownExpand Up@@ -117,6 +118,7 @@ impl<T: IntoGetPromptResult> IntoGetPromptResult for Result<T, crate::ErrorData>
// Future wrapper that automatically handles IntoGetPromptResult conversion
pin_project_lite::pin_project! {
 #[project = IntoGetPromptResultFutProj]
 #[non_exhaustive]
 pub enum IntoGetPromptResultFut<F, R> {
 Pending {
 #[pin]
Expand DownExpand Up@@ -151,6 +153,7 @@ where
}

// Prompt-specific extractor for prompt name
#[expect(clippy::exhaustive_structs, reason = "intentionally exhaustive")]
pub struct PromptName(pub String);

impl<S> FromContextPart<PromptContext<'_, S>> for PromptName {
Expand Down

1 change: 1 addition & 0 deletions
crates/rmcp/src/handler/server/router.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,6 +13,7 @@ use crate::{
pub mod prompt;
pub mod tool;

#[non_exhaustive]
pub struct Router<S> {
 pub tool_router: tool::ToolRouter<S>,
 pub prompt_router: prompt::PromptRouter<S>,
Expand Down

3 changes: 3 additions & 0 deletions
crates/rmcp/src/handler/server/router/prompt.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,6 +6,7 @@ use crate::{
 service::{MaybeBoxFuture, MaybeSend},
};

#[non_exhaustive]
pub struct PromptRoute<S> {
 #[allow(clippy::type_complexity)]
 pub get: Arc<DynGetPromptHandler<S>>,
Expand DownExpand Up@@ -90,6 +91,7 @@ where
}

/// Adapter for functions generated by the #\[prompt\] macro
#[expect(clippy::exhaustive_structs, reason = "intentionally exhaustive")]
pub struct PromptAttrGenerateFunctionAdapter;

impl<S, F> IntoPromptRoute<S, PromptAttrGenerateFunctionAdapter> for F
Expand All@@ -103,6 +105,7 @@ where
}

#[derive(Debug)]
#[non_exhaustive]
pub struct PromptRouter<S> {
 #[allow(clippy::type_complexity)]
 pub map: std::collections::HashMap<Cow<'static, str>, PromptRoute<S>>,
Expand Down

4 changes: 4 additions & 0 deletions
crates/rmcp/src/handler/server/router/tool.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -136,6 +136,7 @@ use crate::{
 service::{MaybeBoxFuture, MaybeSend},
};

#[non_exhaustive]
pub struct ToolRoute<S> {
 #[allow(clippy::type_complexity)]
 pub call: Arc<DynCallToolHandler<S>>,
Expand DownExpand Up@@ -216,6 +217,7 @@ where
 }
}

#[expect(clippy::exhaustive_structs, reason = "intentionally exhaustive")]
pub struct ToolAttrGenerateFunctionAdapter;
impl<S, F> IntoToolRoute<S, ToolAttrGenerateFunctionAdapter> for F
where
Expand DownExpand Up@@ -251,6 +253,7 @@ where
 }
}

#[non_exhaustive]
pub struct WithToolAttr<C, S, A>
where
 C: CallToolHandler<S, A> + MaybeSend + Clone + 'static,
Expand DownExpand Up@@ -292,6 +295,7 @@ where
 }
}
#[derive(Debug)]
#[non_exhaustive]
pub struct ToolRouter<S> {
 #[allow(clippy::type_complexity)]
 pub map: std::collections::HashMap<Cow<'static, str>, ToolRoute<S>>,
Expand Down

3 changes: 3 additions & 0 deletions
crates/rmcp/src/handler/server/tool.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -29,6 +29,7 @@ pub fn parse_json_object<T: DeserializeOwned>(input: JsonObject) -> Result<T, cr
 )
 })
}
#[non_exhaustive]
pub struct ToolCallContext<'s, S> {
 pub request_context: RequestContext<RoleServer>,
 pub service: &'s S,
Expand DownExpand Up@@ -104,6 +105,7 @@ impl<T: IntoCallToolResult> IntoCallToolResult for Result<T, crate::ErrorData> {

pin_project_lite::pin_project! {
 #[project = IntoCallToolResultFutProj]
 #[non_exhaustive]
 pub enum IntoCallToolResultFut<F, R> {
 Pending {
 #[pin]
Expand DownExpand Up@@ -163,6 +165,7 @@ pub type DynCallToolHandler<S> =
 -> futures::future::LocalBoxFuture<'s, Result<CallToolResult, crate::ErrorData>>;

// Tool-specific extractor for tool name
#[expect(clippy::exhaustive_structs, reason = "intentionally exhaustive")]
pub struct ToolName(pub Cow<'static, str>);

impl<S> FromContextPart<ToolCallContext<'_, S>> for ToolName {
Expand Down

1 change: 1 addition & 0 deletions
crates/rmcp/src/handler/server/wrapper/json.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,6 +14,7 @@ use crate::{
/// serialized as structured JSON content with an associated schema.
/// The framework will place the JSON in the `structured_content` field
/// of the tool result rather than the regular `content` field.
#[expect(clippy::exhaustive_structs, reason = "intentionally exhaustive")]
pub struct Json<T>(pub T);

// Implement JsonSchema for Json<T> to delegate to T's schema
Expand Down

1 change: 1 addition & 0 deletions
crates/rmcp/src/handler/server/wrapper/parameters.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -42,6 +42,7 @@ use schemars::JsonSchema;
/// - Returns appropriate error responses if deserialization fails
#[derive(Debug, Clone, serde::Serialize, serde::Deserialize)]
#[serde(transparent)]
#[expect(clippy::exhaustive_structs, reason = "intentionally exhaustive")]
pub struct Parameters<P>(pub P);

impl<P: JsonSchema> JsonSchema for Parameters<P> {
Expand Down
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Remove or un-stick sticky/fixed headers that block content
(function() {
function unstick() {
document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) {
if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {
el.style.position = 'static';
el.style.top = 'auto';
el.style.zIndex = 'auto';
}
});
}
unstick();
var observer = new MutationObserver(unstick);
observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });
})();
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
chore: add #[non_exhaustive] to remaining public structs by DaleSeo · Pull Request #768 · modelcontextprotocol/rust-sdk · GitHub
Skip to content
chore: add #[non_exhaustive] to remaining public structs#768

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

DaleSeo
merged 4 commits into

from

Mar 26, 2026
 Merged


chore: add #[non_exhaustive] to remaining public structs
#768
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
cd81c8c

chore: add #[non_exhaustive] to remaining public structs


DaleSeo Mar 22, 2026
3ca62fd

chore: add #[non_exhaustive] to remaining public types


DaleSeo Mar 22, 2026
8f0be99

chore: enable exhaustive_structs/enums clippy lints


DaleSeo Mar 22, 2026
ce49fc9

test: add untagged ServerResult deserialization regression tests


DaleSeo Mar 26, 2026

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


8 changes: 2 additions & 6 deletions
conformance/src/bin/client.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -252,12 +252,8 @@ async fn perform_oauth_flow_preregistered(
 manager.set_metadata(metadata);

 // Configure with pre-registered credentials
 let config = rmcp::transport::auth::OAuthClientConfig {
 client_id: client_id.to_string(),
 client_secret: Some(client_secret.to_string()),
 scopes: vec![],
 redirect_uri: REDIRECT_URI.to_string(),
 };
 let config = rmcp::transport::auth::OAuthClientConfig::new(client_id, REDIRECT_URI)
 .with_client_secret(client_secret);
 manager.configure_client(config)?;

 let scopes = manager.select_scopes(None, &[]);
Expand Down

5 changes: 1 addition & 4 deletions
conformance/src/bin/server.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -818,10 +818,7 @@ async fn main() -> anyhow::Result<()> {
 tracing::info!("Starting conformance server on {}", bind_addr);

 let server = ConformanceServer::new();
 let config = StreamableHttpServerConfig {
 stateful_mode: true,
 ..Default::default()
 };
 let config = StreamableHttpServerConfig::default();
 let service = StreamableHttpService::new(
 move || Ok(server.clone()),
 LocalSessionManager::default().into(),
Expand Down

4 changes: 4 additions & 0 deletions
crates/rmcp/Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,10 @@ readme = { workspace = true }
description = "Rust SDK for Model Context Protocol"
documentation = "https://docs.rs/rmcp"

[lints.clippy]
exhaustive_structs = "warn"
exhaustive_enums = "warn"

[package.metadata.docs.rs]
all-features = true
rustdoc-args = ["--cfg", "docsrs"]
Expand Down

2 changes: 2 additions & 0 deletions
crates/rmcp/src/handler/server/common.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -138,6 +138,7 @@ where
 }
}

#[expect(clippy::exhaustive_structs, reason = "intentionally exhaustive")]
pub struct Extension<T>(pub T);

impl<C, T> FromContextPart<C> for Extension<T>
Expand DownExpand Up@@ -182,6 +183,7 @@ where
 }
}

#[expect(clippy::exhaustive_structs, reason = "intentionally exhaustive")]
pub struct RequestId(pub crate::model::RequestId);

impl<C> FromContextPart<C> for RequestId
Expand Down

3 changes: 3 additions & 0 deletions
crates/rmcp/src/handler/server/prompt.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -20,6 +20,7 @@ use crate::{
};

/// Context for prompt retrieval operations
#[non_exhaustive]
pub struct PromptContext<'a, S> {
 pub server: &'a S,
 pub name: String,
Expand DownExpand Up@@ -117,6 +118,7 @@ impl<T: IntoGetPromptResult> IntoGetPromptResult for Result<T, crate::ErrorData>
// Future wrapper that automatically handles IntoGetPromptResult conversion
pin_project_lite::pin_project! {
 #[project = IntoGetPromptResultFutProj]
 #[non_exhaustive]
 pub enum IntoGetPromptResultFut<F, R> {
 Pending {
 #[pin]
Expand DownExpand Up@@ -151,6 +153,7 @@ where
}

// Prompt-specific extractor for prompt name
#[expect(clippy::exhaustive_structs, reason = "intentionally exhaustive")]
pub struct PromptName(pub String);

impl<S> FromContextPart<PromptContext<'_, S>> for PromptName {
Expand Down

1 change: 1 addition & 0 deletions
crates/rmcp/src/handler/server/router.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,6 +13,7 @@ use crate::{
pub mod prompt;
pub mod tool;

#[non_exhaustive]
pub struct Router<S> {
 pub tool_router: tool::ToolRouter<S>,
 pub prompt_router: prompt::PromptRouter<S>,
Expand Down

3 changes: 3 additions & 0 deletions
crates/rmcp/src/handler/server/router/prompt.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,6 +6,7 @@ use crate::{
 service::{MaybeBoxFuture, MaybeSend},
};

#[non_exhaustive]
pub struct PromptRoute<S> {
 #[allow(clippy::type_complexity)]
 pub get: Arc<DynGetPromptHandler<S>>,
Expand DownExpand Up@@ -90,6 +91,7 @@ where
}

/// Adapter for functions generated by the #\[prompt\] macro
#[expect(clippy::exhaustive_structs, reason = "intentionally exhaustive")]
pub struct PromptAttrGenerateFunctionAdapter;

impl<S, F> IntoPromptRoute<S, PromptAttrGenerateFunctionAdapter> for F
Expand All@@ -103,6 +105,7 @@ where
}

#[derive(Debug)]
#[non_exhaustive]
pub struct PromptRouter<S> {
 #[allow(clippy::type_complexity)]
 pub map: std::collections::HashMap<Cow<'static, str>, PromptRoute<S>>,
Expand Down

4 changes: 4 additions & 0 deletions
crates/rmcp/src/handler/server/router/tool.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -136,6 +136,7 @@ use crate::{
 service::{MaybeBoxFuture, MaybeSend},
};

#[non_exhaustive]
pub struct ToolRoute<S> {
 #[allow(clippy::type_complexity)]
 pub call: Arc<DynCallToolHandler<S>>,
Expand DownExpand Up@@ -216,6 +217,7 @@ where
 }
}

#[expect(clippy::exhaustive_structs, reason = "intentionally exhaustive")]
pub struct ToolAttrGenerateFunctionAdapter;
impl<S, F> IntoToolRoute<S, ToolAttrGenerateFunctionAdapter> for F
where
Expand DownExpand Up@@ -251,6 +253,7 @@ where
 }
}

#[non_exhaustive]
pub struct WithToolAttr<C, S, A>
where
 C: CallToolHandler<S, A> + MaybeSend + Clone + 'static,
Expand DownExpand Up@@ -292,6 +295,7 @@ where
 }
}
#[derive(Debug)]
#[non_exhaustive]
pub struct ToolRouter<S> {
 #[allow(clippy::type_complexity)]
 pub map: std::collections::HashMap<Cow<'static, str>, ToolRoute<S>>,
Expand Down

3 changes: 3 additions & 0 deletions
crates/rmcp/src/handler/server/tool.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -29,6 +29,7 @@ pub fn parse_json_object<T: DeserializeOwned>(input: JsonObject) -> Result<T, cr
 )
 })
}
#[non_exhaustive]
pub struct ToolCallContext<'s, S> {
 pub request_context: RequestContext<RoleServer>,
 pub service: &'s S,
Expand DownExpand Up@@ -104,6 +105,7 @@ impl<T: IntoCallToolResult> IntoCallToolResult for Result<T, crate::ErrorData> {

pin_project_lite::pin_project! {
 #[project = IntoCallToolResultFutProj]
 #[non_exhaustive]
 pub enum IntoCallToolResultFut<F, R> {
 Pending {
 #[pin]
Expand DownExpand Up@@ -163,6 +165,7 @@ pub type DynCallToolHandler<S> =
 -> futures::future::LocalBoxFuture<'s, Result<CallToolResult, crate::ErrorData>>;

// Tool-specific extractor for tool name
#[expect(clippy::exhaustive_structs, reason = "intentionally exhaustive")]
pub struct ToolName(pub Cow<'static, str>);

impl<S> FromContextPart<ToolCallContext<'_, S>> for ToolName {
Expand Down

1 change: 1 addition & 0 deletions
crates/rmcp/src/handler/server/wrapper/json.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,6 +14,7 @@ use crate::{
/// serialized as structured JSON content with an associated schema.
/// The framework will place the JSON in the `structured_content` field
/// of the tool result rather than the regular `content` field.
#[expect(clippy::exhaustive_structs, reason = "intentionally exhaustive")]
pub struct Json<T>(pub T);

// Implement JsonSchema for Json<T> to delegate to T's schema
Expand Down

1 change: 1 addition & 0 deletions
crates/rmcp/src/handler/server/wrapper/parameters.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -42,6 +42,7 @@ use schemars::JsonSchema;
/// - Returns appropriate error responses if deserialization fails
#[derive(Debug, Clone, serde::Serialize, serde::Deserialize)]
#[serde(transparent)]
#[expect(clippy::exhaustive_structs, reason = "intentionally exhaustive")]
pub struct Parameters<P>(pub P);

impl<P: JsonSchema> JsonSchema for Parameters<P> {
Expand Down
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Universal Dark Mode - works on any site
(function() {
var enabled = true;
function applyDarkMode() {
if (!enabled) return;
// Create style element if it doesn't exist
var style = document.getElementById('universal-dark-mode-style');
if (!style) {
style = document.createElement('style');
style.id = 'universal-dark-mode-style';
document.head.appendChild(style);
}
// Dark mode CSS - inverts colors but preserves images/video
style.textContent = '
/* Invert everything except media */
html {
filter: invert(1) hue-rotate(180deg) !important;
background: #1a1a2e !important;
}
/* Restore images, videos, iframes, canvas */
img, video, iframe, canvas, svg, picture, [style*="background-image"] {
filter: invert(1) hue-rotate(180deg) !important;
}
/* Preserve specific elements that should not be inverted */
.no-dark-mode, .no-dark-mode *,
[data-theme="light"], [data-theme="light"],
.ace_editor, .ace_editor *,
.CodeMirror, .CodeMirror *,
.monaco-editor, .monaco-editor *,
.markdown-body pre, .markdown-body pre *,
.highlight, .highlight *,
pre code, pre code * {
filter: none !important;
}
/* Fix common UI elements */
.modal, .popup, .dropdown-menu, .tooltip, .popover {
filter: invert(1) hue-rotate(180deg) !important;
background: #2d2d44 !important;
border-color: #444 !important;
}
/* Scrollbars */
::-webkit-scrollbar { background: #1a1a2e !important; }
::-webkit-scrollbar-thumb { background: #444 !important; }
::-webkit-scrollbar-thumb:hover { background: #555 !important; }
/* Selection */
::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
';
}
function removeDarkMode() {
var style = document.getElementById('universal-dark-mode-style');
if (style) style.remove();
}
// Toggle with Alt+Shift+D
document.addEventListener('keydown', function(e) {
if (e.altKey && e.shiftKey && e.key === 'D') {
e.preventDefault();
enabled = !enabled;
if (enabled) {
applyDarkMode();
console.log('[Universal Dark Mode] Enabled');
} else {
removeDarkMode();
console.log('[Universal Dark Mode] Disabled');
}
}
});
// Apply on load
applyDarkMode();
// Re-apply on dynamic content
var observer = new MutationObserver(function(mutations) {
if (enabled && !document.getElementById('universal-dark-mode-style')) {
applyDarkMode();
}
});
observer.observe(document.head, { childList: true });
console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');
})();
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();
chore: add #[non_exhaustive] to remaining public structs by DaleSeo · Pull Request #768 · modelcontextprotocol/rust-sdk · GitHub
Skip to content
chore: add #[non_exhaustive] to remaining public structs#768

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

DaleSeo
merged 4 commits into

from

Mar 26, 2026
 Merged


chore: add #[non_exhaustive] to remaining public structs
#768
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
cd81c8c

chore: add #[non_exhaustive] to remaining public structs


DaleSeo Mar 22, 2026
3ca62fd

chore: add #[non_exhaustive] to remaining public types


DaleSeo Mar 22, 2026
8f0be99

chore: enable exhaustive_structs/enums clippy lints


DaleSeo Mar 22, 2026
ce49fc9

test: add untagged ServerResult deserialization regression tests


DaleSeo Mar 26, 2026

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


8 changes: 2 additions & 6 deletions
conformance/src/bin/client.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -252,12 +252,8 @@ async fn perform_oauth_flow_preregistered(
 manager.set_metadata(metadata);

 // Configure with pre-registered credentials
 let config = rmcp::transport::auth::OAuthClientConfig {
 client_id: client_id.to_string(),
 client_secret: Some(client_secret.to_string()),
 scopes: vec![],
 redirect_uri: REDIRECT_URI.to_string(),
 };
 let config = rmcp::transport::auth::OAuthClientConfig::new(client_id, REDIRECT_URI)
 .with_client_secret(client_secret);
 manager.configure_client(config)?;

 let scopes = manager.select_scopes(None, &[]);
Expand Down

5 changes: 1 addition & 4 deletions
conformance/src/bin/server.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -818,10 +818,7 @@ async fn main() -> anyhow::Result<()> {
 tracing::info!("Starting conformance server on {}", bind_addr);

 let server = ConformanceServer::new();
 let config = StreamableHttpServerConfig {
 stateful_mode: true,
 ..Default::default()
 };
 let config = StreamableHttpServerConfig::default();
 let service = StreamableHttpService::new(
 move || Ok(server.clone()),
 LocalSessionManager::default().into(),
Expand Down

4 changes: 4 additions & 0 deletions
crates/rmcp/Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,10 @@ readme = { workspace = true }
description = "Rust SDK for Model Context Protocol"
documentation = "https://docs.rs/rmcp"

[lints.clippy]
exhaustive_structs = "warn"
exhaustive_enums = "warn"

[package.metadata.docs.rs]
all-features = true
rustdoc-args = ["--cfg", "docsrs"]
Expand Down

2 changes: 2 additions & 0 deletions
crates/rmcp/src/handler/server/common.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -138,6 +138,7 @@ where
 }
}

#[expect(clippy::exhaustive_structs, reason = "intentionally exhaustive")]
pub struct Extension<T>(pub T);

impl<C, T> FromContextPart<C> for Extension<T>
Expand DownExpand Up@@ -182,6 +183,7 @@ where
 }
}

#[expect(clippy::exhaustive_structs, reason = "intentionally exhaustive")]
pub struct RequestId(pub crate::model::RequestId);

impl<C> FromContextPart<C> for RequestId
Expand Down

3 changes: 3 additions & 0 deletions
crates/rmcp/src/handler/server/prompt.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -20,6 +20,7 @@ use crate::{
};

/// Context for prompt retrieval operations
#[non_exhaustive]
pub struct PromptContext<'a, S> {
 pub server: &'a S,
 pub name: String,
Expand DownExpand Up@@ -117,6 +118,7 @@ impl<T: IntoGetPromptResult> IntoGetPromptResult for Result<T, crate::ErrorData>
// Future wrapper that automatically handles IntoGetPromptResult conversion
pin_project_lite::pin_project! {
 #[project = IntoGetPromptResultFutProj]
 #[non_exhaustive]
 pub enum IntoGetPromptResultFut<F, R> {
 Pending {
 #[pin]
Expand DownExpand Up@@ -151,6 +153,7 @@ where
}

// Prompt-specific extractor for prompt name
#[expect(clippy::exhaustive_structs, reason = "intentionally exhaustive")]
pub struct PromptName(pub String);

impl<S> FromContextPart<PromptContext<'_, S>> for PromptName {
Expand Down

1 change: 1 addition & 0 deletions
crates/rmcp/src/handler/server/router.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,6 +13,7 @@ use crate::{
pub mod prompt;
pub mod tool;

#[non_exhaustive]
pub struct Router<S> {
 pub tool_router: tool::ToolRouter<S>,
 pub prompt_router: prompt::PromptRouter<S>,
Expand Down

3 changes: 3 additions & 0 deletions
crates/rmcp/src/handler/server/router/prompt.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,6 +6,7 @@ use crate::{
 service::{MaybeBoxFuture, MaybeSend},
};

#[non_exhaustive]
pub struct PromptRoute<S> {
 #[allow(clippy::type_complexity)]
 pub get: Arc<DynGetPromptHandler<S>>,
Expand DownExpand Up@@ -90,6 +91,7 @@ where
}

/// Adapter for functions generated by the #\[prompt\] macro
#[expect(clippy::exhaustive_structs, reason = "intentionally exhaustive")]
pub struct PromptAttrGenerateFunctionAdapter;

impl<S, F> IntoPromptRoute<S, PromptAttrGenerateFunctionAdapter> for F
Expand All@@ -103,6 +105,7 @@ where
}

#[derive(Debug)]
#[non_exhaustive]
pub struct PromptRouter<S> {
 #[allow(clippy::type_complexity)]
 pub map: std::collections::HashMap<Cow<'static, str>, PromptRoute<S>>,
Expand Down

4 changes: 4 additions & 0 deletions
crates/rmcp/src/handler/server/router/tool.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -136,6 +136,7 @@ use crate::{
 service::{MaybeBoxFuture, MaybeSend},
};

#[non_exhaustive]
pub struct ToolRoute<S> {
 #[allow(clippy::type_complexity)]
 pub call: Arc<DynCallToolHandler<S>>,
Expand DownExpand Up@@ -216,6 +217,7 @@ where
 }
}

#[expect(clippy::exhaustive_structs, reason = "intentionally exhaustive")]
pub struct ToolAttrGenerateFunctionAdapter;
impl<S, F> IntoToolRoute<S, ToolAttrGenerateFunctionAdapter> for F
where
Expand DownExpand Up@@ -251,6 +253,7 @@ where
 }
}

#[non_exhaustive]
pub struct WithToolAttr<C, S, A>
where
 C: CallToolHandler<S, A> + MaybeSend + Clone + 'static,
Expand DownExpand Up@@ -292,6 +295,7 @@ where
 }
}
#[derive(Debug)]
#[non_exhaustive]
pub struct ToolRouter<S> {
 #[allow(clippy::type_complexity)]
 pub map: std::collections::HashMap<Cow<'static, str>, ToolRoute<S>>,
Expand Down

3 changes: 3 additions & 0 deletions
crates/rmcp/src/handler/server/tool.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -29,6 +29,7 @@ pub fn parse_json_object<T: DeserializeOwned>(input: JsonObject) -> Result<T, cr
 )
 })
}
#[non_exhaustive]
pub struct ToolCallContext<'s, S> {
 pub request_context: RequestContext<RoleServer>,
 pub service: &'s S,
Expand DownExpand Up@@ -104,6 +105,7 @@ impl<T: IntoCallToolResult> IntoCallToolResult for Result<T, crate::ErrorData> {

pin_project_lite::pin_project! {
 #[project = IntoCallToolResultFutProj]
 #[non_exhaustive]
 pub enum IntoCallToolResultFut<F, R> {
 Pending {
 #[pin]
Expand DownExpand Up@@ -163,6 +165,7 @@ pub type DynCallToolHandler<S> =
 -> futures::future::LocalBoxFuture<'s, Result<CallToolResult, crate::ErrorData>>;

// Tool-specific extractor for tool name
#[expect(clippy::exhaustive_structs, reason = "intentionally exhaustive")]
pub struct ToolName(pub Cow<'static, str>);

impl<S> FromContextPart<ToolCallContext<'_, S>> for ToolName {
Expand Down

1 change: 1 addition & 0 deletions
crates/rmcp/src/handler/server/wrapper/json.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,6 +14,7 @@ use crate::{
/// serialized as structured JSON content with an associated schema.
/// The framework will place the JSON in the `structured_content` field
/// of the tool result rather than the regular `content` field.
#[expect(clippy::exhaustive_structs, reason = "intentionally exhaustive")]
pub struct Json<T>(pub T);

// Implement JsonSchema for Json<T> to delegate to T's schema
Expand Down

1 change: 1 addition & 0 deletions
crates/rmcp/src/handler/server/wrapper/parameters.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -42,6 +42,7 @@ use schemars::JsonSchema;
/// - Returns appropriate error responses if deserialization fails
#[derive(Debug, Clone, serde::Serialize, serde::Deserialize)]
#[serde(transparent)]
#[expect(clippy::exhaustive_structs, reason = "intentionally exhaustive")]
pub struct Parameters<P>(pub P);

impl<P: JsonSchema> JsonSchema for Parameters<P> {
Expand Down
Loading
Loading