From 64ebd47979858f61895b801ee0446605b3145f99 Mon Sep 17 00:00:00 2001
From: Jacob Hoffman-Andrews <github@hoffman-andrews.com>
Date: Wed, 2 Dec 2020 00:05:05 -0800
Subject: [PATCH] Add nicer doctest; revert smoke-test.

---
 examples/smoke-test/main.rs | 40 ++++++++++---------------------------
 src/error.rs                | 38 ++++++++++++++++-------------------
 2 files changed, 28 insertions(+), 50 deletions(-)

diff --git a/examples/smoke-test/main.rs b/examples/smoke-test/main.rs
index f36757e..4c7ea28 100644
--- a/examples/smoke-test/main.rs
+++ b/examples/smoke-test/main.rs
@@ -1,11 +1,11 @@
-use std::io::{self, BufRead, BufReader, Read, Write};
+use std::io::{self, BufRead, BufReader, Read};
 use std::sync::{Arc, Mutex};
 use std::thread::{self, JoinHandle};
 use std::time::Duration;
-use std::{env, error, fmt, result, result::Result};
+use std::{env, error, fmt, result};
 
 use log::{error, info};
-use ureq::{self, Response};
+use ureq;
 
 #[derive(Debug)]
 struct Oops(String);
@@ -30,13 +30,14 @@ impl fmt::Display for Oops {
     }
 }
 
-fn get(agent: &ureq::Agent, url: &str) -> std::result::Result<(), Oops> {
-    let r = get_response(agent, url)?;
-    let mut reader = r.into_reader();
+type Result<T> = result::Result<T, Oops>;
+
+fn get(agent: &ureq::Agent, url: &str) -> Result<Vec<u8>> {
+    let response = agent.get(url).call()?;
+    let mut reader = response.into_reader();
     let mut bytes = vec![];
     reader.read_to_end(&mut bytes)?;
-    std::io::stdout().write_all(&bytes)?;
-    Ok(())
+    Ok(bytes)
 }
 
 fn get_and_write(agent: &ureq::Agent, url: &str) {
@@ -47,26 +48,7 @@ fn get_and_write(agent: &ureq::Agent, url: &str) {
     }
 }
 
-use ureq::Error::{Status, Transport};
-
-fn get_response(agent: &ureq::Agent, url: &str) -> result::Result<Response, ureq::Error> {
-    let fetch = || agent.get(url).call();
-    for _ in 1..4 {
-        match fetch() {
-            Err(Status(429, r)) => {
-                let retry: Option<u64> = r.header("retry-after").and_then(|h| h.parse().ok());
-                eprintln!("429 for {}, retrying in {}", r.status(), r.get_url());
-                thread::sleep(Duration::from_secs(retry.unwrap_or(5)));
-                eprintln!("error status {} body {}", r.status(), r.into_string()?);
-            }
-            result => return result,
-        };
-    }
-    // Last try, return success or failure regardless of status code.
-    fetch()
-}
-
-fn get_many(urls: Vec<String>, simultaneous_fetches: usize) -> Result<(), Oops> {
+fn get_many(urls: Vec<String>, simultaneous_fetches: usize) -> Result<()> {
     let agent = ureq::builder()
         .timeout_connect(Duration::from_secs(5))
         .timeout(Duration::from_secs(20))
@@ -94,7 +76,7 @@ fn get_many(urls: Vec<String>, simultaneous_fetches: usize) -> Result<(), Oops>
     Ok(())
 }
 
-fn main() -> Result<(), Oops> {
+fn main() -> Result<()> {
     let args = env::args();
     if args.len() == 1 {
         println!(
diff --git a/src/error.rs b/src/error.rs
index 6747e2a..3bd64a3 100644
--- a/src/error.rs
+++ b/src/error.rs
@@ -18,29 +18,25 @@ use crate::Response;
 ///
 /// ```
 /// use std::{result::Result, time::Duration, thread};
-/// use ureq::{Response, Error};
-/// # fn main(){ ureq::is_test(true); get_response(); }
+/// use ureq::{Response, Error, Error::Status};
+/// # fn main(){ ureq::is_test(true); get_response( "http://httpbin.org/status/500" ); }
 ///
-/// // An example of a function that handles HTTP 500 errors differently
-/// // than other errors.
-/// fn get_response() -> Result<Response, Error> {
-///   let fetch = || ureq::get("http://httpbin.org/status/500").call();
-///   let mut result = fetch();
-///   for _ in 1..4 {
-///     let err: ureq::Error = match result {
-///         Ok(r) => return Ok(r),
-///         Err(e) => e,
-///     };
-///     match err {
-///       // Retry 500s after waiting for two seconds.
-///       Error::Status(500, _) => thread::sleep(Duration::from_secs(2)),
-///       Error::Status(_, r) => return Err(r.into()),
-///       Error::Transport(e) => return Err(e.into()),
+/// // An example of a function that handles HTTP 429 and 500 errors differently
+/// // than other errors. They get retried after a suitable delay, up to 4 times.
+/// fn get_response(url: &str) -> Result<Response, Error> {
+///     for _ in 1..4 {
+///         match ureq::get(url).call() {
+///             Err(Status(503, r)) | Err(Status(429, r)) => {
+///                 let retry: Option<u64> = r.header("retry-after").and_then(|h| h.parse().ok());
+///                 let retry = retry.unwrap_or(5);
+///                 eprintln!("{} for {}, retry in {}", r.status(), r.get_url(), retry);
+///                 thread::sleep(Duration::from_secs(retry));
+///             }
+///             result => return result,
+///         };
 ///     }
-///     result = fetch();
-///   }
-///   println!("Failed after 5 tries: {:?}", &result);
-///   result
+///     // Ran out of retries; try one last time and return whatever result we get.
+///     ureq::get(url).call()
 /// }
 /// ```
 #[derive(Debug)]