Fix semantic mismerge (#9893)

jmpesp · web-flow · commit ec6d61be87d1 · 2026-02-21T01:52:32.000Z
diff --git a/nexus/lockstep-api/src/lib.rs b/nexus/lockstep-api/src/lib.rs
@@ -604,7 +604,7 @@ pub trait NexusLockstepApi {
     }]
     async fn trust_quorum_remove_sled(
         rqctx: RequestContext<Self::Context>,
-        path_params: Path<params::SledSelector>,
+        path_params: Path<SledSelector>,
     ) -> Result<HttpResponseOk<Epoch>, HttpError>;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -604,7 +604,7 @@ pub trait NexusLockstepApi {`
`604`	`604`	`}]`
`605`	`605`	`async fn trust_quorum_remove_sled(`
`606`	`606`	`rqctx: RequestContext<Self::Context>,`
`607`		`- path_params: Path<params::SledSelector>,`
	`607`	`+ path_params: Path<SledSelector>,`
`608`	`608`	`) -> Result<HttpResponseOk<Epoch>, HttpError>;`
`609`	`609`	`}`
`610`	`610`