Merge pull request #275 from shepmaster/future-future

.cirrus.yml

@@ -20,8 +20,6 @@ stable_test_task:
     - cargo test --manifest-path compatibility-tests/backtrace-shim/Cargo.toml
   backtraces_impl_backtrace_crate_test_script:
     - cargo test --manifest-path compatibility-tests/backtraces-impl-backtrace-crate/Cargo.toml
-  futures_0.1_test_script:
-    - cargo test --manifest-path compatibility-tests/futures-0.1/Cargo.toml
   context_selectors_have_documentation_test_script:
     - cargo test --manifest-path compatibility-tests/context-selectors-have-documentation/Cargo.toml
   renamed_import_test_script:
@@ -60,8 +58,6 @@ doc_test_task:
     - cargo +nightly doc --features=backtraces-impl-backtrace-crate
   unstable_backtraces_impl_std_docs_script:
     - cargo +nightly doc --features=unstable-backtraces-impl-std
-  futures_01_docs_script:
-    - cargo +nightly doc --features=futures-01
   futures_docs_script:
     - cargo +nightly doc --features=futures
   before_cache_script: rm -rf $CARGO_HOME/registry/index
@@ -86,8 +82,6 @@ doc_tests_task:
   #
   # unstable_backtraces_impl_std_doctests_script:
   #   - cargo +nightly test --doc --features=unstable-backtraces-impl-std
-  futures_01_doctests_script:
-    - cargo +nightly test --doc --features=futures-01
   futures_doctests_script:
     - cargo +nightly test --doc --features=futures,internal-dev-dependencies
   before_cache_script: rm -rf $CARGO_HOME/registry/index

Cargo.toml

@@ -22,7 +22,7 @@ exclude = [
 
 [package.metadata.docs.rs]
 # The backtraces-impl-* features are incompatible with each other
-features = [ "std", "backtraces", "futures-01", "futures", "guide" ]
+features = [ "std", "backtraces", "futures", "guide" ]
 
 [features]
 default = ["std", "guide"]
@@ -40,9 +40,6 @@ backtraces-impl-backtrace-crate = ["backtraces"]
 # implement `std::error::Error::backtrace`
 unstable-backtraces-impl-std = ["backtraces", "snafu-derive/unstable-backtraces-impl-std"]
 
-# Add extension traits for the futures 0.1 crate
-futures-01 = ["futures-01-crate"]
-
 # The standard library's implementation of futures
 futures = ["futures-core-crate", "pin-project"]
 
@@ -62,7 +59,6 @@ exclude = ["compatibility-tests"]
 snafu-derive = { path = "snafu-derive", version = "0.6.10" }
 doc-comment = { version = "0.3.1", default-features = false }
 backtrace = { version = "0.3.0", optional = true }
-futures-01-crate = { package = "futures", version = "0.1", optional = true, default-features = false }
 futures-crate = { package = "futures", version = "0.3.0", optional = true, default-features = false }
 futures-core-crate = { package = "futures-core", version = "0.3.0", optional = true, default-features = false }
 pin-project = { version = "1.0", optional = true, default-features = false }