Skip to content

Commit 66eb90e

Browse files
aaronvgaaronvg
committed
clippy
1 parent 247c487 commit 66eb90e

File tree

2 files changed

+59
-29
lines changed
  • baml_language/crates

2 files changed

+59
-29
lines changed

‎baml_language/crates/baml_compiler_hir/src/lib.rs‎

Lines changed: 31 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1036,8 +1036,9 @@ fn validate_duplicate_names(db: &dyn Db, root: baml_workspace::Project) -> Vec<N
10361036
let item_tree = file_item_tree(db, file);
10371037
let local_id = loc.id(db);
10381038
let func = &item_tree[local_id];
1039-
let span = get_item_name_span(db, file, "function", func.name.as_str(), local_id.index())
1040-
.unwrap_or_else(|| Span::new(file.file_id(db), TextRange::empty(0.into())));
1039+
let span =
1040+
get_item_name_span(db, file, "function", func.name.as_str(), local_id.index())
1041+
.unwrap_or_else(|| Span::new(file.file_id(db), TextRange::empty(0.into())));
10411042
let path = file.path(db).display().to_string();
10421043
check_duplicate(
10431044
&mut seen,
@@ -1053,8 +1054,9 @@ fn validate_duplicate_names(db: &dyn Db, root: baml_workspace::Project) -> Vec<N
10531054
let item_tree = file_item_tree(db, file);
10541055
let local_id = loc.id(db);
10551056
let class = &item_tree[local_id];
1056-
let span = get_item_name_span(db, file, "class", class.name.as_str(), local_id.index())
1057-
.unwrap_or_else(|| Span::new(file.file_id(db), TextRange::empty(0.into())));
1057+
let span =
1058+
get_item_name_span(db, file, "class", class.name.as_str(), local_id.index())
1059+
.unwrap_or_else(|| Span::new(file.file_id(db), TextRange::empty(0.into())));
10581060
let path = file.path(db).display().to_string();
10591061
check_duplicate(
10601062
&mut seen,
@@ -1070,8 +1072,9 @@ fn validate_duplicate_names(db: &dyn Db, root: baml_workspace::Project) -> Vec<N
10701072
let item_tree = file_item_tree(db, file);
10711073
let local_id = loc.id(db);
10721074
let enum_def = &item_tree[local_id];
1073-
let span = get_item_name_span(db, file, "enum", enum_def.name.as_str(), local_id.index())
1074-
.unwrap_or_else(|| Span::new(file.file_id(db), TextRange::empty(0.into())));
1075+
let span =
1076+
get_item_name_span(db, file, "enum", enum_def.name.as_str(), local_id.index())
1077+
.unwrap_or_else(|| Span::new(file.file_id(db), TextRange::empty(0.into())));
10751078
let path = file.path(db).display().to_string();
10761079
check_duplicate(
10771080
&mut seen,
@@ -1087,8 +1090,14 @@ fn validate_duplicate_names(db: &dyn Db, root: baml_workspace::Project) -> Vec<N
10871090
let item_tree = file_item_tree(db, file);
10881091
let local_id = loc.id(db);
10891092
let alias = &item_tree[local_id];
1090-
let span = get_item_name_span(db, file, "type alias", alias.name.as_str(), local_id.index())
1091-
.unwrap_or_else(|| Span::new(file.file_id(db), TextRange::empty(0.into())));
1093+
let span = get_item_name_span(
1094+
db,
1095+
file,
1096+
"type alias",
1097+
alias.name.as_str(),
1098+
local_id.index(),
1099+
)
1100+
.unwrap_or_else(|| Span::new(file.file_id(db), TextRange::empty(0.into())));
10921101
let path = file.path(db).display().to_string();
10931102
check_duplicate(
10941103
&mut seen,
@@ -1104,8 +1113,9 @@ fn validate_duplicate_names(db: &dyn Db, root: baml_workspace::Project) -> Vec<N
11041113
let item_tree = file_item_tree(db, file);
11051114
let local_id = loc.id(db);
11061115
let client = &item_tree[local_id];
1107-
let span = get_item_name_span(db, file, "client", client.name.as_str(), local_id.index())
1108-
.unwrap_or_else(|| Span::new(file.file_id(db), TextRange::empty(0.into())));
1116+
let span =
1117+
get_item_name_span(db, file, "client", client.name.as_str(), local_id.index())
1118+
.unwrap_or_else(|| Span::new(file.file_id(db), TextRange::empty(0.into())));
11091119
let path = file.path(db).display().to_string();
11101120
check_duplicate(
11111121
&mut seen,
@@ -1121,8 +1131,14 @@ fn validate_duplicate_names(db: &dyn Db, root: baml_workspace::Project) -> Vec<N
11211131
let item_tree = file_item_tree(db, file);
11221132
let local_id = loc.id(db);
11231133
let generator = &item_tree[local_id];
1124-
let span = get_item_name_span(db, file, "generator", generator.name.as_str(), local_id.index())
1125-
.unwrap_or_else(|| Span::new(file.file_id(db), TextRange::empty(0.into())));
1134+
let span = get_item_name_span(
1135+
db,
1136+
file,
1137+
"generator",
1138+
generator.name.as_str(),
1139+
local_id.index(),
1140+
)
1141+
.unwrap_or_else(|| Span::new(file.file_id(db), TextRange::empty(0.into())));
11261142
let path = file.path(db).display().to_string();
11271143
check_duplicate(
11281144
&mut seen,
@@ -1139,8 +1155,9 @@ fn validate_duplicate_names(db: &dyn Db, root: baml_workspace::Project) -> Vec<N
11391155
let item_tree = file_item_tree(db, file);
11401156
let local_id = loc.id(db);
11411157
let test = &item_tree[local_id];
1142-
let span = get_item_name_span(db, file, "test", test.name.as_str(), local_id.index())
1143-
.unwrap_or_else(|| Span::new(file.file_id(db), TextRange::empty(0.into())));
1158+
let span =
1159+
get_item_name_span(db, file, "test", test.name.as_str(), local_id.index())
1160+
.unwrap_or_else(|| Span::new(file.file_id(db), TextRange::empty(0.into())));
11441161
let path = file.path(db).display().to_string();
11451162

11461163
// Check each function reference in the test

‎baml_language/crates/baml_compiler_parser/src/parser.rs‎

Lines changed: 28 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -665,8 +665,14 @@ impl<'a> Parser<'a> {
665665
fn try_recover_invalid_block(&mut self) -> bool {
666666
// Check pattern: Word Word LBrace
667667
let is_word = self.at(TokenKind::Word);
668-
let next_is_word = self.peek(1).map(|t| t.kind == TokenKind::Word).unwrap_or(false);
669-
let then_lbrace = self.peek(2).map(|t| t.kind == TokenKind::LBrace).unwrap_or(false);
668+
let next_is_word = self
669+
.peek(1)
670+
.map(|t| t.kind == TokenKind::Word)
671+
.unwrap_or(false);
672+
let then_lbrace = self
673+
.peek(2)
674+
.map(|t| t.kind == TokenKind::LBrace)
675+
.unwrap_or(false);
670676

671677
if !is_word || !next_is_word || !then_lbrace {
672678
return false;
@@ -679,8 +685,7 @@ impl<'a> Parser<'a> {
679685
// Emit a helpful error message
680686
self.error(
681687
format!(
682-
"Unknown keyword '{}'. Expected 'class', 'enum', 'function', 'client', 'generator', 'test', or 'type'.",
683-
invalid_keyword
688+
"Unknown keyword '{invalid_keyword}'. Expected 'class', 'enum', 'function', 'client', 'generator', 'test', or 'type'."
684689
),
685690
span,
686691
);
@@ -721,8 +726,14 @@ impl<'a> Parser<'a> {
721726
fn try_recover_invalid_type_alias(&mut self) -> bool {
722727
// Check pattern: Word Word Equals
723728
let is_word = self.at(TokenKind::Word);
724-
let next_is_word = self.peek(1).map(|t| t.kind == TokenKind::Word).unwrap_or(false);
725-
let then_equals = self.peek(2).map(|t| t.kind == TokenKind::Equals).unwrap_or(false);
729+
let next_is_word = self
730+
.peek(1)
731+
.map(|t| t.kind == TokenKind::Word)
732+
.unwrap_or(false);
733+
let then_equals = self
734+
.peek(2)
735+
.map(|t| t.kind == TokenKind::Equals)
736+
.unwrap_or(false);
726737

727738
if !is_word || !next_is_word || !then_equals {
728739
return false;
@@ -735,8 +746,7 @@ impl<'a> Parser<'a> {
735746
// Emit a helpful error message
736747
self.error(
737748
format!(
738-
"Unknown keyword '{}'. Did you mean 'type'? Usage: type Name = expression",
739-
invalid_keyword
749+
"Unknown keyword '{invalid_keyword}'. Did you mean 'type'? Usage: type Name = expression"
740750
),
741751
span,
742752
);
@@ -758,12 +768,14 @@ impl<'a> Parser<'a> {
758768
// Stop at keywords that would start a new declaration
759769
if matches!(
760770
self.current().map(|t| t.kind),
761-
Some(TokenKind::Class)
762-
| Some(TokenKind::Enum)
763-
| Some(TokenKind::Function)
764-
| Some(TokenKind::Client)
765-
| Some(TokenKind::Generator)
766-
| Some(TokenKind::Test)
771+
Some(
772+
TokenKind::Class
773+
| TokenKind::Enum
774+
| TokenKind::Function
775+
| TokenKind::Client
776+
| TokenKind::Generator
777+
| TokenKind::Test
778+
)
767779
) {
768780
break;
769781
}
@@ -1369,7 +1381,8 @@ impl<'a> Parser<'a> {
13691381
if !self.at(TokenKind::RParen) {
13701382
if let Some(token) = self.current() {
13711383
let message = if token.kind == TokenKind::Dot {
1372-
"Path identifiers (e.g., 'a.b') are not supported in type expressions".to_string()
1384+
"Path identifiers (e.g., 'a.b') are not supported in type expressions"
1385+
.to_string()
13731386
} else {
13741387
format!("Unexpected '{}' in type expression", token.text)
13751388
};

0 commit comments

Comments
 (0)