Commita204c49

committed

Added fixes for most public breaking changes

1 parent2df67d2 commita204c49Copy full SHA for a204c49

File tree

+12

-3

lines changed

+12

-3

lines changed

Lines changed: 4 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@`
`31`	`31`	`//!`
`32`	`32`
`33`	`33`	`usecrate::{`
`34`		`- id::{id_from_raw, id_to_canid_t,CanId,FdFlags,IdFlags},`
	`34`	`+ id::CanId,`
`35`	`35`	`CanError,ConstructionError,`
`36`	`36`	`};`
`37`	`37`	`use embedded_can::{ExtendedId,FrameasEmbeddedFrame,Id,StandardId};`
`@@ -42,10 +42,12 @@ use std::{`
`42`	`42`	`mem::size_of,`
`43`	`43`	`{convert::TryFrom, fmt, matches, mem},`
`44`	`44`	`};`
	`45`	`+`
`45`	`46`	`// TODO: Remove these on the next major ver update.`
`46`	`47`	`pubusecrate::id::{`
`47`	`48`	`CANFD_BRS,CANFD_ESI,CANFD_MAX_DLEN,CAN_EFF_FLAG,CAN_EFF_MASK,CAN_ERR_FLAG,CAN_ERR_MASK,`
`48`		`-CAN_MAX_DLEN,CAN_RTR_FLAG,CAN_SFF_MASK,`
	`49`	`+CAN_MAX_DLEN,CAN_RTR_FLAG,CAN_SFF_MASK,ERR_MASK_ALL,ERR_MASK_NONE,`
	`50`	`+FdFlags,IdFlags, id_from_raw, id_to_canid_t, id_is_extended,`
`49`	`51`	`};`
`50`	`52`
`51`	`53`	`// ===== can_frame =====`

Lines changed: 4 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -30,6 +30,8 @@ pub const ERR_MASK_NONE: u32 = 0;`
`30`	`30`
`31`	`31`	`bitflags!{`
`32`	`32`	`/// Bit flags in the composite SocketCAN ID word.`
	`33`	`+ #[repr(transparent)]`
	`34`	`+ #[derive(Debug,Clone,Copy,PartialEq,Eq,PartialOrd,Ord,Hash)]`
`33`	`35`	`pubstructIdFlags: canid_t{`
`34`	`36`	`/// Indicates frame uses a 29-bit extended ID`
`35`	`37`	`constEFF =CAN_EFF_FLAG;`
`@@ -40,6 +42,8 @@ bitflags! {`
`40`	`42`	`}`
`41`	`43`
`42`	`44`	`/// Bit flags for the Flexible Data (FD) frames.`
	`45`	`+ #[repr(transparent)]`
	`46`	`+ #[derive(Debug,Clone,Copy,PartialEq,PartialOrd,Ord,Eq,Hash)]`
`43`	`47`	`pubstructFdFlags:u8{`
`44`	`48`	`/// Bit rate switch (second bit rate for payload data)`
`45`	`49`	`constBRS =CANFD_BRSasu8;`

Lines changed: 4 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ use crate::{`
`15`	`15`	`as_bytes, as_bytes_mut,`
`16`	`16`	`frame::{can_frame_default, canfd_frame_default,AsPtr},`
`17`	`17`	`id::CAN_ERR_MASK,`
`18`		`-CanAddr,CanAnyFrame,CanFdFrame,CanFrame,CanRawFrame,IoError,IoErrorKind,IoResult,`
	`18`	`+CanAnyFrame,CanFdFrame,CanFrame,CanRawFrame,IoError,IoErrorKind,IoResult,`
`19`	`19`	`};`
`20`	`20`	`use libc::{canid_t, socklen_t,AF_CAN,EINPROGRESS};`
`21`	`21`	`use socket2::SockAddr;`
`@@ -36,6 +36,9 @@ pub use libc::{`
`36`	`36`	`CAN_RAW_JOIN_FILTERS,CAN_RAW_LOOPBACK,CAN_RAW_RECV_OWN_MSGS,SOL_CAN_BASE,SOL_CAN_RAW,`
`37`	`37`	`};`
`38`	`38`
	`39`	`+// TODO: This can be removed on the next major version update`
	`40`	`+pubusecrate::CanAddr;`
	`41`	`+`
`39`	`42`	`/// Check an error return value for timeouts.`
`40`	`43`	`///`
`41`	`44`	/// Due to the fact that timeouts are reported as errors, calling `read_frame`

Comments

(0)