Merge pull request #1103 from MajorBreakfast/preview-renamings

0.3.0-alpha.1 preview renamings
rust-lang · Jul 19, 2018 · e85ea61 · e85ea61
2 parents f575f0d + 6ca6c04
commit e85ea61
Show file tree

Hide file tree

Showing 15 changed files with 83 additions and 62 deletions.
diff --git a/README.md b/README.md
@@ -15,15 +15,15 @@ First, add this to your `Cargo.toml`:
 
 ```toml
 [dependencies]
-futures-preview = "0.3.0-alpha"
+futures-preview = "0.3.0-alpha.1"
 ```
 
 Next, add this to your crate:
 
 ```rust
-extern crate futures_preview as futures;
+extern crate futures; // Note: It's not `futures_preview`
 
-use futures::Future;
+use futures::future::Future;
 ```
 
 ### Feature `std`
@@ -34,7 +34,7 @@ a `#[no_std]` environment, use:
 
 ```toml
 [dependencies]
-futures-preview = { version = "0.3.0-alpha", default-features = false }
+futures-preview = { version = "0.3.0-alpha.1", default-features = false }
 ```
 
 # License

diff --git a/futures-channel/Cargo.toml b/futures-channel/Cargo.toml
@@ -1,24 +1,27 @@
 cargo-features = ["edition"]
 
 [package]
-name = "futures-channel"
+name = "futures-channel-preview"
 edition = "2018"
-version = "0.3.0-alpha"
+version = "0.3.0-alpha.1"
 authors = ["Alex Crichton <alex@alexcrichton.com>"]
 license = "MIT/Apache-2.0"
 repository = "https://github.com/rust-lang-nursery/futures-rs"
 homepage = "https://github.com/rust-lang-nursery/futures-rs"
-documentation = "https://docs.rs/futures-core"
+documentation = "https://docs.rs/futures-channel-preview"
 description = """
 Channels for asynchronous communication using futures-rs.
 """
 
+[lib]
+name = "futures_channel"
+
 [features]
-std = ["futures-core/std"]
+std = ["futures-core-preview/std"]
 default = ["std"]
 
 [dependencies]
-futures-core = { path = "../futures-core", version = "0.3.0-alpha", default-features = false }
+futures-core-preview = { path = "../futures-core", version = "0.3.0-alpha.1", default-features = false }
 
 [dev-dependencies]
-futures = { path = "../futures", version = "0.3.0-alpha", default-features = true }
+futures-preview = { path = "../futures", version = "0.3.0-alpha.1", default-features = true }
diff --git a/futures-channel/src/lib.rs b/futures-channel/src/lib.rs
@@ -10,7 +10,7 @@
 #![deny(missing_docs, missing_debug_implementations, warnings)]
 #![deny(bare_trait_objects)]
 
-#![doc(html_root_url = "https://docs.rs/futures-channel/0.3.0-alpha")]
+#![doc(html_root_url = "https://docs.rs/futures-channel-preview/0.3.0-alpha.1")]
 
 #[cfg(feature = "std")]
 extern crate std;

diff --git a/futures-core/Cargo.toml b/futures-core/Cargo.toml
@@ -1,18 +1,21 @@
 cargo-features = ["edition"]
 
 [package]
-name = "futures-core"
+name = "futures-core-preview"
 edition = "2018"
-version = "0.3.0-alpha"
+version = "0.3.0-alpha.1"
 authors = ["Alex Crichton <alex@alexcrichton.com>"]
 license = "MIT/Apache-2.0"
 repository = "https://github.com/rust-lang-nursery/futures-rs"
 homepage = "https://github.com/rust-lang-nursery/futures-rs"
-documentation = "https://docs.rs/futures-core"
+documentation = "https://docs.rs/futures-core-preview"
 description = """
 The core traits and types in for the `futures` library.
 """
 
+[lib]
+name = "futures_core"
+
 [features]
 default = ["std"]
 std = ["either/use_std"]

diff --git a/futures-core/src/lib.rs b/futures-core/src/lib.rs
@@ -7,7 +7,7 @@
 #![deny(missing_docs, missing_debug_implementations, warnings)]
 #![deny(bare_trait_objects)]
 
-#![doc(html_root_url = "https://docs.rs/futures-core/0.3.0-alpha")]
+#![doc(html_root_url = "https://docs.rs/futures-core-preview/0.3.0-alpha.1")]
 
 #[cfg(feature = "std")]
 extern crate std;

