Skip to content
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

Temporary workaround for compiler bugs in impl Trait feature. #91

Merged
merged 1 commit into from
Feb 2, 2017
Merged

Temporary workaround for compiler bugs in impl Trait feature. #91

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
33 changes: 24 additions & 9 deletions src/macros.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -268,9 +268,10 @@ macro_rules! service {
)*
) => {

#[doc(hidden)]
#[allow(non_camel_case_types, unused)]
#[derive(Debug)]
enum tarpc_service_Request__ {
pub enum tarpc_service_Request__ {
NotIrrefutable(()),
$(
$fn_name(( $($in_,)* ))
Expand All @@ -280,9 +281,10 @@ macro_rules! service {
impl_deserialize!(tarpc_service_Request__, NotIrrefutable(()) $($fn_name(($($in_),*)))*);
impl_serialize!(tarpc_service_Request__, {}, NotIrrefutable(()) $($fn_name(($($in_),*)))*);

#[doc(hidden)]
#[allow(non_camel_case_types, unused)]
#[derive(Debug)]
enum tarpc_service_Response__ {
pub enum tarpc_service_Response__ {
NotIrrefutable(()),
$(
$fn_name($out)
Expand All @@ -292,9 +294,10 @@ macro_rules! service {
impl_deserialize!(tarpc_service_Response__, NotIrrefutable(()) $($fn_name($out))*);
impl_serialize!(tarpc_service_Response__, {}, NotIrrefutable(()) $($fn_name($out))*);

#[doc(hidden)]
#[allow(non_camel_case_types, unused)]
#[derive(Debug)]
enum tarpc_service_Error__ {
pub enum tarpc_service_Error__ {
NotIrrefutable(()),
$(
$fn_name($error)
Expand Down Expand Up @@ -614,14 +617,26 @@ macro_rules! service {
#[allow(unused)]
$(#[$attr])*
pub fn $fn_name(&self, $($arg: $in_),*)
-> impl $crate::futures::Future<Item=$out, Error=$crate::Error<$error>>
+ 'static
{
-> $crate::futures::future::Then<
<tarpc_service_Client__ as $crate::tokio_service::Service>::Future,
::std::result::Result<$out, $crate::Error<$error>>,
fn(::std::result::Result<
::std::result::Result<tarpc_service_Response__,
$crate::Error<tarpc_service_Error__>>,
::std::io::Error>)
-> ::std::result::Result<$out, $crate::Error<$error>>> {

let tarpc_service_req__ = tarpc_service_Request__::$fn_name(($($arg,)*));
let tarpc_service_fut__ =
$crate::tokio_service::Service::call(&self.0, tarpc_service_req__);
$crate::futures::Future::then(tarpc_service_fut__,
move |tarpc_service_msg__| {
return $crate::futures::Future::then(tarpc_service_fut__, then__);

fn then__(tarpc_service_msg__:
::std::result::Result<
::std::result::Result<tarpc_service_Response__,
$crate::Error<tarpc_service_Error__>>,
::std::io::Error>)
-> ::std::result::Result<$out, $crate::Error<$error>> {
match tarpc_service_msg__? {
::std::result::Result::Ok(tarpc_service_msg__) => {
if let tarpc_service_Response__::$fn_name(tarpc_service_msg__) =
Expand Down Expand Up @@ -661,7 +676,7 @@ macro_rules! service {
})
}
}
})
}
}
)*

Expand Down