From 879d015a936033a1a3052ce69d33b4cc293e5e27 Mon Sep 17 00:00:00 2001 From: Piotr Sikora Date: Thu, 24 Jun 2021 17:20:46 -0700 Subject: [PATCH] Avoid unnecessary borrowing. Found by clippy's needless_borrow check. Signed-off-by: Piotr Sikora --- src/hostcalls.rs | 10 +++++----- src/traits.rs | 32 ++++++++++++++++---------------- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/src/hostcalls.rs b/src/hostcalls.rs index 3df832c4..6e4e5db0 100644 --- a/src/hostcalls.rs +++ b/src/hostcalls.rs @@ -1002,7 +1002,7 @@ mod utils { } let mut bytes: Bytes = Vec::with_capacity(size); for part in &path { - bytes.extend_from_slice(&part.as_bytes()); + bytes.extend_from_slice(part.as_bytes()); bytes.push(0); } bytes.pop(); @@ -1021,9 +1021,9 @@ mod utils { bytes.extend_from_slice(&value.len().to_le_bytes()); } for (name, value) in &map { - bytes.extend_from_slice(&name.as_bytes()); + bytes.extend_from_slice(name.as_bytes()); bytes.push(0); - bytes.extend_from_slice(&value.as_bytes()); + bytes.extend_from_slice(value.as_bytes()); bytes.push(0); } bytes @@ -1041,9 +1041,9 @@ mod utils { bytes.extend_from_slice(&value.len().to_le_bytes()); } for (name, value) in &map { - bytes.extend_from_slice(&name.as_bytes()); + bytes.extend_from_slice(name.as_bytes()); bytes.push(0); - bytes.extend_from_slice(&value); + bytes.extend_from_slice(value); bytes.push(0); } bytes diff --git a/src/traits.rs b/src/traits.rs index 4553a0aa..75a6130e 100644 --- a/src/traits.rs +++ b/src/traits.rs @@ -83,7 +83,7 @@ pub trait Context { } fn get_http_call_response_header(&self, name: &str) -> Option { - hostcalls::get_map_value(MapType::HttpCallResponseHeaders, &name).unwrap() + hostcalls::get_map_value(MapType::HttpCallResponseHeaders, name).unwrap() } fn get_http_call_response_body(&self, start: usize, max_size: usize) -> Option { @@ -95,7 +95,7 @@ pub trait Context { } fn get_http_call_response_trailer(&self, name: &str) -> Option { - hostcalls::get_map_value(MapType::HttpCallResponseTrailers, &name).unwrap() + hostcalls::get_map_value(MapType::HttpCallResponseTrailers, name).unwrap() } fn dispatch_grpc_call( @@ -144,7 +144,7 @@ pub trait Context { } fn get_grpc_stream_initial_metadata_value(&self, name: &str) -> Option { - hostcalls::get_map_value_bytes(MapType::GrpcReceiveInitialMetadata, &name).unwrap() + hostcalls::get_map_value_bytes(MapType::GrpcReceiveInitialMetadata, name).unwrap() } fn send_grpc_stream_message(&self, token_id: u32, message: Option<&[u8]>, end_stream: bool) { @@ -164,7 +164,7 @@ pub trait Context { } fn get_grpc_stream_trailing_metadata_value(&self, name: &str) -> Option { - hostcalls::get_map_value_bytes(MapType::GrpcReceiveTrailingMetadata, &name).unwrap() + hostcalls::get_map_value_bytes(MapType::GrpcReceiveTrailingMetadata, name).unwrap() } fn cancel_grpc_stream(&self, token_id: u32) { @@ -276,15 +276,15 @@ pub trait HttpContext: Context { } fn get_http_request_header(&self, name: &str) -> Option { - hostcalls::get_map_value(MapType::HttpRequestHeaders, &name).unwrap() + hostcalls::get_map_value(MapType::HttpRequestHeaders, name).unwrap() } fn set_http_request_header(&self, name: &str, value: Option<&str>) { - hostcalls::set_map_value(MapType::HttpRequestHeaders, &name, value).unwrap() + hostcalls::set_map_value(MapType::HttpRequestHeaders, name, value).unwrap() } fn add_http_request_header(&self, name: &str, value: &str) { - hostcalls::add_map_value(MapType::HttpRequestHeaders, &name, value).unwrap() + hostcalls::add_map_value(MapType::HttpRequestHeaders, name, value).unwrap() } fn on_http_request_body(&mut self, _body_size: usize, _end_of_stream: bool) -> Action { @@ -312,15 +312,15 @@ pub trait HttpContext: Context { } fn get_http_request_trailer(&self, name: &str) -> Option { - hostcalls::get_map_value(MapType::HttpRequestTrailers, &name).unwrap() + hostcalls::get_map_value(MapType::HttpRequestTrailers, name).unwrap() } fn set_http_request_trailer(&self, name: &str, value: Option<&str>) { - hostcalls::set_map_value(MapType::HttpRequestTrailers, &name, value).unwrap() + hostcalls::set_map_value(MapType::HttpRequestTrailers, name, value).unwrap() } fn add_http_request_trailer(&self, name: &str, value: &str) { - hostcalls::add_map_value(MapType::HttpRequestTrailers, &name, value).unwrap() + hostcalls::add_map_value(MapType::HttpRequestTrailers, name, value).unwrap() } fn resume_http_request(&self) { @@ -340,15 +340,15 @@ pub trait HttpContext: Context { } fn get_http_response_header(&self, name: &str) -> Option { - hostcalls::get_map_value(MapType::HttpResponseHeaders, &name).unwrap() + hostcalls::get_map_value(MapType::HttpResponseHeaders, name).unwrap() } fn set_http_response_header(&self, name: &str, value: Option<&str>) { - hostcalls::set_map_value(MapType::HttpResponseHeaders, &name, value).unwrap() + hostcalls::set_map_value(MapType::HttpResponseHeaders, name, value).unwrap() } fn add_http_response_header(&self, name: &str, value: &str) { - hostcalls::add_map_value(MapType::HttpResponseHeaders, &name, value).unwrap() + hostcalls::add_map_value(MapType::HttpResponseHeaders, name, value).unwrap() } fn on_http_response_body(&mut self, _body_size: usize, _end_of_stream: bool) -> Action { @@ -376,15 +376,15 @@ pub trait HttpContext: Context { } fn get_http_response_trailer(&self, name: &str) -> Option { - hostcalls::get_map_value(MapType::HttpResponseTrailers, &name).unwrap() + hostcalls::get_map_value(MapType::HttpResponseTrailers, name).unwrap() } fn set_http_response_trailer(&self, name: &str, value: Option<&str>) { - hostcalls::set_map_value(MapType::HttpResponseTrailers, &name, value).unwrap() + hostcalls::set_map_value(MapType::HttpResponseTrailers, name, value).unwrap() } fn add_http_response_trailer(&self, name: &str, value: &str) { - hostcalls::add_map_value(MapType::HttpResponseTrailers, &name, value).unwrap() + hostcalls::add_map_value(MapType::HttpResponseTrailers, name, value).unwrap() } fn resume_http_response(&self) {