Remove remaining feature flags

google · Oct 1, 2019 · f618d66 · f618d66
1 parent 46bcc0f
commit f618d66
Show file tree

Hide file tree

Showing 7 changed files with 104 additions and 65 deletions.
diff --git a/rpc/Cargo.toml b/rpc/Cargo.toml
@@ -18,11 +18,13 @@ serde1 = ["trace/serde", "serde", "serde/derive"]
 tokio1 = ["tokio"]
 
 [dependencies]
+derivative = "1"
 fnv = "1.0"
 futures-preview = { version = "0.3.0-alpha.18" }
 humantime = "1.0"
 log = "0.4"
 pin-utils = "0.1.0-alpha.4"
+raii-counter = "0.2"
 rand = "0.7"
 tokio-timer = "0.3.0-alpha.4"
 trace = { package = "tarpc-trace", version = "0.2", path = "../trace" }

diff --git a/rpc/src/client/mod.rs b/rpc/src/client/mod.rs
@@ -103,7 +103,6 @@ where
 }
 
 /// Settings that control the behavior of the client.
-#[non_exhaustive]
 #[derive(Clone, Debug)]
 pub struct Config {
     /// The number of requests that can be in flight at once.

diff --git a/rpc/src/context.rs b/rpc/src/context.rs
@@ -17,7 +17,6 @@ use trace::{self, TraceId};
 /// be different for each request in scope.
 #[derive(Clone, Copy, Debug)]
 #[cfg_attr(feature = "serde1", derive(serde::Serialize, serde::Deserialize))]
-#[non_exhaustive]
 pub struct Context {
     /// When the client expects the request to be complete by. The server should cancel the request
     /// if it is not complete by this time.

diff --git a/rpc/src/lib.rs b/rpc/src/lib.rs
@@ -4,7 +4,6 @@
 // license that can be found in the LICENSE file or at
 // https://opensource.org/licenses/MIT.
 
-#![feature(weak_counts, non_exhaustive, trait_alias)]
 #![deny(missing_docs, missing_debug_implementations)]
 
 //! An RPC framework providing client and server.
@@ -31,15 +30,14 @@ pub mod server;
 pub mod transport;
 pub(crate) mod util;
 
-pub use crate::{client::Client, server::Server, transport::Transport};
+pub use crate::{client::Client, server::Server, transport::sealed::Transport};
 
 use futures::task::Poll;
 use std::{io, time::SystemTime};
 
 /// A message from a client to a server.
 #[derive(Debug)]
 #[cfg_attr(feature = "serde1", derive(serde::Serialize, serde::Deserialize))]
-#[non_exhaustive]
 pub enum ClientMessage<T> {
     /// A request initiated by a user. The server responds to a request by invoking a
     /// service-provided request handler.  The handler completes with a [`response`](Response), which
@@ -65,7 +63,6 @@ pub enum ClientMessage<T> {
 /// A request from a client to a server.
 #[derive(Clone, Copy, Debug)]
 #[cfg_attr(feature = "serde1", derive(serde::Serialize, serde::Deserialize))]
-#[non_exhaustive]
 pub struct Request<T> {
     /// Trace context, deadline, and other cross-cutting concerns.
     pub context: context::Context,
@@ -78,7 +75,6 @@ pub struct Request<T> {
 /// A response from a server to a client.
 #[derive(Clone, Debug, PartialEq, Eq, Hash)]
 #[cfg_attr(feature = "serde1", derive(serde::Serialize, serde::Deserialize))]
-#[non_exhaustive]
 pub struct Response<T> {
     /// The ID of the request being responded to.
     pub request_id: u64,
@@ -89,7 +85,6 @@ pub struct Response<T> {
 /// An error response from a server to a client.
 #[derive(Clone, Debug, PartialEq, Eq, Hash)]
 #[cfg_attr(feature = "serde1", derive(serde::Serialize, serde::Deserialize))]
-#[non_exhaustive]
 pub struct ServerError {
     #[cfg_attr(
         feature = "serde1",