chore: add #[non_exhaustive] to remaining public structs

Author: DaleSeo

crates/rmcp/src/handler/server/prompt.rs

@@ -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,

crates/rmcp/src/handler/server/tool.rs

@@ -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,

crates/rmcp/src/service.rs

@@ -307,6 +307,7 @@ type Responder<T> = tokio::sync::oneshot::Sender<T>;
 ///
 /// or wait for response by call [`RequestHandle::await_response`]
 #[derive(Debug)]
+#[non_exhaustive]
 pub struct RequestHandle<R: ServiceRole> {
     pub rx: tokio::sync::oneshot::Receiver<Result<R::PeerResp, ServiceError>>,
     pub options: PeerRequestOptions,
@@ -398,6 +399,7 @@ impl<R: ServiceRole> std::fmt::Debug for Peer<R> {
 type ProxyOutbound<R> = mpsc::Receiver<PeerSinkMessage<R>>;
 
 #[derive(Debug, Default)]
+#[non_exhaustive]
 pub struct PeerRequestOptions {
     pub timeout: Option<Duration>,
     pub meta: Option<Meta>,
@@ -648,6 +650,7 @@ pub enum QuitReason {
 
 /// Request execution context
 #[derive(Debug, Clone)]
+#[non_exhaustive]
 pub struct RequestContext<R: ServiceRole> {
     /// this token will be cancelled when the [`CancelledNotification`] is received.
     pub ct: CancellationToken,
@@ -673,6 +676,7 @@ impl<R: ServiceRole> RequestContext<R> {
 
 /// Request execution context
 #[derive(Debug, Clone)]
+#[non_exhaustive]
 pub struct NotificationContext<R: ServiceRole> {
     pub meta: Meta,
     pub extensions: Extensions,

crates/rmcp/src/transport/auth.rs

@@ -60,6 +60,7 @@ const DEFAULT_EXCHANGE_URL: &str = "http://localhost";
 
 /// Stored credentials for OAuth2 authorization
 #[derive(Clone, Serialize, Deserialize)]
+#[non_exhaustive]
 pub struct StoredCredentials {
     pub client_id: String,
     pub token_response: Option<OAuthTokenResponse>,
@@ -134,6 +135,7 @@ impl CredentialStore for InMemoryCredentialStore {
 
 /// Stored authorization state for OAuth2 PKCE flow
 #[derive(Clone, Serialize, Deserialize)]
+#[non_exhaustive]
 pub struct StoredAuthorizationState {
     pub pkce_verifier: String,
     pub csrf_token: String,
@@ -257,6 +259,7 @@ impl StateStore for InMemoryStateStore {
 
 /// HTTP client with OAuth 2.0 authorization
 #[derive(Clone)]
+#[non_exhaustive]
 pub struct AuthClient<C> {
     pub http_client: C,
     pub auth_manager: Arc<Mutex<AuthorizationManager>>,
@@ -350,6 +353,7 @@ pub enum AuthError {
 
 /// oauth2 metadata
 #[derive(Debug, Clone, Deserialize, Serialize, Default)]
+#[non_exhaustive]
 pub struct AuthorizationMetadata {
     pub authorization_endpoint: String,
     pub token_endpoint: String,
@@ -373,6 +377,7 @@ struct ResourceServerMetadata {
 
 /// Parameters extracted from WWW-Authenticate header
 #[derive(Debug, Clone, Default)]
+#[non_exhaustive]
 pub struct WWWAuthenticateParams {
     pub resource_metadata_url: Option<Url>,
     pub scope: Option<String>,
@@ -394,13 +399,35 @@ impl WWWAuthenticateParams {
 
 /// oauth2 client config
 #[derive(Debug, Clone)]
+#[non_exhaustive]
 pub struct OAuthClientConfig {
     pub client_id: String,
     pub client_secret: Option<String>,
     pub scopes: Vec<String>,
     pub redirect_uri: String,
 }
 
+impl OAuthClientConfig {
+    pub fn new(client_id: impl Into<String>, redirect_uri: impl Into<String>) -> Self {
+        Self {
+            client_id: client_id.into(),
+            client_secret: None,
+            scopes: Vec::new(),
+            redirect_uri: redirect_uri.into(),
+        }
+    }
+
+    pub fn with_client_secret(mut self, secret: impl Into<String>) -> Self {
+        self.client_secret = Some(secret.into());
+        self
+    }
+
+    pub fn with_scopes(mut self, scopes: Vec<String>) -> Self {
+        self.scopes = scopes;
+        self
+    }
+}
+
 // add type aliases for oauth2 types
 type OAuthErrorResponse = oauth2::StandardErrorResponse<oauth2::basic::BasicErrorResponseType>;
 
@@ -534,6 +561,7 @@ impl ClientCredentialsConfig {
 
 /// Configuration for scope upgrade behavior
 #[derive(Debug, Clone)]
+#[non_exhaustive]
 pub struct ScopeUpgradeConfig {
     /// Maximum number of scope upgrade attempts before giving up
     pub max_upgrade_attempts: u32,

crates/rmcp/src/transport/streamable_http_client.rs

@@ -212,6 +212,7 @@ pub trait StreamableHttpClient: Clone + Send + 'static {
     + '_;
 }
 
+#[non_exhaustive]
 pub struct RetryConfig {
     pub max_times: Option<usize>,
     pub min_duration: Duration,
@@ -1041,6 +1042,7 @@ impl<C: StreamableHttpClient> StreamableHttpClientTransport<C> {
     }
 }
 #[derive(Debug, Clone)]
+#[non_exhaustive]
 pub struct StreamableHttpClientTransportConfig {
     pub uri: Arc<str>,
     pub retry_config: Arc<dyn SseRetryPolicy>,

crates/rmcp/src/transport/streamable_http_server/session/local.rs

@@ -1059,6 +1059,7 @@ impl Worker for LocalSessionWorker {
 }
 
 #[derive(Debug, Clone)]
+#[non_exhaustive]
 pub struct SessionConfig {
     /// the capacity of the channel for the session. Default is 16.
     pub channel_capacity: usize,

crates/rmcp/src/transport/streamable_http_server/tower.rs

@@ -30,6 +30,7 @@ use crate::{
 };
 
 #[derive(Debug, Clone)]
+#[non_exhaustive]
 pub struct StreamableHttpServerConfig {
     /// The ping message duration for SSE connections.
     pub sse_keep_alive: Option<Duration>,

crates/rmcp/tests/test_elicitation.rs

@@ -1458,20 +1458,15 @@ async fn test_peer_request_options_timeout() {
 
     let timeout = Some(Duration::from_secs(15));
 
-    let options = PeerRequestOptions {
-        timeout,
-        meta: None,
-    };
+    let mut options = PeerRequestOptions::default();
+    options.timeout = timeout;
 
     // Verify timeout is properly stored
     assert_eq!(options.timeout, timeout);
     assert!(options.meta.is_none());
 
     // Test with no timeout
-    let options_no_timeout = PeerRequestOptions {
-        timeout: None,
-        meta: None,
-    };
+    let options_no_timeout = PeerRequestOptions::default();
 
     assert!(options_no_timeout.timeout.is_none());
 }

examples/servers/src/complex_auth_streamhttp.rs

@@ -51,12 +51,9 @@ impl McpOAuthStore {
         let mut clients = HashMap::new();
         clients.insert(
             "mcp-client".to_string(),
-            OAuthClientConfig {
-                client_id: "mcp-client".to_string(),
-                client_secret: Some("mcp-client-secret".to_string()),
-                scopes: vec!["profile".to_string(), "email".to_string()],
-                redirect_uri: "http://localhost:8080/callback".to_string(),
-            },
+            OAuthClientConfig::new("mcp-client", "http://localhost:8080/callback")
+                .with_client_secret("mcp-client-secret")
+                .with_scopes(vec!["profile".to_string(), "email".to_string()]),
         );
 
         Self {