diff -uprN rpm-ostree-2022.16/rust/src/client.rs rpm-ostree-2022.16-new/rust/src/client.rs
--- rpm-ostree-2022.16/rust/src/client.rs	2022-11-19 01:25:53.000000000 +0800
+++ rpm-ostree-2022.16-new/rust/src/client.rs	2023-02-23 14:54:32.000000000 +0800
@@ -129,6 +129,7 @@ pub(crate) fn is_src_rpm_arg(arg: &str)
 /// descriptors for the content.
 /// TODO(cxx-rs): This would be slightly more elegant as Result<Option<Vec<i32>>>
 #[context("Handling argument {}", arg)]
+#[allow(unused_variables)]
 pub(crate) fn client_handle_fd_argument(
     arg: &str,
     arch: &str,
@@ -315,13 +316,15 @@ fn is_yes(s: &str) -> bool {
 
 /// Prompt for confirmation
 pub(crate) fn confirm() -> CxxResult<bool> {
-    let mut stdout = std::io::stdout().lock();
-    let mut stdin = std::io::stdin().lock();
-    write!(stdout, "Continue? [y/N] ")?;
-    stdout.flush()?;
+    let stdin = std::io::stdin();
+    let mut stdin_lock = stdin.lock();
+    let stdout = std::io::stdout();
+    let mut stdout_lock = stdout.lock();
+    write!(stdout_lock, "Continue? [y/N] ")?;
+    stdout_lock.flush()?;
     let mut resp = String::new();
-    stdin.read_line(&mut resp)?;
-    Ok(is_yes(resp.as_str().trim()))
+    stdin_lock.read_line(&mut resp)?;
+    Ok(is_yes(resp.trim()))
 }
 
 /// Prompt for confirmation, and return an error if not agreed
diff -uprN rpm-ostree-2022.16/vendor/phf/.cargo-checksum.json rpm-ostree-2022.16-new/vendor/phf/.cargo-checksum.json
--- rpm-ostree-2022.16/vendor/phf/.cargo-checksum.json	2022-11-19 01:41:00.000000000 +0800
+++ rpm-ostree-2022.16-new/vendor/phf/.cargo-checksum.json	2023-02-23 09:44:32.000000000 +0800
@@ -1 +1 @@
-{"files":{"CHANGELOG.md":"0e8c35d9be4ea0740abefdf22aac5a3501bc757c5120a106c0160a83b257d78a","Cargo.toml":"5c19e4ee6611b2da953aafa8311690a82cddcff59b07577eec96da3ca1e5a4cf","README.md":"63e1776e08b52979e4ae92f0ccab6c6b86cf5fe643a986f5c130a504cafd6d28","src/lib.rs":"34c7f3a2dc755bfd8246c422708088bc0acf64c8a33cb7bda10c705c4e6f3812","src/map.rs":"db6df0e2465d51b40640bb85cea28a9daca9ff1b0f57a3316608a55fc11879c5","src/ordered_map.rs":"5f849d7c8bea4322911b81a980a9ce988961ccec4029a2254d54ca68aed8cd45","src/ordered_set.rs":"0ed66947623c8a79b1ad2c206ef5a13af701f95c0f36544ab986c9617e2a24a3","src/set.rs":"065a501930c4667877168b99aeca00007dd222865bafc26451cbc9fdf08ad7e6"},"package":"928c6535de93548188ef63bb7c4036bd415cd8f36ad25af44b9789b2ee72a48c"}
\ No newline at end of file
+{"files":{"CHANGELOG.md":"0e8c35d9be4ea0740abefdf22aac5a3501bc757c5120a106c0160a83b257d78a","Cargo.toml":"5d336ed218103113a13c4ab33a87e44d312a3d63dd5f6de7317955870d205f8d","README.md":"63e1776e08b52979e4ae92f0ccab6c6b86cf5fe643a986f5c130a504cafd6d28","src/lib.rs":"34c7f3a2dc755bfd8246c422708088bc0acf64c8a33cb7bda10c705c4e6f3812","src/map.rs":"db6df0e2465d51b40640bb85cea28a9daca9ff1b0f57a3316608a55fc11879c5","src/ordered_map.rs":"5f849d7c8bea4322911b81a980a9ce988961ccec4029a2254d54ca68aed8cd45","src/ordered_set.rs":"0ed66947623c8a79b1ad2c206ef5a13af701f95c0f36544ab986c9617e2a24a3","src/set.rs":"065a501930c4667877168b99aeca00007dd222865bafc26451cbc9fdf08ad7e6"},"package":"928c6535de93548188ef63bb7c4036bd415cd8f36ad25af44b9789b2ee72a48c"}
\ No newline at end of file
diff -uprN rpm-ostree-2022.16/vendor/phf/Cargo.toml rpm-ostree-2022.16-new/vendor/phf/Cargo.toml
--- rpm-ostree-2022.16/vendor/phf/Cargo.toml	2022-11-19 01:41:00.000000000 +0800
+++ rpm-ostree-2022.16-new/vendor/phf/Cargo.toml	2023-02-23 09:40:29.221890304 +0800
@@ -51,6 +51,6 @@ macros = ["phf_macros"]
 std = ["phf_shared/std"]
 uncased = ["phf_shared/uncased"]
 unicase = [
-    "phf_macros?/unicase",
+    "phf_macros/unicase",
     "phf_shared/unicase",
 ]