Skip to content

Commit d99c203

Browse files
committed
Workaround nameclash in dbscheme generator
1 parent b0939cf commit d99c203

File tree

15 files changed

+63
-63
lines changed

15 files changed

+63
-63
lines changed

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

rust/extractor/src/translate.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -262,15 +262,15 @@ impl CrateTranslator<'_> {
262262
ellipsis,
263263
} => {
264264
let path = path.as_ref().map(|path| self.emit_path(path, location));
265-
let args = args
265+
let flds = args
266266
.into_iter()
267267
.map(|arg| self.emit_record_field_pat(arg, body, source_map))
268268
.collect();
269269
self.trap.emit(generated::RecordPat {
270270
id: TrapId::Star,
271271
location,
272272
path,
273-
args,
273+
flds,
274274
has_ellipsis: *ellipsis,
275275
})
276276
}
@@ -691,7 +691,7 @@ impl CrateTranslator<'_> {
691691
is_assignee_expr,
692692
} => {
693693
let path = path.as_ref().map(|path| self.emit_path(path, location));
694-
let fields = fields
694+
let flds = fields
695695
.into_iter()
696696
.map(|field| self.emit_record_lit_field(field, body, source_map))
697697
.collect();
@@ -700,7 +700,7 @@ impl CrateTranslator<'_> {
700700
id: TrapId::Star,
701701
location,
702702
path,
703-
fields,
703+
flds,
704704
spread,
705705
has_ellipsis: *ellipsis,
706706
is_assignee_expr: *is_assignee_expr,

rust/ql/.generated.list

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

rust/ql/.gitattributes

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

rust/ql/lib/codeql/rust/generated/ParentChild.qll

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

rust/ql/lib/codeql/rust/generated/Raw.qll

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

rust/ql/lib/codeql/rust/generated/RecordExpr.qll

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

rust/ql/lib/codeql/rust/generated/RecordPat.qll

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

rust/ql/lib/rust.dbscheme

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -584,10 +584,10 @@ record_expr_paths(
584584
);
585585

586586
#keyset[id, index]
587-
record_expr_fields(
587+
record_expr_flds(
588588
int id: @record_expr ref,
589589
int index: int ref,
590-
int field: @record_expr_field ref
590+
int fld: @record_expr_field ref
591591
);
592592

593593
#keyset[id]
@@ -617,10 +617,10 @@ record_pat_paths(
617617
);
618618

619619
#keyset[id, index]
620-
record_pat_args(
620+
record_pat_flds(
621621
int id: @record_pat ref,
622622
int index: int ref,
623-
int arg: @record_pat_field ref
623+
int fld: @record_pat_field ref
624624
);
625625

626626
#keyset[id]

0 commit comments

Comments
 (0)