Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Start futures 0.4 and futures-core 1.0 development #2335

Merged
merged 1 commit into from
Feb 26, 2021
Merged

Start futures 0.4 and futures-core 1.0 development #2335

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions futures-channel/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
[package]
name = "futures-channel"
edition = "2018"
version = "0.3.13"
version = "0.4.0-alpha.0"
authors = ["Alex Crichton <[email protected]>"]
license = "MIT OR Apache-2.0"
repository = "https://github.com/rust-lang/futures-rs"
homepage = "https://rust-lang.github.io/futures-rs"
documentation = "https://docs.rs/futures-channel/0.3"
documentation = "https://docs.rs/futures-channel/0.4.0-alpha.0"
description = """
Channels for asynchronous communication using futures-rs.
"""
Expand All @@ -24,8 +24,8 @@ unstable = ["futures-core/unstable"]
cfg-target-has-atomic = ["futures-core/cfg-target-has-atomic"]

[dependencies]
futures-core = { path = "../futures-core", version = "0.3.13", default-features = false }
futures-sink = { path = "../futures-sink", version = "0.3.13", default-features = false, optional = true }
futures-core = { path = "../futures-core", version = "=1.0.0-alpha.0", default-features = false }
futures-sink = { path = "../futures-sink", version = "=0.4.0-alpha.0", default-features = false, optional = true }

[dev-dependencies]
futures = { path = "../futures", default-features = true }
Expand Down
4 changes: 2 additions & 2 deletions futures-core/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
[package]
name = "futures-core"
edition = "2018"
version = "0.3.13"
version = "1.0.0-alpha.0"
authors = ["Alex Crichton <[email protected]>"]
license = "MIT OR Apache-2.0"
repository = "https://github.com/rust-lang/futures-rs"
homepage = "https://rust-lang.github.io/futures-rs"
documentation = "https://docs.rs/futures-core/0.3"
documentation = "https://docs.rs/futures-core/1.0.0-alpha.0"
description = """
The core traits and types in for the `futures` library.
"""
Expand Down
10 changes: 5 additions & 5 deletions futures-executor/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
[package]
name = "futures-executor"
edition = "2018"
version = "0.3.13"
version = "0.4.0-alpha.0"
authors = ["Alex Crichton <[email protected]>"]
license = "MIT OR Apache-2.0"
repository = "https://github.com/rust-lang/futures-rs"
homepage = "https://rust-lang.github.io/futures-rs"
documentation = "https://docs.rs/futures-executor/0.3"
documentation = "https://docs.rs/futures-executor/0.4.0-alpha.0"
description = """
Executors for asynchronous tasks based on the futures-rs library.
"""
Expand All @@ -17,9 +17,9 @@ std = ["futures-core/std", "futures-task/std", "futures-util/std"]
thread-pool = ["std", "num_cpus"]

[dependencies]
futures-core = { path = "../futures-core", version = "0.3.13", default-features = false }
futures-task = { path = "../futures-task", version = "0.3.13", default-features = false }
futures-util = { path = "../futures-util", version = "0.3.13", default-features = false }
futures-core = { path = "../futures-core", version = "=1.0.0-alpha.0", default-features = false }
futures-task = { path = "../futures-task", version = "=0.4.0-alpha.0", default-features = false }
futures-util = { path = "../futures-util", version = "=0.4.0-alpha.0", default-features = false }
num_cpus = { version = "1.8.0", optional = true }

