modelcontextprotocol/rust-sdk
Watch
1
0
Fork
You've already forked rust-sdk
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

fix: remove unnecessary doc-cfg (#661)

Browse source
This commit is contained in:
EvianZhang 2026-02-17 23:07:40 +08:00 • committed by GitHub
commit 0b53bfd7b9
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
11 changed files with 0 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

2
crates/rmcp/src/handler.rs
View file

@ -1,6 +1,4 @@
#[cfg(feature = "client")] #[cfg(feature = "client")]
#[cfg_attr(docsrs, doc(cfg(feature = "client")))]
pub mod client; pub mod client;
#[cfg(feature = "server")] #[cfg(feature = "server")]
#[cfg_attr(docsrs, doc(cfg(feature = "server")))]
pub mod server; pub mod server;

12
crates/rmcp/src/lib.rs
View file

@ -9,25 +9,18 @@ pub use error::{Error, ErrorData, RmcpError};
/// Basic data types in MCP specification /// Basic data types in MCP specification
pub mod model; pub mod model;
#[cfg(any(feature = "client", feature = "server"))] #[cfg(any(feature = "client", feature = "server"))]
#[cfg_attr(docsrs, doc(cfg(any(feature = "client", feature = "server"))))]
pub mod service; pub mod service;
#[cfg(feature = "client")] #[cfg(feature = "client")]
#[cfg_attr(docsrs, doc(cfg(feature = "client")))]
pub use handler::client::ClientHandler; pub use handler::client::ClientHandler;
#[cfg(feature = "server")] #[cfg(feature = "server")]
#[cfg_attr(docsrs, doc(cfg(feature = "server")))]
pub use handler::server::ServerHandler; pub use handler::server::ServerHandler;
#[cfg(feature = "server")] #[cfg(feature = "server")]
#[cfg_attr(docsrs, doc(cfg(feature = "server")))]
pub use handler::server::wrapper::Json; pub use handler::server::wrapper::Json;
#[cfg(any(feature = "client", feature = "server"))] #[cfg(any(feature = "client", feature = "server"))]
#[cfg_attr(docsrs, doc(cfg(any(feature = "client", feature = "server"))))]
pub use service::{Peer, Service, ServiceError, ServiceExt}; pub use service::{Peer, Service, ServiceError, ServiceExt};
#[cfg(feature = "client")] #[cfg(feature = "client")]
#[cfg_attr(docsrs, doc(cfg(feature = "client")))]
pub use service::{RoleClient, serve_client}; pub use service::{RoleClient, serve_client};
#[cfg(feature = "server")] #[cfg(feature = "server")]
#[cfg_attr(docsrs, doc(cfg(feature = "server")))]
pub use service::{RoleServer, serve_server}; pub use service::{RoleServer, serve_server};
pub mod handler; pub mod handler;
@ -36,17 +29,12 @@ pub mod transport;
// re-export // re-export
#[cfg(all(feature = "macros", feature = "server"))] #[cfg(all(feature = "macros", feature = "server"))]
#[cfg_attr(docsrs, doc(cfg(all(feature = "macros", feature = "server"))))]
pub use pastey::paste; pub use pastey::paste;
#[cfg(all(feature = "macros", feature = "server"))] #[cfg(all(feature = "macros", feature = "server"))]
#[cfg_attr(docsrs, doc(cfg(all(feature = "macros", feature = "server"))))]
pub use rmcp_macros::*; pub use rmcp_macros::*;
#[cfg(any(feature = "macros", feature = "server"))] #[cfg(any(feature = "macros", feature = "server"))]
#[cfg_attr(docsrs, doc(cfg(any(feature = "macros", feature = "server"))))]
pub use schemars; pub use schemars;
#[cfg(feature = "macros")] #[cfg(feature = "macros")]
#[cfg_attr(docsrs, doc(cfg(feature = "macros")))]
pub use serde; pub use serde;
#[cfg(feature = "macros")] #[cfg(feature = "macros")]
#[cfg_attr(docsrs, doc(cfg(feature = "macros")))]
pub use serde_json; pub use serde_json;

1
crates/rmcp/src/model.rs
View file

@ -43,7 +43,6 @@ pub fn object(value: serde_json::Value) -> JsonObject {
/// Use this macro just like [`serde_json::json!`] /// Use this macro just like [`serde_json::json!`]
#[cfg(feature = "macros")] #[cfg(feature = "macros")]
#[cfg_attr(docsrs, doc(cfg(feature = "macros")))]
#[macro_export] #[macro_export]
macro_rules! object { macro_rules! object {
({$($tt:tt)*}) => { ({$($tt:tt)*}) => {

6
crates/rmcp/src/service.rs
View file

@ -11,23 +11,17 @@ use crate::{
transport::{DynamicTransportError, IntoTransport, Transport}, transport::{DynamicTransportError, IntoTransport, Transport},
}; };
#[cfg(feature = "client")] #[cfg(feature = "client")]
#[cfg_attr(docsrs, doc(cfg(feature = "client")))]
mod client; mod client;
#[cfg(feature = "client")] #[cfg(feature = "client")]
#[cfg_attr(docsrs, doc(cfg(feature = "client")))]
pub use client::*; pub use client::*;
#[cfg(feature = "server")] #[cfg(feature = "server")]
#[cfg_attr(docsrs, doc(cfg(feature = "server")))]
mod server; mod server;
#[cfg(feature = "server")] #[cfg(feature = "server")]
#[cfg_attr(docsrs, doc(cfg(feature = "server")))]
pub use server::*; pub use server::*;
#[cfg(feature = "tower")] #[cfg(feature = "tower")]
#[cfg_attr(docsrs, doc(cfg(feature = "tower")))]
mod tower; mod tower;
use tokio_util::sync::{CancellationToken, DropGuard}; use tokio_util::sync::{CancellationToken, DropGuard};
#[cfg(feature = "tower")] #[cfg(feature = "tower")]
#[cfg_attr(docsrs, doc(cfg(feature = "tower")))]
pub use tower::*; pub use tower::*;
use tracing::{Instrument as _, instrument}; use tracing::{Instrument as _, instrument};
#[derive(Error, Debug)] #[derive(Error, Debug)]

17
crates/rmcp/src/transport.rs
View file

@ -43,12 +43,10 @@
//! # ServiceExt, serve_server, //! # ServiceExt, serve_server,
//! # }; //! # };
//! #[cfg(feature = "client")] //! #[cfg(feature = "client")]
//! #[cfg_attr(docsrs, doc(cfg(feature = "client")))]
//! # use rmcp::serve_client; //! # use rmcp::serve_client;
//! //!
//! // create transport from tcp stream //! // create transport from tcp stream
//! #[cfg(feature = "client")] //! #[cfg(feature = "client")]
//! #[cfg_attr(docsrs, doc(cfg(feature = "client")))]
//! async fn client() -> Result<(), Box<dyn std::error::Error>> { //! async fn client() -> Result<(), Box<dyn std::error::Error>> {
//! let stream = tokio::net::TcpSocket::new_v4()? //! let stream = tokio::net::TcpSocket::new_v4()?
//! .connect("127.0.0.1:8001".parse()?) //! .connect("127.0.0.1:8001".parse()?)
@ -61,7 +59,6 @@
//! //!
//! // create transport from std io //! // create transport from std io
//! #[cfg(feature = "client")] //! #[cfg(feature = "client")]
//! #[cfg_attr(docsrs, doc(cfg(feature = "client")))]
//! async fn io() -> Result<(), Box<dyn std::error::Error>> { //! async fn io() -> Result<(), Box<dyn std::error::Error>> {
//! let client = ().serve((tokio::io::stdin(), tokio::io::stdout())).await?; //! let client = ().serve((tokio::io::stdin(), tokio::io::stdout())).await?;
//! let tools = client.peer().list_tools(Default::default()).await?; //! let tools = client.peer().list_tools(Default::default()).await?;
@ -77,35 +74,26 @@ use crate::service::{RxJsonRpcMessage, ServiceRole, TxJsonRpcMessage};
pub mod sink_stream; pub mod sink_stream;
#[cfg(feature = "transport-async-rw")] #[cfg(feature = "transport-async-rw")]
#[cfg_attr(docsrs, doc(cfg(feature = "transport-async-rw")))]
pub mod async_rw; pub mod async_rw;
#[cfg(feature = "transport-worker")] #[cfg(feature = "transport-worker")]
#[cfg_attr(docsrs, doc(cfg(feature = "transport-worker")))]
pub mod worker; pub mod worker;
#[cfg(feature = "transport-worker")] #[cfg(feature = "transport-worker")]
#[cfg_attr(docsrs, doc(cfg(feature = "transport-worker")))]
pub use worker::WorkerTransport; pub use worker::WorkerTransport;
#[cfg(feature = "transport-child-process")] #[cfg(feature = "transport-child-process")]
#[cfg_attr(docsrs, doc(cfg(feature = "transport-child-process")))]
pub mod child_process; pub mod child_process;
#[cfg(feature = "transport-child-process")] #[cfg(feature = "transport-child-process")]
#[cfg_attr(docsrs, doc(cfg(feature = "transport-child-process")))]
pub use child_process::{ConfigureCommandExt, TokioChildProcess}; pub use child_process::{ConfigureCommandExt, TokioChildProcess};
#[cfg(feature = "transport-io")] #[cfg(feature = "transport-io")]
#[cfg_attr(docsrs, doc(cfg(feature = "transport-io")))]
pub mod io; pub mod io;
#[cfg(feature = "transport-io")] #[cfg(feature = "transport-io")]
#[cfg_attr(docsrs, doc(cfg(feature = "transport-io")))]
pub use io::stdio; pub use io::stdio;
#[cfg(feature = "auth")] #[cfg(feature = "auth")]
#[cfg_attr(docsrs, doc(cfg(feature = "auth")))]
pub mod auth; pub mod auth;
#[cfg(feature = "auth")] #[cfg(feature = "auth")]
#[cfg_attr(docsrs, doc(cfg(feature = "auth")))]
pub use auth::{ pub use auth::{
AuthClient, AuthError, AuthorizationManager, AuthorizationSession, AuthorizedHttpClient, AuthClient, AuthError, AuthorizationManager, AuthorizationSession, AuthorizedHttpClient,
CredentialStore, InMemoryCredentialStore, InMemoryStateStore, ScopeUpgradeConfig, StateStore, CredentialStore, InMemoryCredentialStore, InMemoryStateStore, ScopeUpgradeConfig, StateStore,
@ -113,20 +101,15 @@ pub use auth::{
}; };
// #[cfg(feature = "transport-ws")] // #[cfg(feature = "transport-ws")]
// #[cfg_attr(docsrs, doc(cfg(feature = "transport-ws")))]
// pub mod ws; // pub mod ws;
#[cfg(feature = "transport-streamable-http-server-session")] #[cfg(feature = "transport-streamable-http-server-session")]
#[cfg_attr(docsrs, doc(cfg(feature = "transport-streamable-http-server-session")))]
pub mod streamable_http_server; pub mod streamable_http_server;
#[cfg(feature = "transport-streamable-http-server")] #[cfg(feature = "transport-streamable-http-server")]
#[cfg_attr(docsrs, doc(cfg(feature = "transport-streamable-http-server")))]
pub use streamable_http_server::tower::{StreamableHttpServerConfig, StreamableHttpService}; pub use streamable_http_server::tower::{StreamableHttpServerConfig, StreamableHttpService};
#[cfg(feature = "transport-streamable-http-client")] #[cfg(feature = "transport-streamable-http-client")]
#[cfg_attr(docsrs, doc(cfg(feature = "transport-streamable-http-client")))]
pub mod streamable_http_client; pub mod streamable_http_client;
#[cfg(feature = "transport-streamable-http-client")] #[cfg(feature = "transport-streamable-http-client")]
#[cfg_attr(docsrs, doc(cfg(feature = "transport-streamable-http-client")))]
pub use streamable_http_client::StreamableHttpClientTransport; pub use streamable_http_client::StreamableHttpClientTransport;
/// Common use codes /// Common use codes

2
crates/rmcp/src/transport/async_rw.rs
View file

@ -68,7 +68,6 @@ where
} }
#[cfg(feature = "client")] #[cfg(feature = "client")]
#[cfg_attr(docsrs, doc(cfg(feature = "client")))]
impl<R, W> AsyncRwTransport<crate::RoleClient, R, W> impl<R, W> AsyncRwTransport<crate::RoleClient, R, W>
where where
R: Send + AsyncRead + Unpin, R: Send + AsyncRead + Unpin,
@ -80,7 +79,6 @@ where
} }
#[cfg(feature = "server")] #[cfg(feature = "server")]
#[cfg_attr(docsrs, doc(cfg(feature = "server")))]
impl<R, W> AsyncRwTransport<crate::RoleServer, R, W> impl<R, W> AsyncRwTransport<crate::RoleServer, R, W>
where where
R: Send + AsyncRead + Unpin, R: Send + AsyncRead + Unpin,

3
crates/rmcp/src/transport/common.rs
View file

@ -4,16 +4,13 @@ pub mod server_side_http;
pub mod http_header; pub mod http_header;
#[cfg(feature = "__reqwest")] #[cfg(feature = "__reqwest")]
#[cfg_attr(docsrs, doc(cfg(feature = "reqwest")))]
mod reqwest; mod reqwest;
// Note: This module provides SSE stream parsing and auto-reconnect utilities. // Note: This module provides SSE stream parsing and auto-reconnect utilities.
// It's used by the streamable HTTP client (which receives SSE-formatted responses), // It's used by the streamable HTTP client (which receives SSE-formatted responses),
// not the removed SSE transport. The name is historical. // not the removed SSE transport. The name is historical.
#[cfg(feature = "client-side-sse")] #[cfg(feature = "client-side-sse")]
#[cfg_attr(docsrs, doc(cfg(feature = "client-side-sse")))]
pub mod client_side_sse; pub mod client_side_sse;
#[cfg(feature = "auth")] #[cfg(feature = "auth")]
#[cfg_attr(docsrs, doc(cfg(feature = "auth")))]
pub mod auth; pub mod auth;

1
crates/rmcp/src/transport/common/auth.rs
View file

@ -1,3 +1,2 @@
#[cfg(feature = "transport-streamable-http-client")] #[cfg(feature = "transport-streamable-http-client")]
#[cfg_attr(docsrs, doc(cfg(feature = "transport-streamable-http-client")))]
mod streamable_http_client; mod streamable_http_client;

1
crates/rmcp/src/transport/common/reqwest.rs
View file

@ -1,3 +1,2 @@
#[cfg(feature = "transport-streamable-http-client-reqwest")] #[cfg(feature = "transport-streamable-http-client-reqwest")]
#[cfg_attr(docsrs, doc(cfg(feature = "transport-streamable-http-client-reqwest")))]
mod streamable_http_client; mod streamable_http_client;

1
crates/rmcp/src/transport/streamable_http_client.rs
View file

@ -70,7 +70,6 @@ pub enum StreamableHttpError<E: std::error::Error + Send + Sync + 'static> {
#[error("Missing session id in HTTP response")] #[error("Missing session id in HTTP response")]
MissingSessionIdInResponse, MissingSessionIdInResponse,
#[cfg(feature = "auth")] #[cfg(feature = "auth")]
#[cfg_attr(docsrs, doc(cfg(feature = "auth")))]
#[error("Auth error: {0}")] #[error("Auth error: {0}")]
Auth(#[from] crate::transport::auth::AuthError), Auth(#[from] crate::transport::auth::AuthError),
#[error("Auth required")] #[error("Auth required")]

2
crates/rmcp/src/transport/streamable_http_server.rs
View file

@ -1,8 +1,6 @@
pub mod session; pub mod session;
#[cfg(feature = "transport-streamable-http-server")] #[cfg(feature = "transport-streamable-http-server")]
#[cfg_attr(docsrs, doc(cfg(feature = "transport-streamable-http-server")))]
pub mod tower; pub mod tower;
pub use session::{SessionId, SessionManager}; pub use session::{SessionId, SessionManager};
#[cfg(feature = "transport-streamable-http-server")] #[cfg(feature = "transport-streamable-http-server")]
#[cfg_attr(docsrs, doc(cfg(feature = "transport-streamable-http-server")))]
pub use tower::{StreamableHttpServerConfig, StreamableHttpService}; pub use tower::{StreamableHttpServerConfig, StreamableHttpService};