Skip to content

Commit

Permalink
Update lib to std-future
Browse files Browse the repository at this point in the history
  • Loading branch information
95th authored and seanmonstar committed Aug 17, 2019
1 parent 782f1f7 commit c8fefd4
Show file tree
Hide file tree
Showing 19 changed files with 1,133 additions and 1,046 deletions.
10 changes: 5 additions & 5 deletions .travis.yml
Expand Up @@ -15,10 +15,10 @@ addons:
matrix:
include:
- rust: nightly
- rust: stable
# - rust: stable
before_deploy: cargo doc --no-deps
allow_failures:
- rust: nightly
# allow_failures:
# - rust: nightly

before_script:
- cargo clean
Expand All @@ -39,8 +39,8 @@ script:
# Run integration tests
- cargo test -p h2-tests

# Run h2spec on stable
- if [ "${TRAVIS_RUST_VERSION}" = "stable" ]; then ./ci/h2spec.sh; fi
# Run h2spec on nightly for the time being. TODO: Change it to stable after Rust 1.38 release
- if [ "${TRAVIS_RUST_VERSION}" = "nightly" ]; then ./ci/h2spec.sh; fi

# Check minimal versions
- if [ "${TRAVIS_RUST_VERSION}" = "nightly" ]; then cargo clean; cargo check -Z minimal-versions; fi
Expand Down
7 changes: 4 additions & 3 deletions Cargo.toml
Expand Up @@ -41,8 +41,9 @@ members = [
]

[dependencies]
futures = "0.1"
tokio-io = "0.1.4"
futures-preview = "0.3.0-alpha.18"
tokio-io = { git = "https://github.com/tokio-rs/tokio" }
tokio-codec = { git = "https://github.com/tokio-rs/tokio" }
bytes = "0.4.7"
http = "0.1.8"
log = "0.4.1"
Expand All @@ -64,7 +65,7 @@ serde = "1.0.0"
serde_json = "1.0.0"

# Akamai example
tokio = "0.1.8"
tokio = { git = "https://github.com/tokio-rs/tokio" }
env_logger = { version = "0.5.3", default-features = false }
rustls = "0.12"
tokio-rustls = "0.5.0"
Expand Down

0 comments on commit c8fefd4

Please sign in to comment.