diff --git a/futures-executor/Cargo.toml b/futures-executor/Cargo.toml
@@ -1,29 +1,32 @@
 cargo-features = ["edition"]
 
 [package]
-name = "futures-executor"
+name = "futures-executor-preview"
 edition = "2018"
-version = "0.3.0-alpha"
+version = "0.3.0-alpha.1"
 authors = ["Alex Crichton <alex@alexcrichton.com>"]
 license = "MIT/Apache-2.0"
 repository = "https://github.com/rust-lang-nursery/futures-rs"
 homepage = "https://github.com/rust-lang-nursery/futures-rs"
-documentation = "https://docs.rs/futures-core"
+documentation = "https://docs.rs/futures-executor-preview"
 description = """
 Executors for asynchronous tasks based on the futures-rs library.
 """
 
+[lib]
+name = "futures_executor"
+
 [features]
-std = ["num_cpus", "futures-core/std", "futures-util/std", "futures-channel/std", "lazy_static"]
+std = ["num_cpus", "futures-core-preview/std", "futures-util-preview/std", "futures-channel-preview/std", "lazy_static"]
 default = ["std"]
 
 [dependencies]
-futures-core = { path = "../futures-core", version = "0.3.0-alpha", default-features = false}
-futures-util = { path = "../futures-util", version = "0.3.0-alpha", default-features = false}
-futures-channel = { path = "../futures-channel", version = "0.3.0-alpha", default-features = false}
+futures-core-preview = { path = "../futures-core", version = "0.3.0-alpha.1", default-features = false}
+futures-util-preview = { path = "../futures-util", version = "0.3.0-alpha.1", default-features = false}
+futures-channel-preview = { path = "../futures-channel", version = "0.3.0-alpha.1", default-features = false}
 num_cpus = { version = "1.0", optional = true }
 lazy_static = { version = "1.0", optional = true }
 
 [dev-dependencies]
-futures = { path = "../futures", version = "0.3.0-alpha" }
-futures-channel = { path = "../futures-channel", version = "0.3.0-alpha" }
+futures-preview = { path = "../futures", version = "0.3.0-alpha.1" }
+futures-channel-preview = { path = "../futures-channel", version = "0.3.0-alpha.1" }
diff --git a/futures-executor/src/lib.rs b/futures-executor/src/lib.rs
@@ -7,7 +7,7 @@
 #![deny(missing_docs, missing_debug_implementations, warnings)]
 #![deny(bare_trait_objects)]
 
-#![doc(html_root_url = "https://docs.rs/futures-executor/0.3.0-alpha")]
+#![doc(html_root_url = "https://docs.rs/futures-executor-preview/0.3.0-alpha.1")]
 
 #[cfg(feature = "std")]
 #[macro_use]

diff --git a/futures-io/Cargo.toml b/futures-io/Cargo.toml
@@ -1,24 +1,27 @@
 cargo-features = ["edition"]
 
 [package]
-name = "futures-io"
+name = "futures-io-preview"
 edition = "2018"
-version = "0.3.0-alpha"
+version = "0.3.0-alpha.1"
 authors = ["Alex Crichton <alex@alexcrichton.com>"]
 license = "MIT/Apache-2.0"
 repository = "https://github.com/rust-lang-nursery/futures-rs"
 homepage = "https://github.com/rust-lang-nursery/futures-rs"
-documentation = "https://docs.rs/futures-io"
+documentation = "https://docs.rs/futures-io-preview"
 description = """
 The `AsyncRead` and `AsyncWrite` traits for the futures-rs library.
 """
 
+[lib]
+name = "futures_io"
+
 [features]
-std = ["futures-core/std", "iovec"]
+std = ["futures-core-preview/std", "iovec"]
 default = ["std"]
 
 [dependencies]
-futures-core = { path = "../futures-core", version = "0.3.0-alpha", default-features = false }
+futures-core-preview = { path = "../futures-core", version = "0.3.0-alpha.1", default-features = false }
 iovec = { version = "0.1", optional = true }
 
 # [dev-dependencies]

diff --git a/futures-io/src/lib.rs b/futures-io/src/lib.rs
@@ -9,7 +9,7 @@
 #![deny(missing_docs, missing_debug_implementations, warnings)]
 #![deny(bare_trait_objects)]
 
