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.

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

Update pin-project to 1 #2228

Merged
merged 2 commits into from
Oct 14, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
27 changes: 25 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,33 @@ before_cache:

matrix:
include:
# This is the minimum Rust version supported by futures-rs.
# This is the minimum Rust version supported by futures-core, futures-io, futures-sink, futures-task, futures-channel.
# When updating this, the reminder to update the minimum required version in README.md.
- name: cargo check (minimum required version)
- name: cargo check (minimum required version of futures-{core, io, sink, task})
rust: 1.36.0
install:
# cargo does not support for --features/--no-default-features with workspace, so use cargo-hack instead.
# Refs: cargo#3620, cargo#4106, cargo#4463, cargo#4753, cargo#5015, cargo#5364, cargo#6195
- if ! cargo hack -V 2>/dev/null; then
cargo install cargo-hack;
fi
script:
# remove dev-dependencies to avoid https://github.com/rust-lang/cargo/issues/4866
- cargo hack --remove-dev-deps --workspace
# Check no-default-features
- cargo hack check --workspace --ignore-private --no-default-features
--exclude futures --exclude futures-util --exclude futures-executor --exclude futures-test
# Check alloc feature
- cargo hack check --workspace --ignore-private --no-default-features --features alloc --ignore-unknown-features
--exclude futures --exclude futures-util --exclude futures-executor --exclude futures-test
# Check std feature
- cargo hack check --workspace --ignore-private --no-default-features --features std --ignore-unknown-features
--exclude futures --exclude futures-util --exclude futures-executor --exclude futures-test

# This is the minimum Rust version supported by futures, futures-util, futures-executor, futures-test.
# When updating this, the reminder to update the minimum required version in README.md.
- name: cargo check (minimum required version of futures-{util, executor, test})
rust: 1.37.0
install:
# cargo does not support for --features/--no-default-features with workspace, so use cargo-hack instead.
# Refs: cargo#3620, cargo#4106, cargo#4463, cargo#4753, cargo#5015, cargo#5364, cargo#6195
Expand Down
2 changes: 1 addition & 1 deletion futures-test/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ futures-executor = { version = "0.3.6", path = "../futures-executor", default-fe
futures-sink = { version = "0.3.6", path = "../futures-sink", default-features = false }
pin-utils = { version = "0.1.0", default-features = false }
once_cell = { version = "1.3.1", default-features = false, features = ["std"], optional = true }
pin-project = "0.4.20"
pin-project = "1"

[dev-dependencies]
futures = { version = "0.3.6", path = "../futures", default-features = false, features = ["std", "executor"] }
Expand Down
2 changes: 1 addition & 1 deletion futures-util/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ memchr = { version = "2.2", optional = true }
futures_01 = { version = "0.1.25", optional = true, package = "futures" }
tokio-io = { version = "0.1.9", optional = true }
pin-utils = "0.1.0"
pin-project = "0.4.20"
pin-project = "1"

[dev-dependencies]
futures = { path = "../futures", version = "0.3.6", features = ["async-await", "thread-pool"] }
Expand Down
2 changes: 1 addition & 1 deletion futures/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ futures-executor = { path = "../futures-executor", version = "0.3.6", features =
futures-test = { path = "../futures-test", version = "0.3.6" }
tokio = "0.1.11"
assert_matches = "1.3.0"
pin-project = "0.4.20"
pin-project = "1"

[features]
default = ["std", "async-await", "executor"]
Expand Down