fix several issues

Calsign · Oct 21, 2023 · b764243 · b764243
1 parent 6d455f9
commit b764243
Show file tree

Hide file tree

Showing 18 changed files with 74 additions and 5 deletions.
diff --git a/generation_tests/cargo/all_kinds/BUILD.out b/generation_tests/cargo/all_kinds/BUILD.out
@@ -5,19 +5,22 @@ load("@rules_rust//rust:defs.bzl", "rust_binary", "rust_library", "rust_test")
 rust_library(
  name = "all_kinds_lib",
  srcs = ["src/lib.rs"],
+ compile_data = [":Cargo.toml"],
  crate_name = "all_kinds",
  visibility = ["//visibility:public"],
 )
 
 rust_binary(
  name = "all_kinds",
  srcs = ["src/main.rs"],
+ compile_data = [":Cargo.toml"],
  visibility = ["//visibility:public"],
 )
 
 rust_binary(
  name = "another_executable",
  srcs = ["src/bin/another_executable.rs"],
+ compile_data = [":Cargo.toml"],
  visibility = ["//visibility:public"],
 )
 
@@ -27,12 +30,14 @@ rust_binary(
  "src/bin/multi_file_executable/main.rs",
  "src/bin/multi_file_executable/some_module.rs",
  ],
+ compile_data = [":Cargo.toml"],
  visibility = ["//visibility:public"],
 )
 
 rust_binary(
  name = "named_executable",
  srcs = ["src/bin/named_executable.rs"],
+ compile_data = [":Cargo.toml"],
  visibility = ["//visibility:public"],
 )
 
@@ -42,18 +47,21 @@ rust_test(
  "tests/multi_file_test/main.rs",
  "tests/multi_file_test/test_module.rs",
  ],
+ compile_data = [":Cargo.toml"],
  visibility = ["//visibility:public"],
 )
 
 rust_test(
  name = "some_integration_test",
  srcs = ["tests/some_integration_test.rs"],
+ compile_data = [":Cargo.toml"],
  visibility = ["//visibility:public"],
 )
 
 rust_binary(
  name = "large_input",
  srcs = ["benches/large_input.rs"],
+ compile_data = [":Cargo.toml"],
  tags = ["bench"],
  visibility = ["//visibility:public"],
 )
@@ -64,6 +72,7 @@ rust_binary(
  "benches/multi_file_bench/bench_module.rs",
  "benches/multi_file_bench/main.rs",
  ],
+ compile_data = [":Cargo.toml"],
  tags = ["bench"],
  visibility = ["//visibility:public"],
 )
@@ -74,13 +83,15 @@ rust_binary(
  "examples/multi_file_example/ex_module.rs",
  "examples/multi_file_example/main.rs",
  ],
+ compile_data = [":Cargo.toml"],
  tags = ["example"],
  visibility = ["//visibility:public"],
 )
 
 rust_binary(
  name = "simple",
  srcs = ["examples/simple.rs"],
+ compile_data = [":Cargo.toml"],
  tags = ["example"],
  visibility = ["//visibility:public"],
 )
diff --git a/generation_tests/cargo/basic/BUILD.out b/generation_tests/cargo/basic/BUILD.out
@@ -8,13 +8,15 @@ rust_library(
  "src/foobar.rs",
  "src/lib.rs",
  ],
+ compile_data = [":Cargo.toml"],
  crate_name = "basic",
  visibility = ["//visibility:public"],
 )
 
 rust_binary(
  name = "basic",
  srcs = ["src/main.rs"],
+ compile_data = [":Cargo.toml"],
  visibility = ["//visibility:public"],
  deps = [":basic_lib"],
 )