[dev-dependencies]
Expand Down
4 changes: 2 additions & 2 deletions futures-macro/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
[package]
name = "futures-macro"
edition = "2018"
version = "0.3.13"
version = "0.4.0-alpha.0"
authors = ["Taylor Cramer <[email protected]>", "Taiki Endo <[email protected]>"]
license = "MIT OR Apache-2.0"
repository = "https://github.com/rust-lang/futures-rs"
homepage = "https://rust-lang.github.io/futures-rs"
documentation = "https://docs.rs/futures-macro/0.3"
documentation = "https://docs.rs/futures-macro/0.4.0-alpha.0"
description = """
The futures-rs procedural macro implementations.
"""
Expand Down
4 changes: 2 additions & 2 deletions futures-sink/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
[package]
name = "futures-sink"
edition = "2018"
version = "0.3.13"
version = "0.4.0-alpha.0"
authors = ["Alex Crichton <[email protected]>"]
license = "MIT OR Apache-2.0"
repository = "https://github.com/rust-lang/futures-rs"
homepage = "https://rust-lang.github.io/futures-rs"
documentation = "https://docs.rs/futures-sink/0.3"
documentation = "https://docs.rs/futures-sink/0.4.0-alpha.0"
description = """
The asynchronous `Sink` trait for the futures-rs library.
"""
Expand Down
4 changes: 2 additions & 2 deletions futures-task/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
[package]
name = "futures-task"
edition = "2018"
version = "0.3.13"
version = "0.4.0-alpha.0"
authors = ["Alex Crichton <[email protected]>"]
license = "MIT OR Apache-2.0"
repository = "https://github.com/rust-lang/futures-rs"
homepage = "https://rust-lang.github.io/futures-rs"
documentation = "https://docs.rs/futures-task/0.3"
documentation = "https://docs.rs/futures-task/0.4.0-alpha.0"
description = """
Tools for working with tasks.
"""
Expand Down
14 changes: 7 additions & 7 deletions futures-test/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,23 +1,23 @@
[package]
name = "futures-test"
edition = "2018"
version = "0.3.13"
version = "0.4.0-alpha.0"
authors = ["Wim Looman <[email protected]>"]
license = "MIT OR Apache-2.0"
repository = "https://github.com/rust-lang/futures-rs"
homepage = "https://rust-lang.github.io/futures-rs"
documentation = "https://docs.rs/futures-test/0.3"
documentation = "https://docs.rs/futures-test/0.4.0-alpha.0"
description = """
Common utilities for testing components built off futures-rs.
"""

[dependencies]
futures-core = { version = "0.3.13", path = "../futures-core", default-features = false }
futures-task = { version = "0.3.13", path = "../futures-task", default-features = false }
futures-core = { version = "=1.0.0-alpha.0", path = "../futures-core", default-features = false }
futures-task = { version = "=0.4.0-alpha.0", path = "../futures-task", default-features = false }
futures-io = { version = "0.3.13", path = "../futures-io", default-features = false }
futures-util = { version = "0.3.13", path = "../futures-util", default-features = false }
futures-executor = { version = "0.3.13", path = "../futures-executor", default-features = false }
futures-sink = { version = "0.3.13", path = "../futures-sink", default-features = false }
futures-util = { version = "=0.4.0-alpha.0", path = "../futures-util", default-features = false }
futures-executor = { version = "=0.4.0-alpha.0", path = "../futures-executor", default-features = false }
futures-sink = { version = "=0.4.0-alpha.0", path = "../futures-sink", default-features = false }
pin-utils = { version = "0.1.0", default-features = false }
pin-project = "1.0.1"

Expand Down
14 changes: 7 additions & 7 deletions futures-util/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
[package]
name = "futures-util"
edition = "2018"
version = "0.3.13"
version = "0.4.0-alpha.0"
authors = ["Alex Crichton <[email protected]>"]
license = "MIT OR Apache-2.0"
repository = "https://github.com/rust-lang/futures-rs"
homepage = "https://rust-lang.github.io/futures-rs"
documentation = "https://docs.rs/futures-util/0.3"
documentation = "https://docs.rs/futures-util/0.4.0-alpha.0"
description = """
Common utilities and extension traits for the futures-rs library.
"""
Expand All @@ -33,12 +33,12 @@ read-initializer = ["io", "futures-io/read-initializer", "futures-io/unstable"]
write-all-vectored = ["io"]

[dependencies]
futures-core = { path = "../futures-core", version = "0.3.13", default-features = false }
futures-task = { path = "../futures-task", version = "0.3.13", default-features = false }
futures-channel = { path = "../futures-channel", version = "0.3.13", default-features = false, features = ["std"], optional = true }
futures-core = { path = "../futures-core", version = "=1.0.0-alpha.0", default-features = false }
futures-task = { path = "../futures-task", version = "=0.4.0-alpha.0", default-features = false }
futures-channel = { path = "../futures-channel", version = "=0.4.0-alpha.0", default-features = false, features = ["std"], optional = true }
futures-io = { path = "../futures-io", version = "0.3.13", default-features = false, features = ["std"], optional = true }
futures-sink = { path = "../futures-sink", version = "0.3.13", default-features = false, optional = true }
futures-macro = { path = "../futures-macro", version = "=0.3.13", default-features = false, optional = true }
futures-sink = { path = "../futures-sink", version = "=0.4.0-alpha.0", default-features = false, optional = true }
futures-macro = { path = "../futures-macro", version = "=0.4.0-alpha.0", default-features = false, optional = true }
proc-macro-hack = { version = "0.5.19", optional = true }
proc-macro-nested = { version = "0.1.2", optional = true }
slab = { version = "0.4.2", optional = true }
Expand Down
16 changes: 8 additions & 8 deletions futures/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,28 +1,28 @@
[package]
name = "futures"
edition = "2018"
version = "0.3.13"
version = "0.4.0-alpha.0"
authors = ["Alex Crichton <[email protected]>"]
license = "MIT OR Apache-2.0"
readme = "../README.md"
keywords = ["futures", "async", "future"]
repository = "https://github.com/rust-lang/futures-rs"
homepage = "https://rust-lang.github.io/futures-rs"
documentation = "https://docs.rs/futures/0.3"
documentation = "https://docs.rs/futures/0.4.0-alpha.0"
description = """
An implementation of futures and streams featuring zero allocations,
composability, and iterator-like interfaces.
"""
categories = ["asynchronous"]

