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

Fix CI failure #2761

Merged
merged 4 commits into from
Jul 10, 2023
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
12 changes: 6 additions & 6 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,8 @@ jobs:
# Check std feature
- run: cargo hack build --workspace --ignore-private --no-default-features --features std --ignore-unknown-features
# Check compat feature (futures, futures-util)
- run: cargo hack build -p futures -p futures-util --no-default-features --features std,io-compat
# Exclude io-compat feature because the MSRV when it is enabled depends on the MSRV of tokio 0.1.
- run: cargo hack build -p futures -p futures-util --no-default-features --features std,compat
# Check thread-pool feature (futures, futures-executor)
- run: cargo hack build -p futures -p futures-executor --no-default-features --features std,thread-pool

Expand All @@ -151,18 +152,17 @@ jobs:
- run: cargo build --tests --features default,thread-pool,io-compat --manifest-path futures/Cargo.toml

minimal-versions:
name: cargo build -Z minimal-versions
name: cargo minimal-versions build
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- name: Install Rust
run: rustup update nightly && rustup default nightly
- name: Install cargo-hack
uses: taiki-e/install-action@cargo-hack
# remove dev-dependencies to avoid https://github.com/rust-lang/cargo/issues/4866
- run: cargo hack --remove-dev-deps --workspace
- run: cargo update -Z minimal-versions
- run: cargo build --workspace --all-features
- name: Install cargo-minimal-versions
uses: taiki-e/install-action@cargo-minimal-versions
- run: cargo minimal-versions build --workspace --ignore-private --all-features

no-std:
name: cargo build --target ${{ matrix.target }}
Expand Down
1 change: 1 addition & 0 deletions futures-channel/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
allow(dead_code, unused_assignments, unused_variables)
)
))]
#![allow(clippy::arc_with_non_send_sync)] // false positive https://github.com/rust-lang/rust-clippy/issues/11076

#[cfg(not(futures_no_atomic_cas))]
#[cfg(feature = "alloc")]
Expand Down
2 changes: 1 addition & 1 deletion futures-macro/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,6 @@ proc-macro = true
[features]

[dependencies]
proc-macro2 = "1.0"
proc-macro2 = "1.0.60"
quote = "1.0"
syn = { version = "2.0.8", features = ["full"] }
1 change: 1 addition & 0 deletions futures-util/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
))]
#![cfg_attr(docsrs, feature(doc_cfg))]
#![allow(clippy::needless_borrow)] // https://github.com/rust-lang/futures-rs/pull/2558#issuecomment-1030745203
#![allow(clippy::arc_with_non_send_sync)] // false positive https://github.com/rust-lang/rust-clippy/issues/11076

#[cfg(all(feature = "bilock", not(feature = "unstable")))]
compile_error!("The `bilock` feature requires the `unstable` feature as an explicit opt-in to unstable features");
Expand Down
3 changes: 1 addition & 2 deletions futures/tests/async_await_macros.rs
Original file line number Diff line number Diff line change
Expand Up @@ -321,8 +321,7 @@ fn stream_select() {
assert_eq!(endless_ones.next().await, Some(1));
assert_eq!(endless_ones.next().await, Some(1));

let mut finite_list =
stream_select!(stream::iter(vec![1].into_iter()), stream::iter(vec![1].into_iter()));
let mut finite_list = stream_select!(stream::iter(vec![1]), stream::iter(vec![1]));
assert_eq!(finite_list.next().await, Some(1));
assert_eq!(finite_list.next().await, Some(1));
assert_eq!(finite_list.next().await, None);
Expand Down
5 changes: 2 additions & 3 deletions futures/tests/stream_select_all.rs
Original file line number Diff line number Diff line change
Expand Up @@ -79,16 +79,15 @@ fn works_1() {

#[test]
fn clear() {
let mut tasks =
select_all(vec![stream::iter(vec![1].into_iter()), stream::iter(vec![2].into_iter())]);
let mut tasks = select_all(vec![stream::iter(vec![1]), stream::iter(vec![2])]);

assert_eq!(block_on(tasks.next()), Some(1));
assert!(!tasks.is_empty());

tasks.clear();
assert!(tasks.is_empty());

tasks.push(stream::iter(vec![3].into_iter()));
tasks.push(stream::iter(vec![3]));
assert!(!tasks.is_empty());

tasks.clear();
Expand Down