Skip to content

chore: fix typos #79

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.

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
merged 1 commit into from
Apr 1, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
14 changes: 7 additions & 7 deletions crates/rmcp-macros/src/tool.rs
Original file line number Diff line number Diff line change
Expand Up @@ -360,7 +360,7 @@ pub(crate) fn tool_fn_item(attr: TokenStream, mut input_fn: ItemFn) -> syn::Resu
// async fn #tool_tool_call(context: rmcp::handler::server::tool::ToolCallContext<'_, Self>)
// -> std::result::Result<rmcp::model::CallToolResult, rmcp::Error>
//
// and the block part shoule be like:
// and the block part should be like:
// {
// use rmcp::handler::server::tool::*;
// let (t0, context) = <T0>::from_tool_call_context_part(context)?;
Expand All @@ -383,8 +383,8 @@ pub(crate) fn tool_fn_item(attr: TokenStream, mut input_fn: ItemFn) -> syn::Resu
// for receiver type, name it as __rmcp_tool_receiver
let is_async = input_fn.sig.asyncness.is_some();
let receiver_ident = || Ident::new("__rmcp_tool_receiver", proc_macro2::Span::call_site());
// generate the extraction part for trival args
let trival_args = input_fn
// generate the extraction part for trivial args
let trivial_args = input_fn
.sig
.inputs
.iter()
Expand Down Expand Up @@ -413,8 +413,8 @@ pub(crate) fn tool_fn_item(attr: TokenStream, mut input_fn: ItemFn) -> syn::Resu
Some(line)
}
});
let trival_argrextraction_part = quote! {
#(#trival_args)*
let trivial_argrextraction_part = quote! {
#(#trivial_args)*
};
let processed_argrextraction_part = match &mut tool_macro_attrs.params {
ToolParams::Aggregated { rust_type } => {
Expand All @@ -441,7 +441,7 @@ pub(crate) fn tool_fn_item(attr: TokenStream, mut input_fn: ItemFn) -> syn::Resu
}
};
// generate the execution part
// has reveiver?
// has receiver?
let params = &input_fn
.sig
.inputs
Expand Down Expand Up @@ -487,7 +487,7 @@ pub(crate) fn tool_fn_item(attr: TokenStream, mut input_fn: ItemFn) -> syn::Resu
#raw_fn_vis async fn #tool_call_fn_ident(context: rmcp::handler::server::tool::ToolCallContext<'_, Self>)
-> std::result::Result<rmcp::model::CallToolResult, rmcp::Error> {
use rmcp::handler::server::tool::*;
#trival_argrextraction_part
#trivial_argrextraction_part
#processed_argrextraction_part
#call
}
Expand Down
4 changes: 2 additions & 2 deletions crates/rmcp/tests/test_complex_schema.rs
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ impl Demo {
fn test_complex_schema() {
let attr = Demo::chat_tool_attr();
let input_schema = attr.input_schema;
let enum_numer = input_schema
let enum_number = input_schema
.get("definitions")
.unwrap()
.as_object()
Expand All @@ -58,6 +58,6 @@ fn test_complex_schema() {
.as_array()
.unwrap()
.len();
assert_eq!(enum_numer, 4);
assert_eq!(enum_number, 4);
println!("{}", serde_json::to_string_pretty(&input_schema).unwrap());
}
2 changes: 1 addition & 1 deletion examples/rig-integration/src/config.rs
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ pub struct Config {
}

impl Config {
pub async fn retrive(path: impl AsRef<Path>) -> anyhow::Result<Self> {
pub async fn retrieve(path: impl AsRef<Path>) -> anyhow::Result<Self> {
let content = tokio::fs::read_to_string(path).await?;
let config: Self = toml::from_str(&content)?;
Ok(config)
Expand Down
2 changes: 1 addition & 1 deletion examples/rig-integration/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ pub mod config;
pub mod mcp_adaptor;
#[tokio::main]
async fn main() -> anyhow::Result<()> {
let config = config::Config::retrive("config.toml").await?;
let config = config::Config::retrieve("config.toml").await?;
let openai_client = {
if let Some(key) = config.deepseek_key {
deepseek::Client::new(&key)
Expand Down
4 changes: 2 additions & 2 deletions examples/servers/src/common/calculator.rs
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,14 @@ impl Calculator {
(a + b).to_string()
}

#[tool(description = "Calculate the sum of two numbers")]
#[tool(description = "Calculate the sub of two numbers")]
fn sub(
&self,
#[tool(param)]
#[schemars(description = "the left hand side number")]
a: i32,
#[tool(param)]
#[schemars(description = "the left hand side number")]
#[schemars(description = "the right hand side number")]
b: i32,
) -> Json<i32> {
Json(a - b)
Expand Down
2 changes: 1 addition & 1 deletion examples/servers/src/common/counter.rs
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ impl ServerHandler for Counter {
next_cursor: None,
prompts: vec![Prompt::new(
"example_prompt",
Some("This is an example prompt that takes one required agrument, message"),
Some("This is an example prompt that takes one required argument, message"),
Some(vec![PromptArgument {
name: "message".to_string(),
description: Some("A message to put in the prompt".to_string()),
Expand Down