Skip to content

Commit 7d312fe

Browse files
author
Paolo Tranquilli
committed
Rust: add local copy of rust.ungrammar
This copy is injected by the existing `//rust/ast-generator:inject-sources` target, and is useful for development.
1 parent 04f9694 commit 7d312fe

File tree

3 files changed

+17
-7
lines changed

3 files changed

+17
-7
lines changed

rust/ast-generator/.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,4 @@
22
/.idea
33
/src/codegen/grammar.rs
44
/src/codegen/grammar/
5+
/rust.ungram

rust/ast-generator/BUILD.bazel

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ load("//misc/bazel/3rdparty/tree_sitter_extractors_deps:defs.bzl", "aliases", "a
1111
ra_ap_syntax_workspace, _, _ = str(ra_ap_syntax_label).partition("//")
1212

1313
alias(
14-
name = "ungram",
14+
name = "rust.ungram",
1515
actual = "%s//:rust.ungram" % ra_ap_syntax_workspace,
1616
visibility = ["//rust/codegen:__pkg__"],
1717
)
@@ -45,9 +45,9 @@ codeql_rust_binary(
4545
exclude = ["src/codegen/**"],
4646
) + [":codegen"],
4747
aliases = aliases(),
48-
args = ["$(rlocationpath :ungram)"],
48+
args = ["$(rlocationpath :rust.ungram)"],
4949
compile_data = glob(["src/templates/*.mustache"]),
50-
data = [":ungram"],
50+
data = [":rust.ungram"],
5151
proc_macro_deps = all_crate_deps(
5252
proc_macro = True,
5353
),
@@ -69,16 +69,25 @@ write_file(
6969
# using cat instead of cp to honor default umask
7070
# (also, macOS does not support `cp --no-preserve=mode`)
7171
'cat "$(rlocation "$%s")" > "$DST_DIR/%s"' % item
72-
for item in enumerate(_codegen_outs, 2)
72+
for item in enumerate(
73+
["rust.ungram"] + _codegen_outs,
74+
2,
75+
)
7376
],
7477
is_executable = True,
7578
)
7679

7780
sh_binary(
7881
name = "inject-sources",
7982
srcs = [":update"],
80-
args = ["$(rlocationpath Cargo.toml)"] + ["$(rlocationpath %s)" % f for f in _codegen_outs],
81-
data = ["Cargo.toml"] + _codegen_outs,
83+
args = ["$(rlocationpath %s)" % f for f in [
84+
"Cargo.toml",
85+
":rust.ungram",
86+
] + _codegen_outs],
87+
data = [
88+
"Cargo.toml",
89+
":rust.ungram",
90+
] + _codegen_outs,
8291
deps = ["//misc/bazel:sh_runfiles"],
8392
)
8493

rust/codegen/BUILD.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ load("@rules_shell//shell:sh_binary.bzl", "sh_binary")
33

44
_args = [
55
"//rust/ast-generator",
6-
"//rust/ast-generator:ungram",
6+
"//rust/ast-generator:rust.ungram",
77
"//rust/ast-generator:Cargo.toml",
88
"//misc/codegen",
99
"//rust:codegen-conf",

0 commit comments

Comments
 (0)