Commit32fa1af

authored

Merge pull request#73 from inomotech-foss/feature/bump-deps

Update some dependencies

2 parents90ebd73 +25299c1 commit32fa1afCopy full SHA for 32fa1af

File tree

+16

-10

lines changed

+16

-10

lines changed

Lines changed: 5 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -41,17 +41,17 @@ nb = "1"`
`41`	`41`	`log ="0.4"`
`42`	`42`	`byte_conv ="0.1.1"`
`43`	`43`	`hex ="0.4"`
`44`		`-itertools ="0.10"`
	`44`	`+itertools ="0.13"`
`45`	`45`	`libc ="0.2"`
`46`		`-nix ="0.26"`
`47`		`-bitflags ="1.3"`
	`46`	`+nix ={version="0.29",features = ["poll","process","net"] }`
	`47`	`+bitflags ="2.6"`
`48`	`48`	`thiserror ="1.0"`
`49`	`49`	`socket2 = {version ="0.5",features = ["all"] }`
`50`	`50`	`clap = {version ="3.2",optional =true }`
`51`		`-anyhow = {version ="1.0",optional =true }`
	`51`	`+anyhow = {version ="1",optional =true }`
`52`	`52`	`neli = {version ="0.6",optional =true }`
`53`	`53`	`tokio = {version ="1",features = ["net"],optional =true }`
`54`		`-mio = {version ="0.8",features = ["os-ext"],optional =true }`
	`54`	`+mio = {version ="1",features = ["os-ext"],optional =true }`
`55`	`55`	`futures = {version ="0.3",optional =true }`
`56`	`56`	`async-io = {version ="1.13",optional =true }`
`57`	`57`	`smol = {version ="1.3",optional =true }`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -453,7 +453,7 @@ impl CanInterface {`
`453`	`453`	`/// has specific, non-default, generic parameters.`
`454`	`454`	`fnopen_route_socket<T,P>() ->Result<NlSocketHandle,NlError<T,P>>{`
`455`	`455`	`// retrieve PID`
`456`		`-let pid = unistd::getpid().as_raw()asu32;`
	`456`	`+let pid = unistd::Pid::this().as_raw()asu32;`
`457`	`457`
`458`	`458`	`// open and bind socket`
`459`	`459`	`// groups is set to None(0), because we want no notifications`

Lines changed: 10 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -248,10 +248,16 @@ pub trait Socket: AsRawFd {`
`248`	`248`
`249`	`249`	`/// Blocking read a single can frame with timeout.`
`250`	`250`	`fnread_frame_timeout(&self,timeout:Duration) ->IoResult<Self::FrameType>{`
`251`		`-use nix::poll::{poll,PollFd,PollFlags};`
`252`		`-let pollfd =PollFd::new(self.as_raw_fd(),PollFlags::POLLIN);`
`253`		`-`
`254`		`-matchpoll(&mut[pollfd], timeout.as_millis()asc_int)?{`
	`251`	`+use nix::poll::{poll,PollFd,PollFlags,PollTimeout};`
	`252`	`+let pollfd =PollFd::new(`
	`253`	`+unsafe{BorrowedFd::borrow_raw(self.as_raw_fd())},`
	`254`	`+PollFlags::POLLIN,`
	`255`	`+);`
	`256`	`+`
	`257`	`+matchpoll(`
	`258`	`+&mut[pollfd],`
	`259`	`+ timeout.try_into().unwrap_or(PollTimeout::MAX),`
	`260`	`+)?{`
`255`	`261`	`0 =>Err(IoErrorKind::TimedOut.into()),`
`256`	`262`	`_ =>self.read_frame(),`
`257`	`263`	`}`

Comments

(0)