-#![doc(html_rnoot_url = "https://docs.rs/futures-io/0.3.0-alpha")]
+#![doc(html_root_url = "https://docs.rs/futures-io-preview/0.3.0-alpha.1")]
 
 #![feature(futures_api)]
 

diff --git a/futures-sink/Cargo.toml b/futures-sink/Cargo.toml
@@ -1,23 +1,26 @@
 cargo-features = ["edition"]
 
 [package]
-name = "futures-sink"
+name = "futures-sink-preview"
 edition = "2018"
-version = "0.3.0-alpha"
+version = "0.3.0-alpha.1"
 authors = ["Alex Crichton <alex@alexcrichton.com>"]
 license = "MIT/Apache-2.0"
 repository = "https://github.com/rust-lang-nursery/futures-rs"
 homepage = "https://github.com/rust-lang-nursery/futures-rs"
-documentation = "https://docs.rs/futures-core"
+documentation = "https://docs.rs/futures-sink-preview"
 description = """
 The asynchronous `Sink` trait for the futures-rs library.
 """
 
+[lib]
+name = "futures_sink"
+
 [features]
-std = ["either/use_std", "futures-core/std", "futures-channel/std"]
+std = ["either/use_std", "futures-core-preview/std", "futures-channel-preview/std"]
 default = ["std"]
 
 [dependencies]
 either = { version = "1.4", default-features = false, optional = true }
-futures-core = { path = "../futures-core", version = "0.3.0-alpha", default-features = false }
-futures-channel = { path = "../futures-channel", version = "0.3.0-alpha", default-features = false }
+futures-core-preview = { path = "../futures-core", version = "0.3.0-alpha.1", default-features = false }
+futures-channel-preview = { path = "../futures-channel", version = "0.3.0-alpha.1", default-features = false }
diff --git a/futures-sink/src/lib.rs b/futures-sink/src/lib.rs
@@ -5,7 +5,7 @@
 
 #![no_std]
 #![deny(missing_docs, missing_debug_implementations)]
-#![doc(html_root_url = "https://docs.rs/futures-sink/0.3.0-alpha")]
+#![doc(html_root_url = "https://docs.rs/futures-sink-preview/0.3.0-alpha.1")]
 
 #![feature(pin, arbitrary_self_types, futures_api)]
 

diff --git a/futures-util/Cargo.toml b/futures-util/Cargo.toml
@@ -1,33 +1,36 @@
 cargo-features = ["edition"]
 
 [package]
-name = "futures-util"
+name = "futures-util-preview"
 edition = "2018"
-version = "0.3.0-alpha"
+version = "0.3.0-alpha.1"
 authors = ["Alex Crichton <alex@alexcrichton.com>"]
 license = "MIT/Apache-2.0"
 repository = "https://github.com/rust-lang-nursery/futures-rs"
 homepage = "https://github.com/rust-lang-nursery/futures-rs"
-documentation = "https://docs.rs/futures-core"
+documentation = "https://docs.rs/futures-util-preview"
 description = """
 Common utilities and extension traits for the futures-rs library.
 """
 
+[lib]
+name = "futures_util"
+
 [features]
-std = ["futures-core/std", "futures-io/std", "futures-sink/std", "either/use_std", "slab"]
-default = ["std", "futures-core/either", "futures-sink/either"]
+std = ["futures-core-preview/std", "futures-io-preview/std", "futures-sink-preview/std", "either/use_std", "slab"]
+default = ["std", "futures-core-preview/either", "futures-sink-preview/either"]
 bench = []
 nightly = []
 
 [dependencies]
-futures-core = { path = "../futures-core", version = "0.3.0-alpha", default-features = false }
-futures-channel = { path = "../futures-channel", version = "0.3.0-alpha", default-features = false }
-futures-io = { path = "../futures-io", version = "0.3.0-alpha", default-features = false }
-futures-sink = { path = "../futures-sink", version = "0.3.0-alpha", default-features = false}
+futures-core-preview = { path = "../futures-core", version = "0.3.0-alpha.1", default-features = false }
+futures-channel-preview = { path = "../futures-channel", version = "0.3.0-alpha.1", default-features = false }
+futures-io-preview = { path = "../futures-io", version = "0.3.0-alpha.1", default-features = false }
+futures-sink-preview = { path = "../futures-sink", version = "0.3.0-alpha.1", default-features = false}
 either = { version = "1.4", default-features = false }
 slab = { version = "0.4", optional = true }
 
 [dev-dependencies]
