Merge pull request #1574 from hermit-os/dependabot/cargo/ureq-3.0.1

build(deps): upgrade ureq from 2 to 3
hermit-os · Jan 28, 2025 · 0a0148a · 0a0148a
2 parents 852c5c6 + 0c4757a
commit 0a0148a
Show file tree

Hide file tree

Showing 3 changed files with 94 additions and 7 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/xtask/Cargo.toml b/xtask/Cargo.toml
@@ -10,6 +10,6 @@ goblin = { version = "0.9", default-features = false, features = ["archive", "el
 home = "0.5"
 ovmf-prebuilt = "0.2"
 sysinfo = "0.33"
-ureq = "2"
+ureq = "3"
 wait-timeout = "0.2"
 xshell = "0.2"
diff --git a/xtask/src/ci/qemu.rs b/xtask/src/ci/qemu.rs
@@ -361,9 +361,12 @@ fn test_http_server() -> Result<()> {
 	let url = "http://127.0.0.1:9975";
 	eprintln!("[CI] GET {url}");
 	let body = ureq::get(url)
-		.timeout(Duration::from_secs(3))
+		.config()
+		.timeout_global(Some(Duration::from_secs(3)))
+		.build()
 		.call()?
-		.into_string()?;
+		.into_body()
+		.read_to_string()?;
 	eprintln!("[CI] body = {body:?}");
 	assert_eq!(body, "Hello, world!\n");
 	Ok(())
@@ -373,9 +376,12 @@ fn test_httpd() -> Result<()> {
 	thread::sleep(Duration::from_secs(10));
 	eprintln!("[CI] GET http://127.0.0.1:9975");
 	let body = ureq::get("http://127.0.0.1:9975")
-		.timeout(Duration::from_secs(3))
+		.config()
+		.timeout_global(Some(Duration::from_secs(3)))
+		.build()
 		.call()?
-		.into_string()?;
+		.into_body()
+		.read_to_string()?;
 	eprintln!("[CI] {body}");
 	assert_eq!(body.lines().next(), Some("Hello from Hermit! 🦀"));
 	Ok(())