deprecate delay_until, finish up

tokio/src/runtime/task/join.rs

@@ -172,12 +172,12 @@ impl<T> JoinHandle<T> {
     ///    let mut handles = Vec::new();
     ///
     ///    handles.push(tokio::spawn(async {
-    ///       time::delay_for(time::Duration::from_secs(10)).await;
+    ///       time::sleep(time::Duration::from_secs(10)).await;
     ///       true
     ///    }));
     ///
     ///    handles.push(tokio::spawn(async {
-    ///       time::delay_for(time::Duration::from_secs(10)).await;
+    ///       time::sleep(time::Duration::from_secs(10)).await;
     ///       false
     ///    }));
     ///

tokio/src/time/delay.rs

@@ -20,7 +20,8 @@ pub fn sleep_until(deadline: Instant) -> Delay {
     Delay { registration }
 }
 
-/// Waits until `deadline` is reached. Alias for [`sleep_until`](sleep_until).
+/// use [`sleep_until`](sleep_until)
+#[deprecated(note = "delay_until will be removed in Tokio 0.3. Use time::sleep_until")]
 pub fn delay_until(deadline: Instant) -> Delay {
     sleep_until(deadline)
 }
@@ -60,7 +61,7 @@ pub fn sleep(duration: Duration) -> Delay {
     sleep_until(Instant::now() + duration)
 }
 
-/// Waits until `duration` has elapsed.
+/// use [`sleep`](sleep)
 #[deprecated(note = "delay_for will be removed in Tokio 0.3. Use time::sleep")]
 pub fn delay_for(duration: Duration) -> Delay {
     sleep(duration)