aiden
/
suricata
mirror of https://github.com/OISF/suricata
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

rust(lint): remove extra parens around bitwise or

Browse Source 
This is a readability fix, as on first look they almost look
like a Rust tuple.
pull/6304/head
Jason Ish 5 years ago committed by Victor Julien
parent ac3a20b6e0
commit 4abbfd0d97
1 changed files with 29 additions and 29 deletions
Show Stats Download Patch File Download Diff File

58
rust/src/modbus/detect.rs
Unescape Escape View File

@ -522,7 +522,7 @@ mod test {
assert_eq!( assert_eq!(
parse_access("access read discretes"), parse_access("access read discretes"),
Ok(DetectModbusRust { Ok(DetectModbusRust {
access_type: Some((AccessType::READ | AccessType::DISCRETES)), access_type: Some(AccessType::READ | AccessType::DISCRETES),
..Default::default() ..Default::default()
}) })
); );
@ -537,7 +537,7 @@ mod test {
assert_eq!( assert_eq!(
parse_access("access write coils, address <500"), parse_access("access write coils, address <500"),
Ok(DetectModbusRust { Ok(DetectModbusRust {
access_type: Some((AccessType::WRITE | AccessType::COILS)), access_type: Some(AccessType::WRITE | AccessType::COILS),
address: Some(std::u16::MIN..500), address: Some(std::u16::MIN..500),
..Default::default() ..Default::default()
}) })
@ -545,7 +545,7 @@ mod test {
assert_eq!( assert_eq!(
parse_access("access write coils, address >500"), parse_access("access write coils, address >500"),
Ok(DetectModbusRust { Ok(DetectModbusRust {
access_type: Some((AccessType::WRITE | AccessType::COILS)), access_type: Some(AccessType::WRITE | AccessType::COILS),
address: Some(500..std::u16::MAX), address: Some(500..std::u16::MAX),
..Default::default() ..Default::default()
}) })
@ -553,7 +553,7 @@ mod test {
assert_eq!( assert_eq!(
parse_access("access write holding, address 100, value <1000"), parse_access("access write holding, address 100, value <1000"),
Ok(DetectModbusRust { Ok(DetectModbusRust {
access_type: Some((AccessType::WRITE | AccessType::HOLDING)), access_type: Some(AccessType::WRITE | AccessType::HOLDING),
address: Some(100..100), address: Some(100..100),
value: Some(std::u16::MIN..1000), value: Some(std::u16::MIN..1000),
..Default::default() ..Default::default()
@ -562,7 +562,7 @@ mod test {
assert_eq!( assert_eq!(
parse_access("access write holding, address 100, value 500<>1000"), parse_access("access write holding, address 100, value 500<>1000"),
Ok(DetectModbusRust { Ok(DetectModbusRust {
access_type: Some((AccessType::WRITE | AccessType::HOLDING)), access_type: Some(AccessType::WRITE | AccessType::HOLDING),
address: Some(100..100), address: Some(100..100),
value: Some(500..1000), value: Some(500..1000),
..Default::default() ..Default::default()
@ -661,7 +661,7 @@ mod test {
rs_modbus_inspect( rs_modbus_inspect(
&modbus.transactions[0], &modbus.transactions[0],
&DetectModbusRust { &DetectModbusRust {
access_type: Some((AccessType::WRITE | AccessType::HOLDING)), access_type: Some(AccessType::WRITE | AccessType::HOLDING),
address: Some(15..15), address: Some(15..15),
value: Some(std::u16::MIN..4660), value: Some(std::u16::MIN..4660),
..Default::default() ..Default::default()
@ -674,7 +674,7 @@ mod test {
rs_modbus_inspect( rs_modbus_inspect(
&modbus.transactions[0], &modbus.transactions[0],
&DetectModbusRust { &DetectModbusRust {
access_type: Some((AccessType::WRITE | AccessType::HOLDING)), access_type: Some(AccessType::WRITE | AccessType::HOLDING),
address: Some(15..15), address: Some(15..15),
value: Some(4661..4661), value: Some(4661..4661),
..Default::default() ..Default::default()
@ -687,7 +687,7 @@ mod test {
rs_modbus_inspect( rs_modbus_inspect(
&modbus.transactions[0], &modbus.transactions[0],
&DetectModbusRust { &DetectModbusRust {
access_type: Some((AccessType::WRITE | AccessType::HOLDING)), access_type: Some(AccessType::WRITE | AccessType::HOLDING),
address: Some(16..16), address: Some(16..16),
value: Some(20000..22136), value: Some(20000..22136),
..Default::default() ..Default::default()
@ -700,7 +700,7 @@ mod test {
rs_modbus_inspect( rs_modbus_inspect(
&modbus.transactions[0], &modbus.transactions[0],
&DetectModbusRust { &DetectModbusRust {
access_type: Some((AccessType::WRITE | AccessType::HOLDING)), access_type: Some(AccessType::WRITE | AccessType::HOLDING),
address: Some(16..16), address: Some(16..16),
value: Some(22136..30000), value: Some(22136..30000),
..Default::default() ..Default::default()
@ -713,7 +713,7 @@ mod test {
rs_modbus_inspect( rs_modbus_inspect(
&modbus.transactions[0], &modbus.transactions[0],
&DetectModbusRust { &DetectModbusRust {
access_type: Some((AccessType::WRITE | AccessType::HOLDING)), access_type: Some(AccessType::WRITE | AccessType::HOLDING),
address: Some(15..15), address: Some(15..15),
value: Some(4660..std::u16::MAX), value: Some(4660..std::u16::MAX),
..Default::default() ..Default::default()
@ -726,7 +726,7 @@ mod test {
rs_modbus_inspect( rs_modbus_inspect(
&modbus.transactions[0], &modbus.transactions[0],
&DetectModbusRust { &DetectModbusRust {
access_type: Some((AccessType::WRITE | AccessType::HOLDING)), access_type: Some(AccessType::WRITE | AccessType::HOLDING),
address: Some(16..16), address: Some(16..16),
value: Some(std::u16::MIN..22137), value: Some(std::u16::MIN..22137),
..Default::default() ..Default::default()
@ -739,7 +739,7 @@ mod test {
rs_modbus_inspect( rs_modbus_inspect(
&modbus.transactions[0], &modbus.transactions[0],
&DetectModbusRust { &DetectModbusRust {
access_type: Some((AccessType::WRITE | AccessType::HOLDING)), access_type: Some(AccessType::WRITE | AccessType::HOLDING),
address: Some(16..16), address: Some(16..16),
value: Some(std::u16::MIN..22137), value: Some(std::u16::MIN..22137),
..Default::default() ..Default::default()
@ -752,7 +752,7 @@ mod test {
rs_modbus_inspect( rs_modbus_inspect(
&modbus.transactions[0], &modbus.transactions[0],
&DetectModbusRust { &DetectModbusRust {
access_type: Some((AccessType::WRITE | AccessType::HOLDING)), access_type: Some(AccessType::WRITE | AccessType::HOLDING),
address: Some(17..17), address: Some(17..17),
value: Some(39612..39612), value: Some(39612..39612),
..Default::default() ..Default::default()
@ -765,7 +765,7 @@ mod test {
rs_modbus_inspect( rs_modbus_inspect(
&modbus.transactions[0], &modbus.transactions[0],
&DetectModbusRust { &DetectModbusRust {
access_type: Some((AccessType::WRITE | AccessType::HOLDING)), access_type: Some(AccessType::WRITE | AccessType::HOLDING),
address: Some(17..17), address: Some(17..17),
value: Some(30000..39613), value: Some(30000..39613),
..Default::default() ..Default::default()
@ -778,7 +778,7 @@ mod test {
rs_modbus_inspect( rs_modbus_inspect(
&modbus.transactions[0], &modbus.transactions[0],
&DetectModbusRust { &DetectModbusRust {
access_type: Some((AccessType::WRITE | AccessType::HOLDING)), access_type: Some(AccessType::WRITE | AccessType::HOLDING),
address: Some(15..15), address: Some(15..15),
value: Some(4659..5000), value: Some(4659..5000),
..Default::default() ..Default::default()
@ -791,7 +791,7 @@ mod test {
rs_modbus_inspect( rs_modbus_inspect(
&modbus.transactions[0], &modbus.transactions[0],
&DetectModbusRust { &DetectModbusRust {
access_type: Some((AccessType::WRITE | AccessType::HOLDING)), access_type: Some(AccessType::WRITE | AccessType::HOLDING),
address: Some(17..17), address: Some(17..17),
value: Some(39611..std::u16::MAX), value: Some(39611..std::u16::MAX),
..Default::default() ..Default::default()
@ -939,7 +939,7 @@ mod test {
rs_modbus_inspect( rs_modbus_inspect(
&modbus.transactions[0], &modbus.transactions[0],
&DetectModbusRust { &DetectModbusRust {
category: Some((CodeCategory::PUBLIC_ASSIGNED | CodeCategory::PUBLIC_UNASSIGNED)), category: Some(CodeCategory::PUBLIC_ASSIGNED | CodeCategory::PUBLIC_UNASSIGNED),
unit_id: Some(11..11), unit_id: Some(11..11),
..Default::default() ..Default::default()
} }
@ -975,7 +975,7 @@ mod test {
rs_modbus_inspect( rs_modbus_inspect(
&modbus.transactions[0], &modbus.transactions[0],
&DetectModbusRust { &DetectModbusRust {
category: Some((CodeCategory::PUBLIC_ASSIGNED | CodeCategory::PUBLIC_UNASSIGNED)), category: Some(CodeCategory::PUBLIC_ASSIGNED | CodeCategory::PUBLIC_UNASSIGNED),
unit_id: Some(10..10), unit_id: Some(10..10),
..Default::default() ..Default::default()
} }
@ -1208,7 +1208,7 @@ mod test {
rs_modbus_inspect( rs_modbus_inspect(
&modbus.transactions[5], &modbus.transactions[5],
&DetectModbusRust { &DetectModbusRust {
access_type: Some((AccessType::READ | AccessType::INPUT)), access_type: Some(AccessType::READ | AccessType::INPUT),
..Default::default() ..Default::default()
} }
), ),
@ -1219,7 +1219,7 @@ mod test {
rs_modbus_inspect( rs_modbus_inspect(
&modbus.transactions[5], &modbus.transactions[5],
&DetectModbusRust { &DetectModbusRust {
access_type: Some((AccessType::READ | AccessType::INPUT)), access_type: Some(AccessType::READ | AccessType::INPUT),
address: Some(std::u16::MIN..9), address: Some(std::u16::MIN..9),
..Default::default() ..Default::default()
} }
@ -1231,7 +1231,7 @@ mod test {
rs_modbus_inspect( rs_modbus_inspect(
&modbus.transactions[5], &modbus.transactions[5],
&DetectModbusRust { &DetectModbusRust {
access_type: Some((AccessType::READ | AccessType::INPUT)), access_type: Some(AccessType::READ | AccessType::INPUT),
address: Some(5..9), address: Some(5..9),
..Default::default() ..Default::default()
} }
@ -1243,7 +1243,7 @@ mod test {
rs_modbus_inspect( rs_modbus_inspect(
&modbus.transactions[5], &modbus.transactions[5],
&DetectModbusRust { &DetectModbusRust {
access_type: Some((AccessType::READ | AccessType::INPUT)), access_type: Some(AccessType::READ | AccessType::INPUT),
address: Some(104..std::u16::MAX), address: Some(104..std::u16::MAX),
..Default::default() ..Default::default()
} }
@ -1255,7 +1255,7 @@ mod test {
rs_modbus_inspect( rs_modbus_inspect(
&modbus.transactions[5], &modbus.transactions[5],
&DetectModbusRust { &DetectModbusRust {
access_type: Some((AccessType::READ | AccessType::INPUT)), access_type: Some(AccessType::READ | AccessType::INPUT),
address: Some(104..110), address: Some(104..110),
..Default::default() ..Default::default()
} }
@ -1267,7 +1267,7 @@ mod test {
rs_modbus_inspect( rs_modbus_inspect(
&modbus.transactions[5], &modbus.transactions[5],
&DetectModbusRust { &DetectModbusRust {
access_type: Some((AccessType::READ | AccessType::INPUT)), access_type: Some(AccessType::READ | AccessType::INPUT),
address: Some(9..9), address: Some(9..9),
..Default::default() ..Default::default()
} }
@ -1279,7 +1279,7 @@ mod test {
rs_modbus_inspect( rs_modbus_inspect(
&modbus.transactions[5], &modbus.transactions[5],
&DetectModbusRust { &DetectModbusRust {
access_type: Some((AccessType::READ | AccessType::INPUT)), access_type: Some(AccessType::READ | AccessType::INPUT),
address: Some(std::u16::MIN..10), address: Some(std::u16::MIN..10),
..Default::default() ..Default::default()
} }
@ -1291,7 +1291,7 @@ mod test {
rs_modbus_inspect( rs_modbus_inspect(
&modbus.transactions[5], &modbus.transactions[5],
&DetectModbusRust { &DetectModbusRust {
access_type: Some((AccessType::READ | AccessType::INPUT)), access_type: Some(AccessType::READ | AccessType::INPUT),
address: Some(5..10), address: Some(5..10),
..Default::default() ..Default::default()
} }
@ -1303,7 +1303,7 @@ mod test {
rs_modbus_inspect( rs_modbus_inspect(
&modbus.transactions[5], &modbus.transactions[5],
&DetectModbusRust { &DetectModbusRust {
access_type: Some((AccessType::READ | AccessType::INPUT)), access_type: Some(AccessType::READ | AccessType::INPUT),
address: Some(103..std::u16::MAX), address: Some(103..std::u16::MAX),
..Default::default() ..Default::default()
} }
@ -1315,7 +1315,7 @@ mod test {
rs_modbus_inspect( rs_modbus_inspect(
&modbus.transactions[5], &modbus.transactions[5],
&DetectModbusRust { &DetectModbusRust {
access_type: Some((AccessType::READ | AccessType::INPUT)), access_type: Some(AccessType::READ | AccessType::INPUT),
address: Some(103..110), address: Some(103..110),
..Default::default() ..Default::default()
} }
@ -1327,7 +1327,7 @@ mod test {
rs_modbus_inspect( rs_modbus_inspect(
&modbus.transactions[5], &modbus.transactions[5],
&DetectModbusRust { &DetectModbusRust {
access_type: Some((AccessType::READ | AccessType::INPUT)), access_type: Some(AccessType::READ | AccessType::INPUT),
address: Some(104..104), address: Some(104..104),
..Default::default() ..Default::default()
} }

Write Preview
Loading…
Cancel
Save