diff --git a/generation_tests/cargo/crate_tests/BUILD.out b/generation_tests/cargo/crate_tests/BUILD.out
@@ -5,52 +5,61 @@ load("@rules_rust//rust:defs.bzl", "rust_binary", "rust_library", "rust_test")
 rust_library(
  name = "all_kinds_lib",
  srcs = ["src/lib.rs"],
+ compile_data = [":Cargo.toml"],
  crate_name = "all_kinds",
  visibility = ["//visibility:public"],
 )
 
 rust_binary(
  name = "all_kinds",
  srcs = ["src/main.rs"],
+ compile_data = [":Cargo.toml"],
  visibility = ["//visibility:public"],
 )
 
 rust_test(
  name = "some_integration_test",
  srcs = ["tests/some_integration_test.rs"],
+ compile_data = [":Cargo.toml"],
  visibility = ["//visibility:public"],
 )
 
 rust_binary(
  name = "large_input",
  srcs = ["benches/large_input.rs"],
+ compile_data = [":Cargo.toml"],
  tags = ["bench"],
  visibility = ["//visibility:public"],
 )
 
 rust_binary(
  name = "simple",
  srcs = ["examples/simple.rs"],
+ compile_data = [":Cargo.toml"],
  tags = ["example"],
  visibility = ["//visibility:public"],
 )
 
 rust_test(
  name = "all_kinds_lib_test",
+ compile_data = [":Cargo.toml"],
  crate = ":all_kinds_lib",
 )
 
 rust_test(
  name = "all_kinds_test",
+ compile_data = [":Cargo.toml"],
  crate = ":all_kinds",
 )
 
 rust_test(
  name = "large_input_test",
+ compile_data = [":Cargo.toml"],
  crate = ":large_input",
 )
 
 rust_test(
  name = "simple_test",
+ compile_data = [":Cargo.toml"],
  crate = ":simple",
 )
diff --git a/generation_tests/cargo/dependencies/BUILD.out b/generation_tests/cargo/dependencies/BUILD.out
@@ -5,20 +5,23 @@ load("@rules_rust//rust:defs.bzl", "rust_binary", "rust_library", "rust_test")
 rust_library(
  name = "dependencies_lib",
  srcs = ["src/lib.rs"],
+ compile_data = [":Cargo.toml"],
  crate_name = "dependencies",
  visibility = ["//visibility:public"],
 )
 
 rust_binary(
  name = "dependencies",
  srcs = ["src/main.rs"],
+ compile_data = [":Cargo.toml"],
  visibility = ["//visibility:public"],
  deps = [":dependencies_lib"],
 )
 
 rust_test(
  name = "integration_test",
  srcs = ["tests/integration_test.rs"],
+ compile_data = [":Cargo.toml"],
  visibility = ["//visibility:public"],
  deps = [":dependencies_lib"],
 )
diff --git a/generation_tests/cargo/mixed_modes/cargo_a/BUILD.out b/generation_tests/cargo/mixed_modes/cargo_a/BUILD.out
@@ -5,5 +5,6 @@ load("@rules_rust//rust:defs.bzl", "rust_library")
 rust_library(
  name = "cargo_a",
  srcs = ["src/lib.rs"],
+ compile_data = [":Cargo.toml"],
  visibility = ["//visibility:public"],
 )
diff --git a/generation_tests/cargo/mixed_modes/cargo_b/BUILD.out b/generation_tests/cargo/mixed_modes/cargo_b/BUILD.out
@@ -5,6 +5,7 @@ load("@rules_rust//rust:defs.bzl", "rust_library")
 rust_library(
  name = "cargo_b",
  srcs = ["src/lib.rs"],
+ compile_data = [":Cargo.toml"],
  visibility = ["//visibility:public"],
  deps = ["//cargo_a"],
 )
diff --git a/generation_tests/cargo/multi_package_workspace/a/BUILD.out b/generation_tests/cargo/multi_package_workspace/a/BUILD.out
@@ -3,13 +3,15 @@ load("@rules_rust//rust:defs.bzl", "rust_binary", "rust_library")
 rust_library(
  name = "a_lib",
  srcs = ["src/lib.rs"],
+ compile_data = [":Cargo.toml"],
  crate_name = "a",
  visibility = ["//visibility:public"],
 )
 
 rust_binary(
  name = "a",
  srcs = ["src/main.rs"],
+ compile_data = [":Cargo.toml"],
  visibility = ["//visibility:public"],
  deps = [":a_lib"],
 )
