Skip to content

Avoid unnecessary borrowing. #112

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.

Sign up for GitHub

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
PiotrSikora merged 2 commits into from
Jul 1, 2021
Merged

Avoid unnecessary borrowing. #112

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
879d015
Avoid unnecessary borrowing.
PiotrSikora Jun 25, 2021
9970b92
Merge branch 'master' into needless_borrow
PiotrSikora Jul 1, 2021
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
10 changes: 5 additions & 5 deletions src/hostcalls.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1053,7 +1053,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();
Expand All @@ -1072,9 +1072,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
Expand All @@ -1092,9 +1092,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
Expand Down
32 changes: 16 additions & 16 deletions src/traits.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ pub trait Context {
}

fn get_http_call_response_header(&self, name: &str) -> Option<String> {
hostcalls::get_map_value(MapType::HttpCallResponseHeaders, &name).unwrap()
hostcalls::get_map_value(MapType::HttpCallResponseHeaders, name).unwrap()
}

fn get_http_call_response_header_bytes(&self, name: &str) -> Option<Bytes> {
Expand All @@ -107,7 +107,7 @@ pub trait Context {
}

fn get_http_call_response_trailer(&self, name: &str) -> Option<String> {
hostcalls::get_map_value(MapType::HttpCallResponseTrailers, &name).unwrap()
hostcalls::get_map_value(MapType::HttpCallResponseTrailers, name).unwrap()
}

fn get_http_call_response_trailer_bytes(&self, name: &str) -> Option<Bytes> {
Expand Down Expand Up @@ -160,7 +160,7 @@ pub trait Context {
}

fn get_grpc_stream_initial_metadata_value(&self, name: &str) -> Option<Bytes> {
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) {
Expand All @@ -180,7 +180,7 @@ pub trait Context {
}

fn get_grpc_stream_trailing_metadata_value(&self, name: &str) -> Option<Bytes> {
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) {
Expand Down Expand Up @@ -300,23 +300,23 @@ pub trait HttpContext: Context {
}

fn get_http_request_header(&self, name: &str) -> Option<String> {
hostcalls::get_map_value(MapType::HttpRequestHeaders, &name).unwrap()
hostcalls::get_map_value(MapType::HttpRequestHeaders, name).unwrap()
}

fn get_http_request_header_bytes(&self, name: &str) -> Option<Bytes> {
hostcalls::get_map_value_bytes(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 set_http_request_header_bytes(&self, name: &str, value: Option<&[u8]>) {
hostcalls::set_map_value_bytes(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 add_http_request_header_bytes(&self, name: &str, value: &[u8]) {
Expand Down Expand Up @@ -356,23 +356,23 @@ pub trait HttpContext: Context {
}

fn get_http_request_trailer(&self, name: &str) -> Option<String> {
hostcalls::get_map_value(MapType::HttpRequestTrailers, &name).unwrap()
hostcalls::get_map_value(MapType::HttpRequestTrailers, name).unwrap()
}

fn get_http_request_trailer_bytes(&self, name: &str) -> Option<Bytes> {
hostcalls::get_map_value_bytes(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 set_http_request_trailer_bytes(&self, name: &str, value: Option<&[u8]>) {
hostcalls::set_map_value_bytes(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 add_http_request_trailer_bytes(&self, name: &str, value: &[u8]) {
Expand Down Expand Up @@ -404,23 +404,23 @@ pub trait HttpContext: Context {
}

fn get_http_response_header(&self, name: &str) -> Option<String> {
hostcalls::get_map_value(MapType::HttpResponseHeaders, &name).unwrap()
hostcalls::get_map_value(MapType::HttpResponseHeaders, name).unwrap()
}

fn get_http_response_header_bytes(&self, name: &str) -> Option<Bytes> {
hostcalls::get_map_value_bytes(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 set_http_response_header_bytes(&self, name: &str, value: Option<&[u8]>) {
hostcalls::set_map_value_bytes(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 add_http_response_header_bytes(&self, name: &str, value: &[u8]) {
Expand Down Expand Up @@ -460,23 +460,23 @@ pub trait HttpContext: Context {
}

fn get_http_response_trailer(&self, name: &str) -> Option<String> {
hostcalls::get_map_value(MapType::HttpResponseTrailers, &name).unwrap()
hostcalls::get_map_value(MapType::HttpResponseTrailers, name).unwrap()
}

fn get_http_response_trailer_bytes(&self, name: &str) -> Option<Bytes> {
hostcalls::get_map_value_bytes(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 set_http_response_trailer_bytes(&self, name: &str, value: Option<&[u8]>) {
hostcalls::set_map_value_bytes(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 add_http_response_trailer_bytes(&self, name: &str, value: &[u8]) {
Expand Down