[dependencies]
futures-core = { path = "../futures-core", version = "0.3.13", default-features = false }
futures-task = { path = "../futures-task", version = "0.3.13", default-features = false }
futures-channel = { path = "../futures-channel", version = "0.3.13", default-features = false, features = ["sink"] }
futures-executor = { path = "../futures-executor", version = "0.3.13", default-features = false, optional = true }
futures-core = { path = "../futures-core", version = "=1.0.0-alpha.0", default-features = false }
futures-task = { path = "../futures-task", version = "=0.4.0-alpha.0", default-features = false }
futures-channel = { path = "../futures-channel", version = "=0.4.0-alpha.0", default-features = false, features = ["sink"] }
futures-executor = { path = "../futures-executor", version = "=0.4.0-alpha.0", default-features = false, optional = true }
futures-io = { path = "../futures-io", version = "0.3.13", default-features = false }
futures-sink = { path = "../futures-sink", version = "0.3.13", default-features = false }
futures-util = { path = "../futures-util", version = "0.3.13", default-features = false, features = ["sink"] }
futures-sink = { path = "../futures-sink", version = "=0.4.0-alpha.0", default-features = false }
futures-util = { path = "../futures-util", version = "=0.4.0-alpha.0", default-features = false, features = ["sink"] }

[dev-dependencies]
futures-executor = { path = "../futures-executor", features = ["thread-pool"] }
Expand Down
2 changes: 1 addition & 1 deletion futures/tests/macro-reexport/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@ edition = "2018"
publish = false

[dependencies]
futures03 = { path = "../..", package = "futures" }
futures04 = { path = "../..", package = "futures" }
4 changes: 2 additions & 2 deletions futures/tests/macro-reexport/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
// normal reexport
pub use futures03::{join, try_join, select, select_biased};
pub use futures04::{join, try_join, select, select_biased};

// reexport + rename
pub use futures03::{
pub use futures04::{
join as join2, try_join as try_join2,
select as select2, select_biased as select_biased2,
};
2 changes: 1 addition & 1 deletion futures/tests/macro-tests/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@ edition = "2018"
publish = false

[dependencies]
futures03 = { path = "../..", package = "futures" }
futures04 = { path = "../..", package = "futures" }
macro-reexport = { path = "../macro-reexport" }
10 changes: 5 additions & 5 deletions futures/tests/macro-tests/src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
// Check that it works even if proc-macros are reexported.

fn main() {
use futures03::{executor::block_on, future};
use futures04::{executor::block_on, future};

// join! macro
let _ = block_on(async {
let _ = futures03::join!(async {}, async {});
let _ = futures04::join!(async {}, async {});
let _ = macro_reexport::join!(async {}, async {});
let _ = macro_reexport::join2!(async {}, async {});
});

// try_join! macro
let _ = block_on(async {
let _ = futures03::try_join!(async { Ok::<(), ()>(()) }, async { Ok::<(), ()>(()) });
let _ = futures04::try_join!(async { Ok::<(), ()>(()) }, async { Ok::<(), ()>(()) });
let _ = macro_reexport::try_join!(async { Ok::<(), ()>(()) }, async { Ok::<(), ()>(()) });
let _ = macro_reexport::try_join2!(async { Ok::<(), ()>(()) }, async { Ok::<(), ()>(()) });
Ok::<(), ()>(())
Expand All @@ -22,7 +22,7 @@ fn main() {
let _ = block_on(async {
let mut a = future::ready(());
let mut b = future::pending::<()>();
let _ = futures03::select! {
let _ = futures04::select! {
_ = a => {},
_ = b => unreachable!(),
};
Expand All @@ -46,7 +46,7 @@ fn main() {
let _ = block_on(async {
let mut a = future::ready(());
let mut b = future::pending::<()>();
let _ = futures03::select_biased! {
let _ = futures04::select_biased! {
_ = a => {},
_ = b => unreachable!(),
};
Expand Down