Split sync and async body into distinct types

Cargo.toml

@@ -89,7 +89,6 @@ features = ["std", "std-future"]
 [dev-dependencies]
 env_logger = "0.8"
 flate2 = "1.0"
-futures = "0.3"
 indicatif = "0.15"
 rayon = "1"
 static_assertions = "1.1"

examples/async.rs

@@ -4,12 +4,12 @@
 use isahc::prelude::*;
 
 fn main() -> Result<(), isahc::Error> {
-    futures::executor::block_on(async {
+    futures_lite::future::block_on(async {
         let mut response = isahc::get_async("http://example.org").await?;
 
         println!("Status: {}", response.status());
         println!("Headers:\n{:?}", response.headers());
-        println!("Body: {}", response.text_async().await?);
+        println!("Body: {}", response.text().await?);
 
         Ok(())
     })

examples/stream_cancellation.rs

@@ -2,7 +2,7 @@
 //! a program that aborts downloading a response if it contains the byte `0x3F`
 //! (ASCII "?").
 
-use futures::{executor::block_on, io::AsyncReadExt};
+use futures_lite::{future::block_on, io::AsyncReadExt};
 
 fn main() -> Result<(), isahc::Error> {
     block_on(async {

examples/upload_file.rs

@@ -0,0 +1,26 @@
+//! Sample program that demonstrates how to upload a file using a `PUT` request.
+//! Since 1.0, you can use a `File` as the request body directly, or anything
+//! implementing `Read`, when using the synchronous APIs.
+//!
+//! If using the asynchronous APIs, you will need an asynchronous version of
+//! `File` such as the one provided by [`async-fs`](https://docs.rs/async-fs).
+//! Isahc does not provide an implementation for you.
+
+use isahc::prelude::*;
+use std::fs::File;
+
+fn main() -> Result<(), isahc::Error> {
+    // We're opening the source code file you are looking at right now for
+    // reading.
+    let file = File::open(file!())?;
+
+    // Perform the upload.
+    let mut response = isahc::put("https://httpbin.org/put", file)?;
+
+    // Print interesting info from the response.
+    println!("Status: {}", response.status());
+    println!("Headers: {:#?}", response.headers());
+    print!("{}", response.text()?);
+
+    Ok(())
+}

src/agent.rs

@@ -336,7 +336,7 @@ impl AgentContext {
         let handle = self.requests.remove(token);
         let mut handle = self.multi.remove2(handle)?;
 
-        handle.get_mut().on_result(result);
+        handle.get_mut().set_result(result.map_err(Error::from));
 
         Ok(())
     }