From 6b9d06ebdef1e415aaf82f5e5e28304281e0e75a Mon Sep 17 00:00:00 2001 From: Pascal Hertleif Date: Tue, 11 Feb 2020 18:04:20 +0100 Subject: [PATCH] Move the thing that prevents no_std into rpc So, [currently][1], `async` fns/closures prevent crates from building in a no_std environment. Since the only occurrence is this single `send` method, I've moved it to the rpc crate. [1]: https://github.com/rust-lang/rust/issues/56974 --- capnp-rpc/src/lib.rs | 1 + capnp-rpc/src/rpc.rs | 1 + capnp/src/lib.rs | 4 ---- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/capnp-rpc/src/lib.rs b/capnp-rpc/src/lib.rs index bffc19106..f277c2d18 100644 --- a/capnp-rpc/src/lib.rs +++ b/capnp-rpc/src/lib.rs @@ -112,6 +112,7 @@ mod sender_queue; mod split; mod task_set; pub mod twoparty; +mod send_ext; pub trait OutgoingMessage { fn get_body<'a>(&'a mut self) -> ::capnp::Result<::capnp::any_pointer::Builder<'a>>; diff --git a/capnp-rpc/src/rpc.rs b/capnp-rpc/src/rpc.rs index fabbb9382..6df54c086 100644 --- a/capnp-rpc/src/rpc.rs +++ b/capnp-rpc/src/rpc.rs @@ -44,6 +44,7 @@ use crate::attach::Attach; use crate::{broken, local, queued}; use crate::local::ResultsDoneHook; use crate::task_set::TaskSet; +use crate::send_ext::SendExt; pub type QuestionId = u32; pub type AnswerId = QuestionId; diff --git a/capnp/src/lib.rs b/capnp/src/lib.rs index b019e2f39..dd5114217 100644 --- a/capnp/src/lib.rs +++ b/capnp/src/lib.rs @@ -39,10 +39,6 @@ pub mod any_pointer; pub mod any_pointer_list; pub mod capability; pub mod capability_list; -// #[cfg(not(feature = "std"))] -mod capability_no_std; -// #[cfg(feature = "std")] -// mod capability_std; pub mod constant; pub mod data; pub mod data_list;