From 9d253d31683e1c767f7e8c9a27f29f27f24c7fe5 Mon Sep 17 00:00:00 2001 From: Sean McArthur Date: Wed, 4 Aug 2021 10:40:33 -0700 Subject: [PATCH] test(client): fix extra semi-colon warning in helper macro --- tests/client.rs | 4 ++-- tests/support/mod.rs | 16 ++++++++-------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/tests/client.rs b/tests/client.rs index 3eb6dd90..a2fdcc0c 100644 --- a/tests/client.rs +++ b/tests/client.rs @@ -344,11 +344,11 @@ macro_rules! __client_req_prop { } 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); )* - } + }} } static REPLY_OK: &str = "HTTP/1.1 200 OK\r\nContent-Length: 0\r\n\r\n"; diff --git a/tests/support/mod.rs b/tests/support/mod.rs index 56ed8391..6b3c8f44 100644 --- a/tests/support/mod.rs +++ b/tests/support/mod.rs @@ -177,7 +177,7 @@ macro_rules! __internal_eq_prop { (headers: $map:tt) => {{ #[allow(unused_mut)] { - let mut headers = Vec::new(); + let mut headers = Vec::>::new(); __internal_headers_eq!(headers, $map); headers } @@ -216,12 +216,12 @@ macro_rules! __internal_headers_eq { } }) as std::sync::Arc }; - (@val $name: expr, NONE) => { + (@val $name: expr, NONE) => {{ __internal_headers_eq!(@pat $name, None); - }; - (@val $name: expr, SOME) => { - __internal_headers_eq!(@pat $name, Some(_)); - }; + }}; + (@val $name: expr, SOME) => {{ + __internal_headers_eq!(@pat $name, Some(_)) + }}; (@val $name: expr, $val:expr) => ({ let __val = Option::from($val); std::sync::Arc::new(move |__hdrs: &hyper::HeaderMap| { @@ -232,11 +232,11 @@ macro_rules! __internal_headers_eq { } }) as std::sync::Arc }); - ($headers:ident, { $($name:expr => $val:tt,)* }) => { + ($headers:ident, { $($name:expr => $val:tt,)* }) => {{ $( $headers.push(__internal_headers_eq!(@val $name, $val)); )* - } + }} } #[derive(Clone, Debug)]