fluencelabs/rust-libp2p
1
0
Fork 0
mirror of https://github.com/fluencelabs/rust-libp2p synced 2025-06-28 17:21:34 +00:00
Code Issues Projects Releases Wiki Activity

deps: bump futures from 0.3.25 to 0.3.26 (#3405)

Browse Source
This commit is contained in:
dependabot[bot]
2023-01-31 23:34:17 +00:00
committed by GitHub
parent 8f3b7e3876
commit 0c94237e16
31 changed files with 67 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
core/src/either.rs
View File

@ -41,7 +41,7 @@ where
self: Pin<&mut Self>,
cx: &mut Context<'_>,
) -> Poll<Result<Self::Substream, Self::Error>> {
match as_pin_mut(self) {
match self.as_pin_mut() {
future::Either::Left(inner) => inner
.poll_inbound(cx)
.map_ok(future::Either::Left)
@ -57,7 +57,7 @@ where
self: Pin<&mut Self>,
cx: &mut Context<'_>,
) -> Poll<Result<Self::Substream, Self::Error>> {
match as_pin_mut(self) {
match self.as_pin_mut() {
future::Either::Left(inner) => inner
.poll_outbound(cx)
.map_ok(future::Either::Left)
@ -70,7 +70,7 @@ where
}
fn poll_close(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Result<(), Self::Error>> {
match as_pin_mut(self) {
match self.as_pin_mut() {
future::Either::Left(inner) => inner.poll_close(cx).map_err(Either::Left),
future::Either::Right(inner) => inner.poll_close(cx).map_err(Either::Right),
}
@ -80,35 +80,13 @@ where
self: Pin<&mut Self>,
cx: &mut Context<'_>,
) -> Poll<Result<StreamMuxerEvent, Self::Error>> {
match as_pin_mut(self) {
match self.as_pin_mut() {
future::Either::Left(inner) => inner.poll(cx).map_err(Either::Left),
future::Either::Right(inner) => inner.poll(cx).map_err(Either::Right),
}
}
}
/// Convert `Pin<&mut Either<A, B>>` to `Either<Pin<&mut A>, Pin<&mut B>>`,
/// pinned projections of the inner variants.
///
/// Local function until <https://github.com/rust-lang/futures-rs/pull/2691> is merged.
fn as_pin_mut<A, B>(
either: Pin<&mut future::Either<A, B>>,
) -> future::Either<Pin<&mut A>, Pin<&mut B>> {
// SAFETY: `get_unchecked_mut` is fine because we don't move anything.
// We can use `new_unchecked` because the `inner` parts are guaranteed
// to be pinned, as they come from `self` which is pinned, and we never
// offer an unpinned `&mut L` or `&mut R` through `Pin<&mut Self>`. We
// also don't have an implementation of `Drop`, nor manual `Unpin`.
unsafe {
match *Pin::get_unchecked_mut(either) {
future::Either::Left(ref mut inner) => future::Either::Left(Pin::new_unchecked(inner)),
future::Either::Right(ref mut inner) => {
future::Either::Right(Pin::new_unchecked(inner))
}
}
}
}
/// Implements `Future` and dispatches all method calls to either `First` or `Second`.
#[pin_project(project = EitherFutureProj)]
#[derive(Debug, Copy, Clone)]