test(client): fix extra semi-colon warning in helper macro

This commit is contained in:
Sean McArthur
2021-08-04 10:40:33 -07:00
parent 54b57c4797
commit 9d253d3168
2 changed files with 10 additions and 10 deletions

View File

@@ -344,11 +344,11 @@ macro_rules! __client_req_prop {
} }
macro_rules! __client_req_header { macro_rules! __client_req_header {
($req_builder:ident, { $($name:expr => $val:expr,)* }) => { ($req_builder:ident, { $($name:expr => $val:expr,)* }) => {{
$( $(
$req_builder = $req_builder.header($name, $val); $req_builder = $req_builder.header($name, $val);
)* )*
} }}
} }
static REPLY_OK: &str = "HTTP/1.1 200 OK\r\nContent-Length: 0\r\n\r\n"; static REPLY_OK: &str = "HTTP/1.1 200 OK\r\nContent-Length: 0\r\n\r\n";

View File

@@ -177,7 +177,7 @@ macro_rules! __internal_eq_prop {
(headers: $map:tt) => {{ (headers: $map:tt) => {{
#[allow(unused_mut)] #[allow(unused_mut)]
{ {
let mut headers = Vec::new(); let mut headers = Vec::<std::sync::Arc<dyn Fn(&hyper::HeaderMap) + Send + Sync>>::new();
__internal_headers_eq!(headers, $map); __internal_headers_eq!(headers, $map);
headers headers
} }
@@ -216,12 +216,12 @@ macro_rules! __internal_headers_eq {
} }
}) as std::sync::Arc<dyn Fn(&hyper::HeaderMap) + Send + Sync> }) as std::sync::Arc<dyn Fn(&hyper::HeaderMap) + Send + Sync>
}; };
(@val $name: expr, NONE) => { (@val $name: expr, NONE) => {{
__internal_headers_eq!(@pat $name, None); __internal_headers_eq!(@pat $name, None);
}; }};
(@val $name: expr, SOME) => { (@val $name: expr, SOME) => {{
__internal_headers_eq!(@pat $name, Some(_)); __internal_headers_eq!(@pat $name, Some(_))
}; }};
(@val $name: expr, $val:expr) => ({ (@val $name: expr, $val:expr) => ({
let __val = Option::from($val); let __val = Option::from($val);
std::sync::Arc::new(move |__hdrs: &hyper::HeaderMap| { std::sync::Arc::new(move |__hdrs: &hyper::HeaderMap| {
@@ -232,11 +232,11 @@ macro_rules! __internal_headers_eq {
} }
}) as std::sync::Arc<dyn Fn(&hyper::HeaderMap) + Send + Sync> }) as std::sync::Arc<dyn Fn(&hyper::HeaderMap) + Send + Sync>
}); });
($headers:ident, { $($name:expr => $val:tt,)* }) => { ($headers:ident, { $($name:expr => $val:tt,)* }) => {{
$( $(
$headers.push(__internal_headers_eq!(@val $name, $val)); $headers.push(__internal_headers_eq!(@val $name, $val));
)* )*
} }}
} }
#[derive(Clone, Debug)] #[derive(Clone, Debug)]