Skip to content

Commit 022df5c

Browse files
[pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
1 parent b2ddc95 commit 022df5c

File tree

2 files changed

+18
-6
lines changed

2 files changed

+18
-6
lines changed

src/parser.rs

Lines changed: 17 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -537,7 +537,9 @@ pub(crate) fn parse_attribute_rel(pair: Pair<Rule>) -> DbcResult<AttributeRel> {
537537
AttributeRelObjectType::BuSgRel => {
538538
// Pattern: ident ~ "SG_" ~ int ~ ident ~ num_str_value
539539
// node_name, "SG_", message_id, signal_name, value
540-
_node_name = next_rule(&mut data_pairs, Rule::ident)?.as_str().to_string();
540+
_node_name = next_rule(&mut data_pairs, Rule::ident)?
541+
.as_str()
542+
.to_string();
541543

542544
let sg_pair = next_rule(&mut data_pairs, Rule::signal_var)?;
543545
// signal_var contains: signal_literal ~ message_id ~ ident
@@ -553,12 +555,18 @@ pub(crate) fn parse_attribute_rel(pair: Pair<Rule>) -> DbcResult<AttributeRel> {
553555
});
554556

555557
// Get signal name
556-
_signal_name = Some(next_rule(&mut signal_var_pairs, Rule::ident)?.as_str().to_string());
558+
_signal_name = Some(
559+
next_rule(&mut signal_var_pairs, Rule::ident)?
560+
.as_str()
561+
.to_string(),
562+
);
557563
}
558564
AttributeRelObjectType::BuBoRel => {
559565
// Pattern: ident ~ message_id ~ num_str_value
560566
// node_name, message_id, value
561-
_node_name = next_rule(&mut data_pairs, Rule::ident)?.as_str().to_string();
567+
_node_name = next_rule(&mut data_pairs, Rule::ident)?
568+
.as_str()
569+
.to_string();
562570

563571
let msg_id = parse_uint(next_rule(&mut data_pairs, Rule::message_id)?)? as u32;
564572
_message_id = Some(if msg_id & (1 << 31) != 0 {
@@ -570,10 +578,14 @@ pub(crate) fn parse_attribute_rel(pair: Pair<Rule>) -> DbcResult<AttributeRel> {
570578
AttributeRelObjectType::BuEvRel => {
571579
// Pattern: ident ~ "EV_" ~ ident ~ num_str_value
572580
// node_name, "EV_", env_var_name, value
573-
_node_name = next_rule(&mut data_pairs, Rule::ident)?.as_str().to_string();
581+
_node_name = next_rule(&mut data_pairs, Rule::ident)?
582+
.as_str()
583+
.to_string();
574584

575585
// Skip env_literal (EV_) - it's silent
576-
let env_var_name = next_rule(&mut data_pairs, Rule::ident)?.as_str().to_string();
586+
let env_var_name = next_rule(&mut data_pairs, Rule::ident)?
587+
.as_str()
588+
.to_string();
577589
_signal_name = Some(env_var_name);
578590
}
579591
}

src/parser_tests.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
#![allow(clippy::needless_raw_string_hashes)]
22
#![allow(unused_imports)]
33

4-
use can_dbc_pest::*;
54
use crate::parser::*;
65
use crate::*;
6+
use can_dbc_pest::*;
77

88
/// Helper function to parse a snippet with a specific rule, returning just the rule's inner content already unwrapped
99
fn parse(input: &str, rule: Rule) -> DbcResult<Pair<'_, Rule>> {

0 commit comments

Comments
 (0)