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

Release 0.3.30 #2818

Merged
merged 12 commits into from
Dec 24, 2023
Merged
36 changes: 0 additions & 36 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -230,42 +230,6 @@ jobs:
--workspace --exclude futures-test \
--features unstable --ignore-unknown-features

# When this job failed, run ci/no_atomic_cas.sh and commit result changes.
codegen:
runs-on: ubuntu-latest
permissions:
contents: write
pull-requests: write
steps:
- uses: actions/checkout@v4
- name: Install Rust
run: rustup update nightly && rustup default nightly
- run: ci/no_atomic_cas.sh
- run: git add -N . && git diff --exit-code
if: github.repository_owner != 'rust-lang' || github.event_name != 'schedule'
- id: diff
run: |
git config user.name "Taiki Endo"
git config user.email "[email protected]"
git add -N .
if ! git diff --exit-code; then
git add .
git commit -m "Update no_atomic_cas.rs"
echo "::set-output name=success::false"
fi
if: github.repository_owner == 'rust-lang' && github.event_name == 'schedule'
- uses: peter-evans/create-pull-request@v5
with:
title: Update no_atomic_cas.rs
body: |
Auto-generated by [create-pull-request][1]
[Please close and immediately reopen this pull request to run CI.][2]

[1]: https://github.com/peter-evans/create-pull-request
[2]: https://github.com/peter-evans/create-pull-request/blob/HEAD/docs/concepts-guidelines.md#workarounds-to-trigger-further-workflow-runs
branch: update-no-atomic-cas-rs
if: github.repository_owner == 'rust-lang' && github.event_name == 'schedule' && steps.diff.outputs.success == 'false'

miri:
name: cargo miri test
runs-on: ubuntu-latest
Expand Down
8 changes: 8 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,11 @@
# 0.3.30 - 2023-12-24

* Add `{BiLock,SplitStream,SplitSink,ReadHalf,WriteHalf}::is_pair_of` (#2797)
* Fix panic in `FuturesUnordered::clear` (#2809)
* Fix panic in `AsyncBufReadExt::fill_buf` (#2801, #2812)
* Improve support for targets without atomic CAS (#2811)
* Remove build scripts (#2811)

# 0.3.29 - 2023-10-26

* Add `TryStreamExt::try_ready_chunks` (#2757)
Expand Down
31 changes: 0 additions & 31 deletions ci/no_atomic_cas.sh

This file was deleted.

6 changes: 3 additions & 3 deletions futures-channel/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "futures-channel"
version = "0.3.29"
version = "0.3.30"
edition = "2018"
rust-version = "1.56"
license = "MIT OR Apache-2.0"
Expand All @@ -22,8 +22,8 @@ unstable = []
cfg-target-has-atomic = []

[dependencies]
futures-core = { path = "../futures-core", version = "0.3.29", default-features = false }
futures-sink = { path = "../futures-sink", version = "0.3.29", default-features = false, optional = true }
futures-core = { path = "../futures-core", version = "0.3.30", default-features = false }
futures-sink = { path = "../futures-sink", version = "0.3.30", default-features = false, optional = true }

[dev-dependencies]
futures = { path = "../futures", default-features = true }
Expand Down
41 changes: 0 additions & 41 deletions futures-channel/build.rs

This file was deleted.

1 change: 0 additions & 1 deletion futures-channel/no_atomic_cas.rs

This file was deleted.

8 changes: 4 additions & 4 deletions futures-channel/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -27,16 +27,16 @@
)
))]

#[cfg(not(futures_no_atomic_cas))]
#[cfg_attr(target_os = "none", cfg(target_has_atomic = "ptr"))]
#[cfg(feature = "alloc")]
extern crate alloc;

#[cfg(not(futures_no_atomic_cas))]
#[cfg_attr(target_os = "none", cfg(target_has_atomic = "ptr"))]
#[cfg(feature = "alloc")]
mod lock;
#[cfg(not(futures_no_atomic_cas))]
#[cfg_attr(target_os = "none", cfg(target_has_atomic = "ptr"))]
#[cfg(feature = "std")]
pub mod mpsc;
#[cfg(not(futures_no_atomic_cas))]
#[cfg_attr(target_os = "none", cfg(target_has_atomic = "ptr"))]
#[cfg(feature = "alloc")]
pub mod oneshot;
2 changes: 1 addition & 1 deletion futures-core/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "futures-core"
version = "0.3.29"
version = "0.3.30"
edition = "2018"
rust-version = "1.36"
license = "MIT OR Apache-2.0"
Expand Down
41 changes: 0 additions & 41 deletions futures-core/build.rs

This file was deleted.

1 change: 0 additions & 1 deletion futures-core/no_atomic_cas.rs

This file was deleted.

7 changes: 5 additions & 2 deletions futures-core/src/task/__internal/mod.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
#[cfg(any(not(futures_no_atomic_cas), feature = "portable-atomic"))]
#[cfg_attr(target_os = "none", cfg(any(target_has_atomic = "ptr", feature = "portable-atomic")))]
mod atomic_waker;
#[cfg(any(not(futures_no_atomic_cas), feature = "portable-atomic"))]
#[cfg_attr(
target_os = "none",
cfg(any(target_has_atomic = "ptr", feature = "portable-atomic"))
)]
pub use self::atomic_waker::AtomicWaker;
8 changes: 4 additions & 4 deletions futures-executor/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "futures-executor"
version = "0.3.29"
version = "0.3.30"
edition = "2018"
rust-version = "1.56"
license = "MIT OR Apache-2.0"
Expand All @@ -16,9 +16,9 @@ std = ["futures-core/std", "futures-task/std", "futures-util/std"]
thread-pool = ["std", "num_cpus"]

