Skip to content

Commit 02b6e85

Browse files
committed
Rust: remove VariantDef
1 parent 0d292b7 commit 02b6e85

File tree

21 files changed

+39
-232
lines changed

21 files changed

+39
-232
lines changed

rust/ast-generator/src/main.rs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -385,8 +385,8 @@ struct ExtractorInfo {
385385
}
386386

387387
fn enum_to_extractor_info(node: &AstEnumSrc) -> Option<ExtractorEnumInfo> {
388-
if matches!(node.name.as_str(), "VariantDef" | "Adt") {
389-
// these are not used as types of fields, so we don't need to generate extractors for them
388+
if node.name == "Adt" {
389+
// no fields have `Adt` type, so we don't need extraction for it
390390
return None;
391391
}
392392
Some(ExtractorEnumInfo {
@@ -484,6 +484,8 @@ fn main() -> anyhow::Result<()> {
484484
.parse()
485485
.expect("Failed to parse grammar");
486486
let mut grammar = codegen::grammar::lower(&grammar);
487+
// remove the VariantDef enum, there is no use for it at the moment
488+
grammar.enums.retain(|e| e.name != "VariantDef");
487489

488490
let mut super_types: BTreeMap<String, BTreeSet<String>> = BTreeMap::new();
489491
for node in &grammar.enums {

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: 2 additions & 65 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

rust/ql/.generated.list

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

rust/ql/.gitattributes

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

rust/ql/lib/codeql/rust/elements.qll

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

rust/ql/lib/codeql/rust/elements/Struct.qll

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

rust/ql/lib/codeql/rust/elements/Union.qll

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

rust/ql/lib/codeql/rust/elements/Variant.qll

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

rust/ql/lib/codeql/rust/elements/VariantDef.qll

Lines changed: 0 additions & 9 deletions
This file was deleted.

0 commit comments

Comments
 (0)