From f6d4f0304cce079e9e3eac864614ac6b7805bf81 Mon Sep 17 00:00:00 2001
From: alecmocatta <alec@mocatta.net>
Date: Thu, 14 Nov 2019 16:20:48 +0000
Subject: [PATCH] update futures-preview -> futures

---
 Cargo.toml |  3 ++-
 src/lib.rs | 16 +---------------
 2 files changed, 3 insertions(+), 16 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index f9cab91..4404f34 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -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
 
@@ -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"] }
diff --git a/src/lib.rs b/src/lib.rs
index 9861b24..dde6e46 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -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,
@@ -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}
 };
@@ -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`].