Skip to content

Commit 977ed3d

Browse files
[pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
1 parent 4b54357 commit 977ed3d

File tree

1 file changed

+20
-8
lines changed

1 file changed

+20
-8
lines changed

src/parser.rs

Lines changed: 20 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -542,8 +542,10 @@ pub(crate) fn parse_attribute_rel(pair: Pair<Rule>) -> DbcResult<AttributeRel> {
542542
AttributeRelObjectType::BuSgRel => {
543543
// Pattern: ident ~ "SG_" ~ int ~ ident ~ num_str_value
544544
// node_name, "SG_", message_id, signal_name, value
545-
_node_name = next_rule(&mut data_pairs, Rule::ident)?.as_str().to_string();
546-
545+
_node_name = next_rule(&mut data_pairs, Rule::ident)?
546+
.as_str()
547+
.to_string();
548+
547549
let sg_pair = next_rule(&mut data_pairs, Rule::signal_var)?;
548550
// signal_var contains: signal_literal ~ message_id ~ ident
549551
// signal_literal is silent (_), so we get message_id and ident directly
@@ -558,13 +560,19 @@ pub(crate) fn parse_attribute_rel(pair: Pair<Rule>) -> DbcResult<AttributeRel> {
558560
});
559561

560562
// Get signal name
561-
_signal_name = Some(next_rule(&mut signal_var_pairs, Rule::ident)?.as_str().to_string());
563+
_signal_name = Some(
564+
next_rule(&mut signal_var_pairs, Rule::ident)?
565+
.as_str()
566+
.to_string(),
567+
);
562568
}
563569
AttributeRelObjectType::BuBoRel => {
564570
// Pattern: ident ~ message_id ~ num_str_value
565571
// node_name, message_id, value
566-
_node_name = next_rule(&mut data_pairs, Rule::ident)?.as_str().to_string();
567-
572+
_node_name = next_rule(&mut data_pairs, Rule::ident)?
573+
.as_str()
574+
.to_string();
575+
568576
let msg_id = parse_uint(next_rule(&mut data_pairs, Rule::message_id)?)? as u32;
569577
_message_id = Some(if msg_id & (1 << 31) != 0 {
570578
MessageId::Extended(msg_id & 0x1FFF_FFFF)
@@ -575,10 +583,14 @@ pub(crate) fn parse_attribute_rel(pair: Pair<Rule>) -> DbcResult<AttributeRel> {
575583
AttributeRelObjectType::BuEvRel => {
576584
// Pattern: ident ~ "EV_" ~ ident ~ num_str_value
577585
// node_name, "EV_", env_var_name, value
578-
_node_name = next_rule(&mut data_pairs, Rule::ident)?.as_str().to_string();
579-
586+
_node_name = next_rule(&mut data_pairs, Rule::ident)?
587+
.as_str()
588+
.to_string();
589+
580590
// Skip env_literal (EV_) - it's silent
581-
let env_var_name = next_rule(&mut data_pairs, Rule::ident)?.as_str().to_string();
591+
let env_var_name = next_rule(&mut data_pairs, Rule::ident)?
592+
.as_str()
593+
.to_string();
582594
_signal_name = Some(env_var_name);
583595
}
584596
}

0 commit comments

Comments
 (0)