Unify the order of the arguments of read_*_internal functions

Unify to the same order as public read_* methods.

Author: taiki-e

futures-util/src/io/lines.rs

@@ -35,7 +35,7 @@ impl<R: AsyncBufRead> Stream for Lines<R> {
     fn poll_next(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Option<Self::Item>> {
         let Self { reader, buf, bytes, read } = unsafe { self.get_unchecked_mut() };
         let reader = unsafe { Pin::new_unchecked(reader) };
-        let n = ready!(read_line_internal(reader, buf, bytes, read, cx))?;
+        let n = ready!(read_line_internal(reader, cx, buf, bytes, read))?;
         if n == 0 && buf.is_empty() {
             return Poll::Ready(None)
         }

futures-util/src/io/read_line.rs

@@ -32,12 +32,12 @@ impl<'a, R: AsyncBufRead + ?Sized + Unpin> ReadLine<'a, R> {
 
 pub(super) fn read_line_internal<R: AsyncBufRead + ?Sized>(
     reader: Pin<&mut R>,
+    cx: &mut Context<'_>,
     buf: &mut String,
     bytes: &mut Vec<u8>,
     read: &mut usize,
-    cx: &mut Context<'_>,
 ) -> Poll<io::Result<usize>> {
-    let ret = ready!(read_until_internal(reader, b'\n', bytes, read, cx));
+    let ret = ready!(read_until_internal(reader, cx, b'\n', bytes, read));
     if str::from_utf8(&bytes).is_err() {
         Poll::Ready(ret.and_then(|_| {
             Err(io::Error::new(io::ErrorKind::InvalidData, "stream did not contain valid UTF-8"))
@@ -56,6 +56,6 @@ impl<R: AsyncBufRead + ?Sized + Unpin> Future for ReadLine<'_, R> {
 
     fn poll(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Self::Output> {
         let Self { reader, buf, bytes, read } = &mut *self;
-        read_line_internal(Pin::new(reader), buf, bytes, read, cx)
+        read_line_internal(Pin::new(reader), cx, buf, bytes, read)
     }
 }

futures-util/src/io/read_until.rs

@@ -25,10 +25,10 @@ impl<'a, R: AsyncBufRead + ?Sized + Unpin> ReadUntil<'a, R> {
 
 pub(super) fn read_until_internal<R: AsyncBufRead + ?Sized>(
     mut reader: Pin<&mut R>,
+    cx: &mut Context<'_>,
     byte: u8,
     buf: &mut Vec<u8>,
     read: &mut usize,
-    cx: &mut Context<'_>,
 ) -> Poll<io::Result<usize>> {
     loop {
         let (done, used) = {
@@ -54,6 +54,6 @@ impl<R: AsyncBufRead + ?Sized + Unpin> Future for ReadUntil<'_, R> {
 
     fn poll(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Self::Output> {
         let Self { reader, byte, buf, read } = &mut *self;
-        read_until_internal(Pin::new(reader), *byte, buf, read, cx)
+        read_until_internal(Pin::new(reader), cx, *byte, buf, read)
     }
 }