algesten · brandonros · Dec 1, 2024 · Dec 1, 2024 · Dec 1, 2024 · Dec 1, 2024
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -11,16 +11,15 @@ categories = ["web-programming::http-client"]
 edition = "2018"
 exclude = ["/cargo_deny.sh", "/deny.toml", "/test.sh"]
 
-
 # MSRV
-rust-version = "1.71.1"
+rust-version = "1.83.0"
 
 [package.metadata.docs.rs]
 features = ["rustls", "platform-verifier", "native-tls", "socks-proxy", "cookies", "gzip", "brotli", "charset", "json", "_test"]
 
 [features]
 #default = ["rustls", "gzip", "json", "std"]
-default = ["rustls", "gzip", "json"]
+default = ["rustls", "json"]
 rustls = ["dep:rustls", "_tls", "dep:webpki-roots"]
 platform-verifier = ["dep:rustls-platform-verifier"]
 native-tls = ["dep:native-tls", "dep:der", "_tls", "dep:webpki-root-certs"]
@@ -75,6 +74,11 @@ encoding_rs = { version = "0.8.34", optional = true }
 serde = { version = "1.0.204", optional = true, default-features = false, features = ["std"] }
 serde_json = { version = "1.0.120", optional = true, default-features = false, features = ["std"] }
 
+# TODO: no_std?
+spin = "0.9.8"
+web-time = "1.1.0"
+no_std_io = "0.6.0"
+
 [build-dependencies]
 cc = "1.0.106"
 
@@ -84,7 +88,6 @@ auto-args = "0.3.0"
 serde = { version = "1.0.204", features = ["std", "derive"] }
 assert_no_alloc = "1.1.2"
 
-
 [[example]]
 name = "cureq"
 required-features = ["rustls", "native-tls", "socks-proxy", "cookies", "gzip", "brotli", "charset"]
diff --git a/src/agent.rs b/src/agent.rs
@@ -1,8 +1,6 @@
-use std::convert::TryFrom;
-use std::fmt::Debug;
-use std::sync::Arc;
-
+use alloc::sync::Arc;
 use http::{Method, Request, Response, Uri};
+use core::convert::TryFrom;
 
 use crate::body::Body;
 use crate::config::typestate::{AgentScope, HttpCrateScope};

diff --git a/src/body/brotli.rs b/src/body/brotli.rs
@@ -1,5 +1,3 @@
-use std::io;
-
 use brotli_decompressor::Decompressor;
 
 use crate::Error;

diff --git a/src/body/build.rs b/src/body/build.rs
@@ -1,5 +1,4 @@
-use std::io::{self, Cursor};
-use std::sync::Arc;
+use alloc::{boxed::Box, string::String, sync::Arc, vec::Vec};
 
 use ureq_proto::BodyMode;
 
@@ -112,14 +111,15 @@ impl BodyBuilder {
         let len = self.limit.unwrap_or(data.len() as u64);
         self.info.body_mode = BodyMode::LengthDelimited(len);
 
-        self.reader(Cursor::new(data))
+        //self.reader(Cursor::new(data))
+        todo!()
     }
 
     /// Creates a body from a streaming reader.
     ///
     /// The reader can be limited by using `.limit()` or that the reader
     /// reaches the end.
-    pub fn reader(self, data: impl io::Read + Send + Sync + 'static) -> Body {
+    pub fn reader(self, data: impl no_std_io::io::Read + Send + Sync + 'static) -> Body {
         Body {
             source: BodyDataSource::Reader(Box::new(data)),
             info: Arc::new(self.info),

diff --git a/src/body/charset.rs b/src/body/charset.rs
@@ -1,6 +1,4 @@
 use encoding_rs::{Decoder, Encoder, Encoding};
-use std::fmt;
-use std::io::{self, BufRead, BufReader};
 
 use crate::util::ConsumeBuf;
 

diff --git a/src/body/gzip.rs b/src/body/gzip.rs
@@ -1,4 +1,4 @@
-use std::io;
+use no_std_io::io;
 
 use flate2::read::MultiGzDecoder;
 
@@ -66,4 +66,4 @@ mod test {
 
         assert_eq!(agent.pool_count(), 1);
     }
-}
+}
diff --git a/src/body/limit.rs b/src/body/limit.rs
@@ -1,4 +1,4 @@
-use std::io;
+use no_std_io::io;
 
 use crate::Error;
 

diff --git a/src/body/lossy.rs b/src/body/lossy.rs
@@ -1,4 +1,4 @@
-use std::io;
+use no_std_io::io;
 
 use utf8::DecodeError;
 
@@ -99,7 +99,9 @@ impl<R: io::Read> io::Read for LossyUtf8Reader<R> {
 
 #[cfg(test)]
 mod test {
-    use std::io::Read;
+    use no_std_io::io;
+
+    use alloc::string::String;
 
     use super::*;
 

diff --git a/src/body/mod.rs b/src/body/mod.rs
@@ -1,7 +1,11 @@
-use std::fmt;
-use std::io;
-use std::sync::Arc;
+use no_std_io::io;
+use core::fmt;
 
+use alloc::boxed::Box;
+use alloc::string::{String, ToString};
+use alloc::sync::Arc;
+
+use alloc::vec::Vec;
 pub use build::BodyBuilder;
 use ureq_proto::BodyMode;
 
@@ -392,7 +396,6 @@ impl<'a> BodyWithConfig<'a> {
 
     /// Read into string.
     pub fn read_to_string(self) -> Result<String, Error> {
-        use std::io::Read;
         let mut reader = self.do_build();
         let mut buf = String::new();
         reader.read_to_string(&mut buf)?;
@@ -401,7 +404,6 @@ impl<'a> BodyWithConfig<'a> {
 
     /// Read into vector.
     pub fn read_to_vec(self) -> Result<Vec<u8>, Error> {
-        use std::io::Read;
         let mut reader = self.do_build();
         let mut buf = Vec::new();
         reader.read_to_end(&mut buf)?;

diff --git a/src/config.rs b/src/config.rs
@@ -1,10 +1,11 @@
 //! Agent configuration
 
-use std::fmt;
-use std::net::SocketAddr;
-use std::sync::Arc;
-use std::time::Duration;
+use core::net::SocketAddr;
+use core::time::Duration;
 
+use alloc::fmt;
+use alloc::string::String;
+use alloc::sync::Arc;
 use http::Uri;
 
 use crate::http;

diff --git a/src/cookies.rs b/src/cookies.rs
@@ -1,7 +1,4 @@
-use std::borrow::Cow;
-use std::fmt;
-use std::sync::{Mutex, MutexGuard};
-
+use no_std_io::io;
 use cookie_store::CookieStore;
 use http::Uri;
 

diff --git a/src/error.rs b/src/error.rs
@@ -1,4 +1,6 @@
-use std::{fmt, io};
+use alloc::fmt;
+use alloc::string::String;
+use no_std_io::io;
 
 use crate::http;
 use crate::Timeout;
@@ -139,6 +141,7 @@ pub enum Error {
     BodyStalled,
 }
 
+#[cfg(feature = "std")]
 impl std::error::Error for Error {}
 
 impl Error {
@@ -309,7 +312,7 @@ mod test {
     #[test]
     fn ensure_error_size() {
         // This is platform dependent, so we can't be too strict or precise.
-        let size = std::mem::size_of::<Error>();
+        let size = core::mem::size_of::<Error>();
         assert!(size < 100); // 40 on Macbook M1
     }
 }