diff --git a/futures-async-stream-macro/src/elision.rs b/futures-async-stream-macro/src/elision.rs index b84030f..878012b 100644 --- a/futures-async-stream-macro/src/elision.rs +++ b/futures-async-stream-macro/src/elision.rs @@ -66,11 +66,11 @@ impl VisitMut for UnelideLifetimes<'_> { visit_mut::visit_type_reference_mut(self, ty); } - fn visit_generic_argument_mut(&mut self, gen: &mut GenericArgument) { - if let GenericArgument::Lifetime(lifetime) = gen { + fn visit_generic_argument_mut(&mut self, arg: &mut GenericArgument) { + if let GenericArgument::Lifetime(lifetime) = arg { self.visit_lifetime(lifetime); } - visit_mut::visit_generic_argument_mut(self, gen); + visit_mut::visit_generic_argument_mut(self, arg); } } diff --git a/src/lib.rs b/src/lib.rs index 03c0580..2038b3d 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -340,11 +340,11 @@ mod future { /// better error messages (`impl Future` rather than `GenFuture<[closure.....]>`). #[doc(hidden)] #[inline] - pub fn from_coroutine(gen: G) -> impl Future + pub fn from_coroutine(g: G) -> impl Future where G: Coroutine, { - GenFuture(gen) + GenFuture(g) } #[pin_project] @@ -398,11 +398,11 @@ mod stream { /// better error messages (`impl Stream` rather than `GenStream<[closure.....]>`). #[doc(hidden)] #[inline] - pub fn from_coroutine(gen: G) -> impl Stream + pub fn from_coroutine(g: G) -> impl Stream where G: Coroutine, Return = ()>, { - GenStream(gen) + GenStream(g) } #[pin_project] @@ -469,11 +469,11 @@ mod try_stream { /// better error messages (`impl Stream` rather than `GenStream<[closure.....]>`). #[doc(hidden)] #[inline] - pub fn from_coroutine(gen: G) -> impl FusedStream> + pub fn from_coroutine(g: G) -> impl FusedStream> where G: Coroutine, Return = Result<(), E>>, { - GenTryStream(Some(gen)) + GenTryStream(Some(g)) } #[pin_project] @@ -488,8 +488,8 @@ mod try_stream { #[inline] fn poll_next(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll> { let mut this = self.project(); - if let Some(gen) = this.0.as_mut().as_pin_mut() { - let res = match gen.resume(ResumeTy(NonNull::from(cx).cast::>())) { + if let Some(g) = this.0.as_mut().as_pin_mut() { + let res = match g.resume(ResumeTy(NonNull::from(cx).cast::>())) { CoroutineState::Yielded(x) => x.map(|x| Some(Ok(x))), CoroutineState::Complete(Err(e)) => Poll::Ready(Some(Err(e))), CoroutineState::Complete(Ok(())) => Poll::Ready(None),