From b1ed231ed23f80e1ff7ab2d8ab3590e3f5895bbe Mon Sep 17 00:00:00 2001 From: Shannon Sterz Date: Tue, 4 Mar 2025 15:42:28 +0100 Subject: [PATCH] rest-server: borrow parts parameter in `get_request_parameter` this function does not require ownership of the parts parameter, so we can simply borrow it. this way we can pass the parameter on to a handler that consumes them even when using `get_request_parameter` Signed-off-by: Shannon Sterz --- proxmox-rest-server/src/rest.rs | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/proxmox-rest-server/src/rest.rs b/proxmox-rest-server/src/rest.rs index d23ed776..78339b75 100644 --- a/proxmox-rest-server/src/rest.rs +++ b/proxmox-rest-server/src/rest.rs @@ -383,7 +383,7 @@ fn parse_query_parameters( async fn get_request_parameters( param_schema: ParameterSchema, - parts: Parts, + parts: &Parts, req_body: Body, uri_param: HashMap, ) -> Result { @@ -433,7 +433,7 @@ async fn get_request_parameters( param_schema.verify_json(¶ms)?; Ok(params) } else { - parse_query_parameters(param_schema, utf8_data, &parts, &uri_param) + parse_query_parameters(param_schema, utf8_data, parts, &uri_param) } } @@ -548,7 +548,7 @@ pub(crate) async fn handle_api_request { let params = - get_request_parameters(info.parameters, parts, req_body, uri_param).await?; + get_request_parameters(info.parameters, &parts, req_body, uri_param).await?; match (handler)(params, info, &mut rpcenv) { Ok(iter) if accept_json_seq => handle_sync_stream_as_json_seq(iter), Ok(iter) => iter @@ -559,7 +559,7 @@ pub(crate) async fn handle_api_request { let params = - get_request_parameters(info.parameters, parts, req_body, uri_param).await?; + get_request_parameters(info.parameters, &parts, req_body, uri_param).await?; match (handler)(params, info, &mut rpcenv).await { Ok(stream) if accept_json_seq => handle_stream_as_json_seq(stream), Ok(stream) => stream @@ -571,25 +571,25 @@ pub(crate) async fn handle_api_request { let params = - get_request_parameters(info.parameters, parts, req_body, uri_param).await?; + get_request_parameters(info.parameters, &parts, req_body, uri_param).await?; (handler)(params, info, &mut rpcenv) .and_then(|data| formatter.format_data_streaming(data, &rpcenv)) } ApiHandler::SerializingAsync(handler) => { let params = - get_request_parameters(info.parameters, parts, req_body, uri_param).await?; + get_request_parameters(info.parameters, &parts, req_body, uri_param).await?; (handler)(params, info, &mut rpcenv) .await .and_then(|data| formatter.format_data_streaming(data, &rpcenv)) } ApiHandler::Sync(handler) => { let params = - get_request_parameters(info.parameters, parts, req_body, uri_param).await?; + get_request_parameters(info.parameters, &parts, req_body, uri_param).await?; (handler)(params, info, &mut rpcenv).map(|data| formatter.format_data(data, &rpcenv)) } ApiHandler::Async(handler) => { let params = - get_request_parameters(info.parameters, parts, req_body, uri_param).await?; + get_request_parameters(info.parameters, &parts, req_body, uri_param).await?; (handler)(params, info, &mut rpcenv) .await .map(|data| formatter.format_data(data, &rpcenv))