Skip to content

Commit cdfb084

Browse files
tikuecramertj
authored andcommitted
Updates for rustc nightly.
- Use pub(crate) in lieu of crate, now that the latter is marked as experimental. - Remove cargo feature "edition," now that it's stable.
1 parent 1baf8a0 commit cdfb084

File tree

13 files changed

+12
-28
lines changed

13 files changed

+12
-28
lines changed

futures-channel/Cargo.toml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
cargo-features = ["edition"]
2-
31
[package]
42
name = "futures-channel-preview"
53
edition = "2018"

futures-core/Cargo.toml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
cargo-features = ["edition"]
2-
31
[package]
42
name = "futures-core-preview"
53
edition = "2018"

futures-executor/Cargo.toml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
cargo-features = ["edition"]
2-
31
[package]
42
name = "futures-executor-preview"
53
edition = "2018"

futures-io/Cargo.toml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
cargo-features = ["edition"]
2-
31
[package]
42
name = "futures-io-preview"
53
edition = "2018"

futures-sink/Cargo.toml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
cargo-features = ["edition"]
2-
31
[package]
42
name = "futures-sink-preview"
53
edition = "2018"

futures-test/Cargo.toml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
cargo-features = ["edition"]
2-
31
[package]
42
name = "futures-test-preview"
53
edition = "2018"

futures-util/Cargo.toml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
cargo-features = ["edition"]
2-
31
[package]
42
name = "futures-util-preview"
53
edition = "2018"

futures-util/src/compat/compat.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
#[derive(Debug)]
88
#[must_use = "futures do nothing unless polled"]
99
pub struct Compat<T, Sp> {
10-
crate inner: T,
11-
crate spawn: Option<Sp>,
10+
pub(crate) inner: T,
11+
pub(crate) spawn: Option<Sp>,
1212
}
1313

1414
impl<T, Sp> Compat<T, Sp> {
@@ -18,7 +18,7 @@ impl<T, Sp> Compat<T, Sp> {
1818
}
1919

2020
/// Creates a new [`Compat`].
21-
crate fn new(inner: T, spawn: Option<Sp>) -> Compat<T, Sp> {
21+
pub(crate) fn new(inner: T, spawn: Option<Sp>) -> Compat<T, Sp> {
2222
Compat { inner, spawn }
2323
}
2424
}

futures-util/src/future/chain.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ use futures_core::task::{self, Poll};
44

55
#[must_use = "futures do nothing unless polled"]
66
#[derive(Debug)]
7-
crate enum Chain<Fut1, Fut2, Data> {
7+
pub(crate) enum Chain<Fut1, Fut2, Data> {
88
First(Fut1, Option<Data>),
99
Second(Fut2),
1010
Empty,
@@ -14,11 +14,11 @@ impl<Fut1, Fut2, Data> Chain<Fut1, Fut2, Data>
1414
where Fut1: Future,
1515
Fut2: Future,
1616
{
17-
crate fn new(fut1: Fut1, data: Data) -> Chain<Fut1, Fut2, Data> {
17+
pub(crate) fn new(fut1: Fut1, data: Data) -> Chain<Fut1, Fut2, Data> {
1818
Chain::First(fut1, Some(data))
1919
}
2020

21-
crate fn poll<F>(
21+
pub(crate) fn poll<F>(
2222
self: PinMut<Self>,
2323
cx: &mut task::Context,
2424
f: F,

futures-util/src/future/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ pub use self::with_spawner::WithSpawner;
6565

6666
// Implementation details
6767
mod chain;
68-
crate use self::chain::Chain;
68+
pub(crate) use self::chain::Chain;
6969

7070
if_std! {
7171
use std::pin::PinBox;

futures-util/src/try_future/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ pub use self::unwrap_or_else::UnwrapOrElse;
5656

5757
// Implementation details
5858
mod try_chain;
59-
crate use self::try_chain::{TryChain, TryChainAction};
59+
pub(crate) use self::try_chain::{TryChain, TryChainAction};
6060

6161
impl<Fut: TryFuture> TryFutureExt for Fut {}
6262

futures-util/src/try_future/try_chain.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@ use futures_core::task::{self, Poll};
44

55
#[must_use = "futures do nothing unless polled"]
66
#[derive(Debug)]
7-
crate enum TryChain<Fut1, Fut2, Data> {
7+
pub(crate) enum TryChain<Fut1, Fut2, Data> {
88
First(Fut1, Option<Data>),
99
Second(Fut2),
1010
Empty,
1111
}
1212

13-
crate enum TryChainAction<Fut2>
13+
pub(crate) enum TryChainAction<Fut2>
1414
where Fut2: TryFuture,
1515
{
1616
Future(Fut2),
@@ -21,11 +21,11 @@ impl<Fut1, Fut2, Data> TryChain<Fut1, Fut2, Data>
2121
where Fut1: TryFuture,
2222
Fut2: TryFuture,
2323
{
24-
crate fn new(fut1: Fut1, data: Data) -> TryChain<Fut1, Fut2, Data> {
24+
pub(crate) fn new(fut1: Fut1, data: Data) -> TryChain<Fut1, Fut2, Data> {
2525
TryChain::First(fut1, Some(data))
2626
}
2727

28-
crate fn poll<F>(
28+
pub(crate) fn poll<F>(
2929
self: PinMut<Self>,
3030
cx: &mut task::Context,
3131
f: F,

futures/Cargo.toml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
cargo-features = ["edition"]
2-
31
[package]
42
name = "futures-preview"
53
edition = "2018"

0 commit comments

Comments
 (0)