style: fmt the project (#54)

add rustfmt.toml

Signed-off-by: jokemanfire <[email protected]>

Author: jokemanfire

.github/workflows/ci.yml

@@ -41,11 +41,11 @@ jobs:
     steps:
       - uses: actions/checkout@v3
 
-      - name: Install Rust
-        uses: dtolnay/rust-toolchain@stable
+      - name: Install Rust fmt
+        run: rustup toolchain install nightly --component rustfmt
 
       - name: Check formatting
-        run: cargo fmt --all -- --check
+        run: cargo +nightly fmt --all -- --check
 
   clippy:
     name: Lint with Clippy

Cargo.toml

@@ -1,3 +1,5 @@
+cargo-features = ["edition2024"]
+
 [workspace]
 members = ["crates/rmcp", "crates/rmcp-macros", "examples/*"]
 resolver = "2"
@@ -12,7 +14,7 @@ version = "0.1.5"
 authors = ["4t145 <[email protected]>"]
 license = "MIT/Apache-2.0"
 repository = "https://github.com/modelcontextprotocol/rust-sdk/"
-description = "Rust SDK for the Model Context Protocol"
+description = "Rust SDK for Model Context Protocol"
 keywords = ["mcp", "sdk", "tokio", "modelcontextprotocol"]
 homepage = "https://github.com/modelcontextprotocol/rust-sdk"
 categories = [

crates/rmcp-macros/Cargo.toml

@@ -1,11 +1,13 @@
+cargo-features = ["edition2024"]
+
 [package]
 name = "rmcp-macros"
-license.workspace = true
-version.workspace = true
-edition.workspace = true
-repository.workspace = true
-homepage.workspace = true
-readme.workspace = true
+license = { workspace = true }
+version = { workspace = true }
+edition = { workspace = true }
+repository = { workspace = true }
+homepage = { workspace = true }
+readme = { workspace = true }
 description = "Rust SDK for Model Context Protocol macros library"
 documentation = "https://docs.rs/rmcp-macros"
 

crates/rmcp/Cargo.toml

@@ -1,11 +1,13 @@
+cargo-features = ["edition2024"]
+
 [package]
 name = "rmcp"
-license.workspace = true
-version.workspace = true
-edition.workspace = true
-repository.workspace = true
-homepage.workspace = true
-readme.workspace = true
+license = { workspace = true }
+version = { workspace = true }
+edition = { workspace = true }
+repository = { workspace = true }
+homepage = { workspace = true }
+readme = { workspace = true }
 description = "Rust SDK for Model Context Protocol"
 documentation = "https://docs.rs/rmcp"
 

crates/rmcp/src/handler/client.rs

@@ -1,6 +1,8 @@
-use crate::error::Error as McpError;
-use crate::model::*;
-use crate::service::{Peer, RequestContext, RoleClient, Service, ServiceRole};
+use crate::{
+    error::Error as McpError,
+    model::*,
+    service::{Peer, RequestContext, RoleClient, Service, ServiceRole},
+};
 
 impl<H: ClientHandler> Service<RoleClient> for H {
     async fn handle_request(

crates/rmcp/src/handler/server.rs

@@ -1,6 +1,8 @@
-use crate::error::Error as McpError;
-use crate::model::*;
-use crate::service::{Peer, RequestContext, RoleServer, Service, ServiceRole};
+use crate::{
+    error::Error as McpError,
+    model::*,
+    service::{Peer, RequestContext, RoleServer, Service, ServiceRole},
+};
 
 mod resource;
 pub mod tool;

crates/rmcp/src/lib.rs

@@ -6,28 +6,26 @@ pub use error::Error;
 pub mod model;
 #[cfg(any(feature = "client", feature = "server"))]
 pub mod service;
+#[cfg(feature = "client")]
+pub use handler::client::ClientHandler;
+#[cfg(feature = "server")]
+pub use handler::server::ServerHandler;
 #[cfg(any(feature = "client", feature = "server"))]
 pub use service::{Peer, Service, ServiceError, ServiceExt};
 #[cfg(feature = "client")]
 pub use service::{RoleClient, serve_client};
 #[cfg(feature = "server")]
 pub use service::{RoleServer, serve_server};
 
-#[cfg(feature = "client")]
-pub use handler::client::ClientHandler;
-#[cfg(feature = "server")]
-pub use handler::server::ServerHandler;
-
 pub mod handler;
 pub mod transport;
 
-#[cfg(all(feature = "macros", feature = "server"))]
-pub use rmcp_macros::tool;
-
 // re-export
 #[cfg(all(feature = "macros", feature = "server"))]
 pub use paste::paste;
 #[cfg(all(feature = "macros", feature = "server"))]
+pub use rmcp_macros::tool;
+#[cfg(all(feature = "macros", feature = "server"))]
 pub use schemars;
 #[cfg(feature = "macros")]
 pub use serde;

crates/rmcp/src/model.rs

@@ -11,7 +11,6 @@ pub use capabilities::*;
 pub use content::*;
 pub use prompt::*;
 pub use resource::*;
-
 use serde::{Deserialize, Serialize};
 use serde_json::Value;
 pub use tool::*;
@@ -964,9 +963,10 @@ impl From<CancelledNotification> for ClientNotification {
 
 #[cfg(test)]
 mod tests {
-    use super::*;
     use serde_json::json;
 
+    use super::*;
+
     #[test]
     fn test_notification_serde() {
         let raw = json!( {

crates/rmcp/src/model/annotated.rs

@@ -1,11 +1,12 @@
 use std::ops::{Deref, DerefMut};
 
+use chrono::{DateTime, Utc};
+use serde::{Deserialize, Serialize};
+
 use super::{
     RawContent, RawEmbeddedResource, RawImageContent, RawResource, RawResourceTemplate,
     RawTextContent, Role,
 };
-use chrono::{DateTime, Utc};
-use serde::{Deserialize, Serialize};
 
 #[derive(Debug, Clone, PartialEq, Serialize, Deserialize, Default)]
 #[serde(rename_all = "camelCase")]

crates/rmcp/src/model/capabilities.rs

@@ -1,8 +1,9 @@
-use super::JsonObject;
+use std::{collections::BTreeMap, marker::PhantomData};
+
 use paste::paste;
 use serde::{Deserialize, Serialize};
-use std::collections::BTreeMap;
-use std::marker::PhantomData;
+
+use super::JsonObject;
 pub type ExperimentalCapabilities = BTreeMap<String, JsonObject>;
 
 #[derive(Debug, Serialize, Deserialize, Clone, PartialEq, Default)]