-futures = { path = "../futures", version = "0.3.0-alpha" }
-futures-executor = { path = "../futures-executor", version = "0.3.0-alpha" }
+futures-preview = { path = "../futures", version = "0.3.0-alpha.1" }
+futures-executor-preview = { path = "../futures-executor", version = "0.3.0-alpha.1" }
 # futures-channel = { path = "../futures-channel", version = "0.2.0" }
diff --git a/futures-util/src/lib.rs b/futures-util/src/lib.rs
@@ -8,7 +8,7 @@
 #![deny(missing_docs, missing_debug_implementations, warnings)]
 #![deny(bare_trait_objects)]
 
-#![doc(html_root_url = "https://docs.rs/futures-util/0.3.0-alpha")]
+#![doc(html_root_url = "https://docs.rs/futures-util-preview/0.3.0-alpha.1")]
 
 #[macro_use]
 mod macros;

diff --git a/futures/Cargo.toml b/futures/Cargo.toml
@@ -1,35 +1,38 @@
 cargo-features = ["edition"]
 
 [package]
-name = "futures"
+name = "futures-preview"
 edition = "2018"
-version = "0.3.0-alpha"
+version = "0.3.0-alpha.1"
 authors = ["Alex Crichton <alex@alexcrichton.com>"]
 license = "MIT/Apache-2.0"
 readme = "README.md"
 keywords = ["futures", "async", "future"]
 repository = "https://github.com/rust-lang-nursery/futures-rs"
 homepage = "https://github.com/rust-lang-nursery/futures-rs"
-documentation = "https://docs.rs/futures"
+documentation = "https://docs.rs/futures-preview"
 description = """
 An implementation of futures and streams featuring zero allocations,
 composability, and iterator-like interfaces.
 """
 categories = ["asynchronous"]
 
+[lib]
+name = "futures"
+
 [badges]
 travis-ci = { repository = "rust-lang-nursery/futures-rs" }
 appveyor = { repository = "rust-lang-nursery/futures-rs" }
 
 [dependencies]
-futures-core = { path = "../futures-core", version = "0.3.0-alpha", default-features = false }
-futures-channel = { path = "../futures-channel", version = "0.3.0-alpha", default-features = false }
-futures-executor = { path = "../futures-executor", version = "0.3.0-alpha", default-features = false }
-futures-io = { path = "../futures-io", version = "0.3.0-alpha", default-features = false }
-futures-sink = { path = "../futures-sink", version = "0.3.0-alpha", default-features = false }
-futures-util = { path = "../futures-util", version = "0.3.0-alpha", default-features = false }
+futures-core-preview = { path = "../futures-core", version = "0.3.0-alpha.1", default-features = false }
+futures-channel-preview = { path = "../futures-channel", version = "0.3.0-alpha.1", default-features = false }
+futures-executor-preview = { path = "../futures-executor", version = "0.3.0-alpha.1", default-features = false }
+futures-io-preview = { path = "../futures-io", version = "0.3.0-alpha.1", default-features = false }
+futures-sink-preview = { path = "../futures-sink", version = "0.3.0-alpha.1", default-features = false }
+futures-util-preview = { path = "../futures-util", version = "0.3.0-alpha.1", default-features = false }
 
 [features]
-nightly = ["futures-util/nightly"]
-std = ["futures-core/std", "futures-executor/std", "futures-io/std", "futures-sink/std", "futures-util/std"]
+nightly = ["futures-util-preview/nightly"]
+std = ["futures-core-preview/std", "futures-executor-preview/std", "futures-io-preview/std", "futures-sink-preview/std", "futures-util-preview/std"]
 default = ["std"]
diff --git a/futures/src/lib.rs b/futures/src/lib.rs
@@ -28,7 +28,7 @@
 #![deny(missing_docs, missing_debug_implementations)]
 #![deny(bare_trait_objects)]
 
-#![doc(html_root_url = "https://docs.rs/futures-preview/0.3.0-alpha")]
+#![doc(html_root_url = "https://docs.rs/futures-preview/0.3.0-alpha.1")]
 
 #![cfg_attr(feature = "nightly", feature(cfg_target_has_atomic))]
 #![cfg_attr(feature = "nightly", feature(use_extern_macros))]