[dependencies]
futures-core = { path = "../futures-core", version = "0.3.29", default-features = false }
futures-task = { path = "../futures-task", version = "0.3.29", default-features = false }
futures-util = { path = "../futures-util", version = "0.3.29", default-features = false }
futures-core = { path = "../futures-core", version = "0.3.30", default-features = false }
futures-task = { path = "../futures-task", version = "0.3.30", default-features = false }
futures-util = { path = "../futures-util", version = "0.3.30", default-features = false }
num_cpus = { version = "1.8.0", optional = true }

[dev-dependencies]
Expand Down
2 changes: 1 addition & 1 deletion futures-io/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "futures-io"
version = "0.3.29"
version = "0.3.30"
edition = "2018"
rust-version = "1.36"
license = "MIT OR Apache-2.0"
Expand Down
2 changes: 1 addition & 1 deletion futures-macro/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "futures-macro"
version = "0.3.29"
version = "0.3.30"
edition = "2018"
rust-version = "1.56"
license = "MIT OR Apache-2.0"
Expand Down
2 changes: 1 addition & 1 deletion futures-sink/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "futures-sink"
version = "0.3.29"
version = "0.3.30"
edition = "2018"
rust-version = "1.36"
license = "MIT OR Apache-2.0"
Expand Down
2 changes: 1 addition & 1 deletion futures-task/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "futures-task"
version = "0.3.29"
version = "0.3.30"
edition = "2018"
rust-version = "1.56"
license = "MIT OR Apache-2.0"
Expand Down
41 changes: 0 additions & 41 deletions futures-task/build.rs

This file was deleted.

1 change: 0 additions & 1 deletion futures-task/no_atomic_cas.rs

This file was deleted.

12 changes: 6 additions & 6 deletions futures-task/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -18,24 +18,24 @@ extern crate alloc;
mod spawn;
pub use crate::spawn::{LocalSpawn, Spawn, SpawnError};

#[cfg(not(futures_no_atomic_cas))]
#[cfg_attr(target_os = "none", cfg(target_has_atomic = "ptr"))]
#[cfg(feature = "alloc")]
mod arc_wake;
#[cfg(not(futures_no_atomic_cas))]
#[cfg_attr(target_os = "none", cfg(target_has_atomic = "ptr"))]
#[cfg(feature = "alloc")]
pub use crate::arc_wake::ArcWake;

#[cfg(not(futures_no_atomic_cas))]
#[cfg_attr(target_os = "none", cfg(target_has_atomic = "ptr"))]
#[cfg(feature = "alloc")]
mod waker;
#[cfg(not(futures_no_atomic_cas))]
#[cfg_attr(target_os = "none", cfg(target_has_atomic = "ptr"))]
#[cfg(feature = "alloc")]
pub use crate::waker::waker;

#[cfg(not(futures_no_atomic_cas))]
#[cfg_attr(target_os = "none", cfg(target_has_atomic = "ptr"))]
#[cfg(feature = "alloc")]
mod waker_ref;
#[cfg(not(futures_no_atomic_cas))]
#[cfg_attr(target_os = "none", cfg(target_has_atomic = "ptr"))]
#[cfg(feature = "alloc")]
pub use crate::waker_ref::{waker_ref, WakerRef};

Expand Down
4 changes: 2 additions & 2 deletions futures-task/src/spawn.rs
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@ mod if_alloc {
}
}

#[cfg(not(futures_no_atomic_cas))]
#[cfg_attr(target_os = "none", cfg(target_has_atomic = "ptr"))]
impl<Sp: ?Sized + Spawn> Spawn for alloc::sync::Arc<Sp> {
fn spawn_obj(&self, future: FutureObj<'static, ()>) -> Result<(), SpawnError> {
(**self).spawn_obj(future)
Expand All @@ -179,7 +179,7 @@ mod if_alloc {
}
}

#[cfg(not(futures_no_atomic_cas))]
#[cfg_attr(target_os = "none", cfg(target_has_atomic = "ptr"))]
impl<Sp: ?Sized + LocalSpawn> LocalSpawn for alloc::sync::Arc<Sp> {
fn spawn_local_obj(&self, future: LocalFutureObj<'static, ()>) -> Result<(), SpawnError> {
(**self).spawn_local_obj(future)
Expand Down
Loading