Merge branch 'main' into http-types-no-default-features

Author: yoshuawuyts

Cargo.toml

@@ -17,11 +17,11 @@ authors = [
 [features]
 
 [dependencies]
-async-std = { version = "1.6.0", features = ["unstable"] }
+futures-lite = "1.11.3"
 http-types = { version = "2.10.0", default-features = false }
 log = "0.4.8"
 memchr = "2.3.3"
-pin-project-lite = "0.1.4"
+pin-project-lite = "0.2.7"
 async-channel = "1.1.1"
 
 [dev-dependencies]

src/decoder.rs

@@ -1,11 +1,11 @@
-use async_std::io::BufRead as AsyncBufRead;
-use async_std::stream::Stream;
-use async_std::task::{self, Context, Poll};
+use crate::Lines;
+use futures_lite::prelude::*;
+use futures_lite::ready;
+use std::task::{Context, Poll};
 
 use std::pin::Pin;
 
 use crate::Event;
-use crate::Lines;
 
 /// Decode a new incoming SSE connection.
 pub fn decode<R>(reader: R) -> Decoder<R>
@@ -69,7 +69,7 @@ impl<R: AsyncBufRead + Unpin> Stream for Decoder<R> {
     fn poll_next(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Option<Self::Item>> {
         loop {
             // Get the next line, if available.
-            let line = match task::ready!(Pin::new(&mut self.lines).poll_next(cx)) {
+            let line = match ready!(Pin::new(&mut self.lines).poll_next(cx)) {
                 None => return Poll::Ready(None),
                 Some(Err(e)) => return Poll::Ready(Some(Err(e.into()))),
                 Some(Ok(line)) => line,

src/encoder.rs

@@ -1,6 +1,6 @@
-use async_std::io::{BufRead as AsyncBufRead, Read as AsyncRead};
-use async_std::prelude::*;
-use async_std::task::{ready, Context, Poll};
+use futures_lite::prelude::*;
+use futures_lite::ready;
+use std::task::{Context, Poll};
 
 use std::io;
 use std::pin::Pin;

src/lines.rs

@@ -1,12 +1,13 @@
+use std::io;
 use std::mem;
 use std::pin::Pin;
 use std::str;
 
 use pin_project_lite::pin_project;
 
-use async_std::io::{self, BufRead};
-use async_std::stream::Stream;
-use async_std::task::{ready, Context, Poll};
+use futures_lite::prelude::*;
+use futures_lite::ready;
+use std::task::{Context, Poll};
 
 pin_project! {
     /// A stream of lines in a byte stream.
@@ -31,7 +32,7 @@ pin_project! {
 impl<R> Lines<R> {
     pub(crate) fn new(reader: R) -> Lines<R>
     where
-        R: BufRead + Unpin + Sized,
+        R: AsyncBufRead + Unpin + Sized,
     {
         Lines {
             reader,
@@ -42,12 +43,12 @@ impl<R> Lines<R> {
     }
 }
 
-impl<R: BufRead> Stream for Lines<R> {
+impl<R: AsyncBufRead> Stream for Lines<R> {
     type Item = io::Result<String>;
 
     fn poll_next(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Option<Self::Item>> {
         let this = self.project();
-        let n = async_std::task::ready!(read_line_internal(
+        let n = ready!(read_line_internal(
             this.reader,
             cx,
             this.buf,
@@ -67,7 +68,7 @@ impl<R: BufRead> Stream for Lines<R> {
     }
 }
 
-fn read_line_internal<R: BufRead + ?Sized>(
+fn read_line_internal<R: AsyncBufRead + ?Sized>(
     reader: Pin<&mut R>,
     cx: &mut Context<'_>,
     buf: &mut String,
@@ -91,7 +92,7 @@ fn read_line_internal<R: BufRead + ?Sized>(
     }
 }
 
-fn read_until_internal<R: BufRead + ?Sized>(
+fn read_until_internal<R: AsyncBufRead + ?Sized>(
     mut reader: Pin<&mut R>,
     cx: &mut Context<'_>,
     buf: &mut Vec<u8>,