Update to use latest ttrpc library

Signed-off-by: James Sturtevant <jstur@microsoft.com>
containerd · Jun 22, 2023 · bdd17eb · bdd17eb
1 parent 38545a7
commit bdd17eb
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/crates/shim-protos/Cargo.toml b/crates/shim-protos/Cargo.toml
@@ -13,7 +13,7 @@ homepage.workspace = true
 
 [dependencies]
 protobuf = "3.1"
-ttrpc = { git = "https://github.com/jsturtevant/ttrpc-rust", rev = "d96bea3a41b6c6b85c1d8da53e5085fb0789a685" } # unmerged pr https://github.com/containerd/ttrpc-rust/pull/182 
+ttrpc = "0.8.0" 
 async-trait = { version = "0.1.48", optional = true }
 
 [build-dependencies]

diff --git a/crates/shim/src/synchronous/mod.rs b/crates/shim/src/synchronous/mod.rs
@@ -562,7 +562,8 @@ fn signal_server_started() {
     unsafe {
         let std_out = GetStdHandle(STD_OUTPUT_HANDLE);
 
-        for handle in [std_out] {
+        {
+            let handle = std_out;
             CloseHandle(handle);
         }
     }

diff --git a/crates/shim/src/synchronous/publisher.rs b/crates/shim/src/synchronous/publisher.rs
@@ -54,7 +54,7 @@ impl RemotePublisher {
         {
             let fd = connect(address)?;
             // Client::new() takes ownership of the RawFd.
-            Ok(Client::new_from_fd(fd)?)
+            Client::new(fd).map_err(|err| err.into())
         }
 
         #[cfg(windows)]
@@ -167,7 +167,7 @@ mod tests {
         thread.join().unwrap();
     }
 
-    fn create_server(server_address: &String) -> Server {
+    fn create_server(server_address: &str) -> Server {
         #[cfg(unix)]
         {
             use std::os::unix::{io::AsRawFd, net::UnixListener};