Merge pull request #103 from jodh-intel/cargo-audit-fixes

cargo: Update dependencies identified by audit

Cargo.toml

@@ -14,7 +14,7 @@ description = "A Rust version of ttrpc."
 protobuf = { version = "2.0", optional = true }
 bytes = { version = "0.4.11", optional = true }
 libc = { version = "0.2.59", features = [ "extra_traits" ] }
-nix = "0.16.1"
+nix = "0.20.2"
 log = "0.4"
 byteorder = "1.3.2"
 thiserror = "1.0"

example/Cargo.toml

@@ -17,7 +17,7 @@ libc = "0.2.79"
 byteorder = "1.3.2"
 log = "0.4.6"
 simple-logging = "2.0.2"
-nix = "0.16.1"
+nix = "0.20.2"
 ttrpc = { path = "../", features = ["async"] }
 ctrlc = { version = "3.0", features = ["termination"] }
 tokio = { version = "1.0.1", features = ["signal", "time"] }

src/sync/server.rs

@@ -14,7 +14,6 @@
 
 //! Sync server of ttrpc.
 
-use nix::fcntl::OFlag;
 use nix::sys::socket::{self, *};
 use nix::unistd::*;
 use protobuf::{CodedInputStream, Message};
@@ -330,9 +329,18 @@ impl Server {
 
         self.listener_quit_flag.store(false, Ordering::SeqCst);
 
-        #[allow(deprecated)]
-        let (rfd, wfd) = pipe2(OFlag::O_CLOEXEC).unwrap();
-        self.monitor_fd = (rfd, wfd);
+        #[cfg(target_os = "linux")]
+        let fds = pipe2(nix::fcntl::OFlag::O_CLOEXEC)?;
+
+        #[cfg(not(target_os = "linux"))]
+        let fds = {
+            let (rfd, wfd) = pipe()?;
+            set_fd_close_exec(rfd)?;
+            set_fd_close_exec(wfd)?;
+            (rfd, wfd)
+        };
+
+        self.monitor_fd = fds;
 
         let listener = self.listeners[0];
 

ttrpc-codegen/src/lib.rs

@@ -4,8 +4,10 @@
 //!```
 //!use ttrpc_codegen::Codegen;
 //!use ttrpc_codegen::Customize;
+//!# use std::path::Path;
 //!
 //!fn main() {
+//!#   let protos: Vec<&Path> = vec![];
 //!    Codegen::new()
 //!        .out_dir("protocols/sync")
 //!        .inputs(&protos)

ttrpc-codegen/src/parser.rs

@@ -2182,7 +2182,7 @@ mod test {
         "#;
 
         let err = FileDescriptor::parse(msg).err().expect("err");
-        assert_eq!(4, err.line);
+        assert_eq!(3, err.line);
     }
 
     #[test]