Replace "combinator" with "function"/"method"

Author: taiki-e

futures-util/src/future/catch_unwind.rs

@@ -6,7 +6,7 @@ use std::pin::Pin;
 use std::panic::{catch_unwind, UnwindSafe, AssertUnwindSafe};
 use std::prelude::v1::*;
 
-/// Future for the [`catch_unwind`](super::FutureExt::catch_unwind) combinator.
+/// Future for the [`catch_unwind`](super::FutureExt::catch_unwind) method.
 #[derive(Debug)]
 #[must_use = "futures do nothing unless polled"]
 pub struct CatchUnwind<Fut> where Fut: Future {

futures-util/src/future/disabled/select.rs

@@ -3,7 +3,7 @@ use futures_core::task;
 
 use either::Either;
 
-/// Future for the [`select`](super::FutureExt::select) combinator.
+/// Future for the [`select`](super::FutureExt::select) method.
 #[must_use = "futures do nothing unless polled"]
 #[derive(Debug)]
 pub struct Select<A, B> {

futures-util/src/future/disabled/select_all.rs

@@ -7,7 +7,7 @@ use std::prelude::v1::*;
 use futures_core::{Future, IntoFuture, Poll, Async};
 use futures_core::task;
 
-/// Future for the [`select_all`] combinator.
+/// Future for the [`select_all`] function.
 #[derive(Debug)]
 #[must_use = "futures do nothing unless polled"]
 pub struct SelectAll<A> where A: Future {

futures-util/src/future/disabled/select_ok.rs

@@ -7,7 +7,7 @@ use std::prelude::v1::*;
 use futures_core::{Future, IntoFuture, Poll, Async};
 use futures_core::task;
 
-/// Future for the [`select_ok`] combinator.
+/// Future for the [`select_ok`] function.
 #[derive(Debug)]
 #[must_use = "futures do nothing unless polled"]
 pub struct SelectOk<A> where A: Future {

futures-util/src/future/empty.rs

@@ -3,7 +3,7 @@ use core::pin::Pin;
 use futures_core::future::{Future, FusedFuture};
 use futures_core::task::{Waker, Poll};
 
-/// Future for the [`empty`] combinator.
+/// Future for the [`empty`] function.
 #[derive(Debug)]
 #[must_use = "futures do nothing unless polled"]
 pub struct Empty<T> {

futures-util/src/future/flatten.rs

@@ -5,7 +5,7 @@ use futures_core::future::{FusedFuture, Future};
 use futures_core::task::{Waker, Poll};
 use pin_utils::unsafe_pinned;
 
-/// Future for the [`flatten`](super::FutureExt::flatten) combinator.
+/// Future for the [`flatten`](super::FutureExt::flatten) method.
 #[must_use = "futures do nothing unless polled"]
 pub struct Flatten<Fut>
     where Fut: Future,

futures-util/src/future/flatten_stream.rs

@@ -4,8 +4,7 @@ use futures_core::future::Future;
 use futures_core::stream::{FusedStream, Stream};
 use futures_core::task::{Waker, Poll};
 
-/// Stream for the [`flatten_stream`](super::FutureExt::flatten_stream)
-/// combinator.
+/// Stream for the [`flatten_stream`](super::FutureExt::flatten_stream) method.
 #[must_use = "streams do nothing unless polled"]
 pub struct FlattenStream<Fut: Future> {
     state: State<Fut>

futures-util/src/future/fuse.rs

@@ -3,7 +3,7 @@ use futures_core::future::{Future, FusedFuture};
 use futures_core::task::{Waker, Poll};
 use pin_utils::unsafe_pinned;
 
-/// Future for the [`fuse`](super::FutureExt::fuse) combinator.
+/// Future for the [`fuse`](super::FutureExt::fuse) method.
 #[derive(Debug)]
 #[must_use = "futures do nothing unless polled"]
 pub struct Fuse<Fut: Future> {

futures-util/src/future/inspect.rs

@@ -3,7 +3,7 @@ use futures_core::future::{FusedFuture, Future};
 use futures_core::task::{Waker, Poll};
 use pin_utils::{unsafe_pinned, unsafe_unpinned};
 
-/// Future for the [`inspect`](super::FutureExt::inspect) combinator.
+/// Future for the [`inspect`](super::FutureExt::inspect) method.
 #[derive(Debug)]
 #[must_use = "futures do nothing unless polled"]
 pub struct Inspect<Fut, F> where Fut: Future {

futures-util/src/future/into_stream.rs

@@ -4,7 +4,7 @@ use futures_core::stream::Stream;
 use futures_core::task::{Waker, Poll};
 use pin_utils::unsafe_pinned;
 
-/// Stream for the [`into_stream`](super::FutureExt::into_stream) combinator.
+/// Stream for the [`into_stream`](super::FutureExt::into_stream) method.
 #[must_use = "futures do nothing unless polled"]
 #[derive(Debug)]
 pub struct IntoStream<Fut: Future> {