Skip to content

Commit bd8e6b7

Browse files
committed
fix: update wrapper macros to use new *Params type names
1 parent dbaab65 commit bd8e6b7

File tree

2 files changed

+19
-19
lines changed

2 files changed

+19
-19
lines changed

crates/rmcp/src/handler/client.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -225,7 +225,7 @@ macro_rules! impl_client_handler_for_wrapper {
225225

226226
fn create_message(
227227
&self,
228-
params: CreateMessageRequestParam,
228+
params: CreateMessageRequestParams,
229229
context: RequestContext<RoleClient>,
230230
) -> impl Future<Output = Result<CreateMessageResult, McpError>> + Send + '_ {
231231
(**self).create_message(params, context)
@@ -240,7 +240,7 @@ macro_rules! impl_client_handler_for_wrapper {
240240

241241
fn create_elicitation(
242242
&self,
243-
request: CreateElicitationRequestParam,
243+
request: CreateElicitationRequestParams,
244244
context: RequestContext<RoleClient>,
245245
) -> impl Future<Output = Result<CreateElicitationResult, McpError>> + Send + '_ {
246246
(**self).create_elicitation(request, context)

crates/rmcp/src/handler/server.rs

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -335,7 +335,7 @@ macro_rules! impl_server_handler_for_wrapper {
335335
impl<T: ServerHandler> ServerHandler for $wrapper<T> {
336336
fn enqueue_task(
337337
&self,
338-
request: CallToolRequestParam,
338+
request: CallToolRequestParams,
339339
context: RequestContext<RoleServer>,
340340
) -> impl Future<Output = Result<CreateTaskResult, McpError>> + Send + '_ {
341341
(**self).enqueue_task(request, context)
@@ -350,55 +350,55 @@ macro_rules! impl_server_handler_for_wrapper {
350350

351351
fn initialize(
352352
&self,
353-
request: InitializeRequestParam,
353+
request: InitializeRequestParams,
354354
context: RequestContext<RoleServer>,
355355
) -> impl Future<Output = Result<InitializeResult, McpError>> + Send + '_ {
356356
(**self).initialize(request, context)
357357
}
358358

359359
fn complete(
360360
&self,
361-
request: CompleteRequestParam,
361+
request: CompleteRequestParams,
362362
context: RequestContext<RoleServer>,
363363
) -> impl Future<Output = Result<CompleteResult, McpError>> + Send + '_ {
364364
(**self).complete(request, context)
365365
}
366366

367367
fn set_level(
368368
&self,
369-
request: SetLevelRequestParam,
369+
request: SetLevelRequestParams,
370370
context: RequestContext<RoleServer>,
371371
) -> impl Future<Output = Result<(), McpError>> + Send + '_ {
372372
(**self).set_level(request, context)
373373
}
374374

375375
fn get_prompt(
376376
&self,
377-
request: GetPromptRequestParam,
377+
request: GetPromptRequestParams,
378378
context: RequestContext<RoleServer>,
379379
) -> impl Future<Output = Result<GetPromptResult, McpError>> + Send + '_ {
380380
(**self).get_prompt(request, context)
381381
}
382382

383383
fn list_prompts(
384384
&self,
385-
request: Option<PaginatedRequestParam>,
385+
request: Option<PaginatedRequestParams>,
386386
context: RequestContext<RoleServer>,
387387
) -> impl Future<Output = Result<ListPromptsResult, McpError>> + Send + '_ {
388388
(**self).list_prompts(request, context)
389389
}
390390

391391
fn list_resources(
392392
&self,
393-
request: Option<PaginatedRequestParam>,
393+
request: Option<PaginatedRequestParams>,
394394
context: RequestContext<RoleServer>,
395395
) -> impl Future<Output = Result<ListResourcesResult, McpError>> + Send + '_ {
396396
(**self).list_resources(request, context)
397397
}
398398

399399
fn list_resource_templates(
400400
&self,
401-
request: Option<PaginatedRequestParam>,
401+
request: Option<PaginatedRequestParams>,
402402
context: RequestContext<RoleServer>,
403403
) -> impl Future<Output = Result<ListResourceTemplatesResult, McpError>> + Send + '_
404404
{
@@ -407,39 +407,39 @@ macro_rules! impl_server_handler_for_wrapper {
407407

408408
fn read_resource(
409409
&self,
410-
request: ReadResourceRequestParam,
410+
request: ReadResourceRequestParams,
411411
context: RequestContext<RoleServer>,
412412
) -> impl Future<Output = Result<ReadResourceResult, McpError>> + Send + '_ {
413413
(**self).read_resource(request, context)
414414
}
415415

416416
fn subscribe(
417417
&self,
418-
request: SubscribeRequestParam,
418+
request: SubscribeRequestParams,
419419
context: RequestContext<RoleServer>,
420420
) -> impl Future<Output = Result<(), McpError>> + Send + '_ {
421421
(**self).subscribe(request, context)
422422
}
423423

424424
fn unsubscribe(
425425
&self,
426-
request: UnsubscribeRequestParam,
426+
request: UnsubscribeRequestParams,
427427
context: RequestContext<RoleServer>,
428428
) -> impl Future<Output = Result<(), McpError>> + Send + '_ {
429429
(**self).unsubscribe(request, context)
430430
}
431431

432432
fn call_tool(
433433
&self,
434-
request: CallToolRequestParam,
434+
request: CallToolRequestParams,
435435
context: RequestContext<RoleServer>,
436436
) -> impl Future<Output = Result<CallToolResult, McpError>> + Send + '_ {
437437
(**self).call_tool(request, context)
438438
}
439439

440440
fn list_tools(
441441
&self,
442-
request: Option<PaginatedRequestParam>,
442+
request: Option<PaginatedRequestParams>,
443443
context: RequestContext<RoleServer>,
444444
) -> impl Future<Output = Result<ListToolsResult, McpError>> + Send + '_ {
445445
(**self).list_tools(request, context)
@@ -497,31 +497,31 @@ macro_rules! impl_server_handler_for_wrapper {
497497

498498
fn list_tasks(
499499
&self,
500-
request: Option<PaginatedRequestParam>,
500+
request: Option<PaginatedRequestParams>,
501501
context: RequestContext<RoleServer>,
502502
) -> impl Future<Output = Result<ListTasksResult, McpError>> + Send + '_ {
503503
(**self).list_tasks(request, context)
504504
}
505505

506506
fn get_task_info(
507507
&self,
508-
request: GetTaskInfoParam,
508+
request: GetTaskInfoParams,
509509
context: RequestContext<RoleServer>,
510510
) -> impl Future<Output = Result<GetTaskInfoResult, McpError>> + Send + '_ {
511511
(**self).get_task_info(request, context)
512512
}
513513

514514
fn get_task_result(
515515
&self,
516-
request: GetTaskResultParam,
516+
request: GetTaskResultParams,
517517
context: RequestContext<RoleServer>,
518518
) -> impl Future<Output = Result<TaskResult, McpError>> + Send + '_ {
519519
(**self).get_task_result(request, context)
520520
}
521521

522522
fn cancel_task(
523523
&self,
524-
request: CancelTaskParam,
524+
request: CancelTaskParams,
525525
context: RequestContext<RoleServer>,
526526
) -> impl Future<Output = Result<(), McpError>> + Send + '_ {
527527
(**self).cancel_task(request, context)

0 commit comments

Comments
 (0)