Fix rebase

src/ctx.rs

@@ -4,7 +4,6 @@ use crate::{
     Path, PathBuf, WorkItem,
 };
 use anyhow::{Context as _, Error};
-use reqwest::blocking::Client;
 
 #[allow(dead_code)]
 pub enum Unpack {
@@ -20,12 +19,12 @@ pub enum Unpack {
 pub struct Ctx {
     pub work_dir: PathBuf,
     pub tempdir: Option<tempfile::TempDir>,
-    pub client: Client,
+    pub client: ureq::Agent,
     pub draw_target: ProgressTarget,
 }
 
 impl Ctx {
-    pub fn with_temp(dt: ProgressTarget, client: Client) -> Result<Self, Error> {
+    pub fn with_temp(dt: ProgressTarget, client: ureq::Agent) -> Result<Self, Error> {
         let td = tempfile::TempDir::new()?;
 
         Ok(Self {
@@ -41,7 +40,7 @@ impl Ctx {
     pub fn with_dir(
         mut work_dir: PathBuf,
         dt: ProgressTarget,
-        client: Client,
+        client: ureq::Agent,
     ) -> Result<Self, Error> {
         work_dir.push("dl");
         std::fs::create_dir_all(&work_dir)?;
@@ -108,7 +107,7 @@ impl Ctx {
             }
         }
 
-        let mut res = self.client.get(url.as_ref()).send()?;
+        let res = self.client.get(url.as_ref()).call()?;
 
         let content_length = res
             .headers()

src/lib.rs

@@ -17,8 +17,8 @@ pub mod util;
 
 pub use ctx::Ctx;
 pub use minimize::MinimizeConfig;
-pub use reqwest;
 pub use splat::SplatConfig;
+pub use ureq;
 
 #[derive(Copy, Clone, Debug, PartialEq, Eq, PartialOrd, Ord)]
 pub enum Arch {

tests/compiles.rs

@@ -3,7 +3,7 @@ fn verify_compiles() {
     let ctx = xwin::Ctx::with_dir(
         xwin::PathBuf::from(".xwin-cache/compile-test"),
         xwin::util::ProgressTarget::Hidden,
-        reqwest::blocking::Client::new(),
+        ureq::agent(),
     )
     .unwrap();
 
@@ -166,7 +166,7 @@ fn verify_compiles_minimized() {
     let ctx = xwin::Ctx::with_dir(
         xwin::PathBuf::from(".xwin-cache/compile-test-minimized"),
         xwin::util::ProgressTarget::Hidden,
-        reqwest::blocking::Client::new(),
+        ureq::agent(),
     )
     .unwrap();
 

tests/deterministic.rs

@@ -6,7 +6,7 @@ fn verify_deterministic() {
     let ctx = xwin::Ctx::with_dir(
         PathBuf::from(".xwin-cache/deterministic"),
         xwin::util::ProgressTarget::Hidden,
-        reqwest::blocking::Client::new(),
+        ureq::agent(),
     )
     .unwrap();