Skip to content

Commit 4bf7bbb

Browse files
authored
Merge pull request github#18190 from github/redsun82/rust-array-expr
Rust: distinguish `[a, b]` from `[a; b]`
2 parents 06b1d8e + 277c9f4 commit 4bf7bbb

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

53 files changed

+767
-149
lines changed

.pre-commit-config.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ repos:
7272

7373
- id: rust-codegen
7474
name: Run Rust checked in code generation
75-
files: ^misc/codegen/|^rust/(schema.py$|codegen/|.*/generated/|ql/lib/(rust\.dbscheme$|codeql/rust/elements)|\.generated.list)
75+
files: ^misc/codegen/|^rust/(prefix\.dbscheme|schema/|codegen/|.*/generated/|ql/lib/(rust\.dbscheme$|codeql/rust/elements)|\.generated.list)
7676
language: system
7777
entry: bazel run //rust/codegen -- --quiet
7878
pass_filenames: false

rust/ast-generator/src/main.rs

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ fn class_name(type_name: &str) -> String {
2121
"Fn" => "Function",
2222
"Literal" => "LiteralExpr",
2323
"Type" => "TypeRef",
24+
"ArrayExpr" => "ArrayExprInternal",
2425
_ => type_name,
2526
};
2627
name.to_owned()
@@ -354,6 +355,13 @@ fn get_fields(node: &AstNodeSrc) -> Vec<FieldInfo> {
354355
is_many: false,
355356
});
356357
}
358+
"ArrayExpr" => {
359+
result.push(FieldInfo {
360+
name: "is_semicolon".to_string(),
361+
tp: "predicate".to_string(),
362+
is_many: false,
363+
});
364+
}
357365
_ => {}
358366
}
359367

rust/extractor/src/generated/.generated.list

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

rust/extractor/src/generated/top.rs

Lines changed: 24 additions & 20 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

rust/extractor/src/translate/generated.rs

Lines changed: 5 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)