diff --git a/Cargo.toml b/Cargo.toml index 8b0c739..4ad4dba 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -3,6 +3,7 @@ name = "reqwless" version = "0.12.1" edition = "2021" resolver = "2" +rust-version = "1.77" description = "HTTP client for embedded devices" documentation = "https://docs.rs/reqwless" readme = "README.md" @@ -16,7 +17,7 @@ exclude = [".github"] buffered-io = { version = "0.5.4" } embedded-io = { version = "0.6" } embedded-io-async = { version = "0.6" } -embedded-nal-async = "0.7.0" +embedded-nal-async = "0.8.0" httparse = { version = "1.8.0", default-features = false } heapless = "0.8" hex = { version = "0.4", default-features = false } diff --git a/README.md b/README.md index b62aad2..ccba988 100644 --- a/README.md +++ b/README.md @@ -117,4 +117,4 @@ This enables `alloc` on `embedded-tls` which in turn enables RSA signature algor # Minimum supported Rust version (MSRV) -`reqwless` can compile on stable Rust 1.75 and up. +`reqwless` can compile on stable Rust 1.77 and up. diff --git a/rust-toolchain.toml b/rust-toolchain.toml deleted file mode 100644 index 73998ee..0000000 --- a/rust-toolchain.toml +++ /dev/null @@ -1,5 +0,0 @@ -# Before upgrading check that everything is available on all tier1 targets here: -# https://rust-lang.github.io/rustup-components-history -[toolchain] -channel = "1.75" -components = ["clippy"] diff --git a/src/client.rs b/src/client.rs index d527632..e4d9f8c 100644 --- a/src/client.rs +++ b/src/client.rs @@ -6,10 +6,11 @@ use crate::request::*; use crate::response::*; use crate::Error; use buffered_io::asynch::BufferedWrite; +use core::net::SocketAddr; use embedded_io::Error as _; use embedded_io::ErrorType; use embedded_io_async::{Read, Write}; -use embedded_nal_async::{Dns, SocketAddr, TcpConnect}; +use embedded_nal_async::{Dns, TcpConnect}; use nourl::{Url, UrlScheme}; /// An async HTTP client that can establish a TCP connection and perform diff --git a/tests/connection.rs b/tests/connection.rs index 07f8e00..2975bc4 100644 --- a/tests/connection.rs +++ b/tests/connection.rs @@ -1,8 +1,8 @@ use embedded_io_adapters::tokio_1::FromTokio; use embedded_io_async::{ErrorType, Read, Write}; -use embedded_nal_async::{AddrType, IpAddr, Ipv4Addr}; +use embedded_nal_async::AddrType; use reqwless::TryBufRead; -use std::net::{SocketAddr, ToSocketAddrs}; +use std::net::{IpAddr, Ipv4Addr, SocketAddr, ToSocketAddrs}; use tokio::net::TcpStream; #[derive(Debug)] @@ -77,13 +77,10 @@ impl embedded_nal_async::TcpConnect for TokioTcp { type Error = std::io::Error; type Connection<'m> = TokioStream; - async fn connect<'m>( - &'m self, - remote: embedded_nal_async::SocketAddr, - ) -> Result, Self::Error> { + async fn connect<'m>(&'m self, remote: SocketAddr) -> Result, Self::Error> { let ip = match remote { - embedded_nal_async::SocketAddr::V4(a) => a.ip().octets().into(), - embedded_nal_async::SocketAddr::V6(a) => a.ip().octets().into(), + SocketAddr::V4(a) => a.ip().octets().into(), + SocketAddr::V6(a) => a.ip().octets().into(), }; let remote = SocketAddr::new(ip, remote.port()); let stream = TcpStream::connect(remote).await?;