Skip to content

Commit

Permalink
update futures-preview -> futures
Browse files Browse the repository at this point in the history
  • Loading branch information
alecmocatta committed Nov 14, 2019
1 parent ed4782f commit f6d4f03
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 16 deletions.
3 changes: 2 additions & 1 deletion Cargo.toml
Expand Up @@ -14,6 +14,7 @@ repository = "https://github.com/alecmocatta/constellation"
homepage = "https://github.com/alecmocatta/constellation"
documentation = "https://docs.rs/constellation-rs/0.1.7"
readme = "README.md"
links = "constellation"
edition = "2018"
autotests = true

Expand All @@ -37,7 +38,7 @@ bincode = "1.2"
crossbeam = "0.7"
docopt = "1.0"
either = "1.5"
futures-preview = "0.3.0-alpha.18"
futures = "0.3"
kube = { version = "0.17", features = ["openapi"], optional = true }
log = "0.4"
notifier = { version = "0.1", features = ["tcp_typed"] }
Expand Down
16 changes: 1 addition & 15 deletions src/lib.rs
Expand Up @@ -11,7 +11,6 @@

#![doc(html_root_url = "https://docs.rs/constellation-rs/0.1.7")]
#![cfg_attr(feature = "nightly", feature(read_initializer))]
#![feature(cfg_doctest)]
#![warn(
missing_copy_implementations,
// missing_debug_implementations,
Expand Down Expand Up @@ -55,7 +54,7 @@ use palaver::{
use pin_utils::pin_mut;
use serde::{de::DeserializeOwned, Deserialize, Serialize};
use std::{
borrow, convert::{Infallible, TryInto}, ffi::{CStr, CString, OsString}, fmt, fs, future::Future, io::{self, Read, Write}, iter, marker, mem::MaybeUninit, net::{IpAddr, Ipv4Addr, SocketAddr, TcpListener, TcpStream}, ops, os::unix::{
any::type_name, borrow, convert::{Infallible, TryInto}, ffi::{CStr, CString, OsString}, fmt, fs, future::Future, io::{self, Read, Write}, iter, marker, mem::MaybeUninit, net::{IpAddr, Ipv4Addr, SocketAddr, TcpListener, TcpStream}, ops, os::unix::{
ffi::OsStringExt, io::{AsRawFd, FromRawFd, IntoRawFd}
}, path, pin::Pin, process, str, sync::{mpsc, Arc, Mutex, RwLock}, task::{Context, Poll}, thread::{self, Thread}
};
Expand All @@ -73,19 +72,6 @@ pub use serde_closure::{Fn, FnMut, FnOnce};

//////////////////////////////////////////////////////////////////////////////////////////////////////////////////

fn type_name<T: ?Sized>() -> &'static str {
#[cfg(feature = "nightly")]
{
std::any::type_name::<T>()
}
#[cfg(not(feature = "nightly"))]
{
"<unknown>"
}
}

//////////////////////////////////////////////////////////////////////////////////////////////////////////////////

/// Extension trait to provide convenient [`block()`](FutureExt1::block) method on futures.
///
/// Named `FutureExt1` to avoid clashing with [`futures::future::FutureExt`].
Expand Down

0 comments on commit f6d4f03

Please sign in to comment.