diff --git a/generation_tests/cargo/multi_package_workspace/b/BUILD.out b/generation_tests/cargo/multi_package_workspace/b/BUILD.out
@@ -3,6 +3,7 @@ load("@rules_rust//rust:defs.bzl", "rust_library")
 rust_library(
  name = "b",
  srcs = ["src/lib.rs"],
+ compile_data = [":Cargo.toml"],
  visibility = ["//visibility:public"],
  deps = ["//a:a_lib"],
 )
diff --git a/generation_tests/cargo/multi_package_workspace/c/BUILD.out b/generation_tests/cargo/multi_package_workspace/c/BUILD.out
@@ -3,6 +3,7 @@ load("@rules_rust//rust:defs.bzl", "rust_library")
 rust_library(
  name = "c",
  srcs = ["src/lib.rs"],
+ compile_data = [":Cargo.toml"],
  visibility = ["//visibility:public"],
  deps = [
  "//a:a_lib",

diff --git a/generation_tests/cargo/multi_package_workspace/nested/nested_package/BUILD.out b/generation_tests/cargo/multi_package_workspace/nested/nested_package/BUILD.out
@@ -3,6 +3,7 @@ load("@rules_rust//rust:defs.bzl", "rust_library")
 rust_library(
  name = "nested_package",
  srcs = ["src/lib.rs"],
+ compile_data = [":Cargo.toml"],
  visibility = ["//visibility:public"],
  deps = [
  "//a:a_lib",

diff --git a/generation_tests/cargo/nested_modules/BUILD.out b/generation_tests/cargo/nested_modules/BUILD.out
@@ -17,5 +17,6 @@ rust_library(
  "src/c/mod.rs",
  "src/lib.rs",
  ],
+ compile_data = [":Cargo.toml"],
  visibility = ["//visibility:public"],
 )
diff --git a/generation_tests/cargo/update_rule/BUILD.out b/generation_tests/cargo/update_rule/BUILD.out
@@ -5,20 +5,23 @@ load("@rules_rust//rust:defs.bzl", "rust_binary", "rust_library", "rust_test")
 rust_library(
  name = "update_rule_lib",
  srcs = ["src/lib.rs"],
+ compile_data = [":Cargo.toml"],
  crate_name = "update_rule",
  visibility = ["//visibility:public"],
 )
 
 rust_binary(
  name = "update_rule",
  srcs = ["src/main.rs"],
+ compile_data = [":Cargo.toml"],
  visibility = ["//visibility:private"],
  deps = [":update_rule_lib"],
 )
 
 rust_test(
  name = "integration_test",
  srcs = ["tests/integration_test.rs"],
+ compile_data = [":Cargo.toml"],
  visibility = ["//visibility:public"],
  deps = [":update_rule_lib"],
 )
diff --git a/proto/messages.proto b/proto/messages.proto
@@ -58,6 +58,7 @@ message CargoTomlRequest {
 message CargoCrateInfo {
  string name = 1;
  repeated string srcs = 2;
+ bool proc_macro = 3;
 }
 
 message CargoTomlResponse {

diff --git a/rust_language/builtins.go b/rust_language/builtins.go
@@ -7,12 +7,18 @@ import (
 // modules provided by rust
 var Builtins = map[string]bool{
  // standard library
- "std": true,
- "core": true,
+ "std": true,
+ "core": true,
+ "alloc": true,
+ "test": true,
 
  // proc macros
  "proc_macro": true,
 
+ // tools
+ "rustfmt": true,
+ "clippy": true,
+
  // primitive types
  // https://doc.rust-lang.org/std/primitive/index.html
  "bool": true,

diff --git a/rust_language/generate.go b/rust_language/generate.go
@@ -286,7 +286,12 @@ func (l *rustLang) generateRulesFromCargo(args language.GenerateArgs) language.G
  }
  }
 
- l.generateCargoRule(args.Config, &args, response.Library, "rust_library", suffix, []string{}, &result)
+ kind := "rust_library"
+ if response.Library.ProcMacro {
+ kind = "rust_proc_macro"
+ }
+
+ l.generateCargoRule(args.Config, &args, response.Library, kind, suffix, []string{}, &result)
  }
  for _, binary := range response.Binaries {
  l.generateCargoRule(args.Config, &args, binary, "rust_binary", "", []string{}, &result)
@@ -329,6 +334,7 @@ func (l *rustLang) generateRulesFromCargo(args language.GenerateArgs) language.G
 
  testRule := rule.NewRule("rust_test", *testRuleName)
  testRule.SetAttr("crate", ":"+ruleData.rule.Name())
+ testRule.SetAttr("compile_data", []string{":Cargo.toml"})
 
  result.Gen = append(result.Gen, testRule)
  result.Imports = append(result.Imports, RuleData{
@@ -380,6 +386,7 @@ func (l *rustLang) generateCargoRule(c *config.Config, args *language.GenerateAr
  newRule := rule.NewRule(kind, targetName)
  newRule.SetAttr("srcs", srcs)
  newRule.SetAttr("visibility", []string{"//visibility:public"})
+ newRule.SetAttr("compile_data", []string{":Cargo.toml"})
 
  if targetName != crateName {
  newRule.SetAttr("crate_name", crateName)

diff --git a/rust_parser/lockfile_crates.rs b/rust_parser/lockfile_crates.rs
@@ -57,6 +57,15 @@ pub fn get_bazel_lockfile_crates(lockfile_path: PathBuf) -> Result<Vec<Package>,
  add_crate(&dep.id, false);
  }
 
+ for dep in workspace_crate
+ .common_attrs
+ .deps_dev
+ .get_iter(None)
+ .unwrap()
+ {
+ add_crate(&dep.id, false);
+ }
+
  for proc_macro_dep in workspace_crate
  .common_attrs
  .proc_macro_deps
@@ -65,6 +74,15 @@ pub fn get_bazel_lockfile_crates(lockfile_path: PathBuf) -> Result<Vec<Package>,
  {
  add_crate(&proc_macro_dep.id, true);
  }
+
+ for proc_macro_dep in workspace_crate
+ .common_attrs
+ .proc_macro_deps_dev
+ .get_iter(None)
+ .unwrap()
+ {
+ add_crate(&proc_macro_dep.id, true);
+ }
  }
 
  Ok(crates)

diff --git a/rust_parser/main.rs b/rust_parser/main.rs
@@ -73,6 +73,7 @@ fn build_crate_info(product: cargo_toml::Product) -> CargoCrateInfo {
  if let Some(path) = product.path {
  crate_info.set_srcs(RepeatedField::from_vec(vec![path]));
  }
+ crate_info.proc_macro = product.proc_macro;
 
  crate_info
 }

diff --git a/rust_parser/parser.rs b/rust_parser/parser.rs
@@ -198,7 +198,7 @@ impl<'ast> AstVisitor<'ast> {
  fn add_import<I: Into<Ident<'ast>>>(&mut self, ident: I) {
  let ident = ident.into();
 
- if ident == "crate" || ident == "super" {
+ if ident == "crate" || ident == "super" || ident == "self" {
  // these are keywords referring to the current crate; not an import
  return;
  }
@@ -403,7 +403,7 @@ impl<'ast> Visit<'ast> for AstVisitor<'ast> {
  if ident == "test" {
  self.hints.has_test = true;
  is_test_only = true;
- } else if ident == "proc_macro" {
+ } else if ident == "proc_macro" || ident == "proc_macro_attribute" {
  self.hints.has_proc_macro = true;
  }
  }