fix(conflict): edit concflict and correction

Author: Rayato159

.github/workflows/ci.yml

@@ -97,6 +97,41 @@ jobs:
 
       - name: Run tests
         run: cargo test --all-features
+  
+  coverage:
+    name: Code Coverage
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+
+      # install nodejs
+      - name: Setup Node.js
+        uses: actions/setup-node@v3
+        with:
+          node-version: '20'
+          
+      - name: Install uv
+        uses: astral-sh/setup-uv@v5
+        
+      - name: Install Rust
+        uses: dtolnay/rust-toolchain@stable
+        
+      - name: Set up Python
+        run: uv python install
+        
+      - name: Create venv for python
+        run: uv venv
+
+      - uses: Swatinem/rust-cache@v2
+
+      - name: Install cargo-llvm-cov
+        run: cargo install cargo-llvm-cov
+
+      - name: Install llvm-tools-preview
+        run: rustup component add llvm-tools-preview
+
+      - name: Run tests with coverage
+        run: cargo llvm-cov --all-features
 
   doc:
     name: Generate Documentation

crates/rmcp-macros/src/tool.rs

@@ -4,7 +4,7 @@ use proc_macro2::TokenStream;
 use quote::{ToTokens, quote};
 use syn::{
     Expr, FnArg, Ident, ItemFn, ItemImpl, MetaList, PatType, Token, Type, Visibility, parse::Parse,
-    parse_quote,
+    parse_quote, spanned::Spanned,
 };
 
 #[derive(Default)]
@@ -21,6 +21,7 @@ impl Parse for ToolImplItemAttrs {
                 "tool_box" => {
                     tool_box = Some(None);
                     if input.lookahead1().peek(Token![=]) {
+                        input.parse::<Token![=]>()?;
                         let value: Ident = input.parse()?;
                         tool_box = Some(Some(value));
                     }
@@ -224,6 +225,11 @@ pub(crate) fn tool_impl_item(attr: TokenStream, mut input: ItemImpl) -> syn::Res
                     rmcp::tool_box!(@derive #ident);
                 ));
             }
+        } else {
+            return Err(syn::Error::new(
+                proc_macro2::Span::call_site(),
+                "tool_box attribute is required for trait implementation",
+            ));
         }
     } else if let Some(ident) = tool_box_ident {
         // if it is a normal impl block
@@ -367,6 +373,12 @@ pub(crate) fn tool_fn_item(attr: TokenStream, mut input_fn: ItemFn) -> syn::Resu
                         unextractable_args_indexes.insert(index);
                     }
                     Some(Caught::Aggregated(rust_type)) => {
+                        if let ToolParams::Params { .. } = tool_macro_attrs.params {
+                            return Err(syn::Error::new(
+                                rust_type.span(),
+                                "cannot mix aggregated and individual parameters",
+                            ));
+                        }
                         tool_macro_attrs.params = ToolParams::Aggregated { rust_type };
                         unextractable_args_indexes.insert(index);
                     }
@@ -626,10 +638,12 @@ mod test {
 
     #[test]
     fn test_trait_tool_macro() -> syn::Result<()> {
-        let attr = quote! {};
+        let attr = quote! {
+            tool_box = Calculator
+        };
         let input = quote! {
             impl ServerHandler for Calculator {
-                tool_box!(@derive);
+                #[tool]
                 fn get_info(&self) -> ServerInfo {
                     ServerInfo {
                         instructions: Some("A simple calculator".into()),

examples/README.md

@@ -6,11 +6,11 @@
    cargo build --release --example servers_std_io
    ```
 
-   This builds a standard input/output MCP server binary.
+    This builds a standard input/output MCP server binary.
 
 2. **Add or update this section in your** `PATH-TO/claude_desktop_config.json`
 
-   **Windows**
+    Windows
 
    ```json
    {
@@ -23,7 +23,7 @@
    }
    ```
 
-   **McOS/Linux**
+   McOS/Linux
 
    ```json
    {
@@ -36,16 +36,19 @@
    }
    ```
 
-3. **Once Claude Desktop is running, try chatting:**
-   ```text
-   counter.say_hello
-   ```
+3. **Ensure that the MCP UI elements appear in Claude Desktop**
+   The MCP UI elements will only show up in Claude for Desktop if at least one server is properly configured.
+
+4. **Once Claude Desktop is running, try chatting:**
+   `text
+counter.say_hello
+`
    Or test other tools like:
-   ```text
-   counter.increment
-   counter.get_value
-   counter.sum {"a": 3, "b": 4}
-   ```
+   `text
+counter.increment
+counter.get_value
+counter.sum {"a": 3, "b": 4}
+`
 
 # Client Examples