From 2b0d3e3cd3caaebd86cdb95c257131b110a2a121 Mon Sep 17 00:00:00 2001 From: David Marcin Date: Sun, 14 Feb 2021 09:49:07 +0000 Subject: [PATCH] Use the new rust_common.crate_info, but now this OOMs... --- rust/private/rust_analyzer.bzl | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/rust/private/rust_analyzer.bzl b/rust/private/rust_analyzer.bzl index b0157d2c6e..42cac4727d 100644 --- a/rust/private/rust_analyzer.bzl +++ b/rust/private/rust_analyzer.bzl @@ -20,7 +20,7 @@ given targets. This file can be consumed by rust-analyzer as an alternative to Cargo.toml files. """ -load("//rust:rust_common.bzl", "CrateInfo") +load("//rust/private:common.bzl", "rust_common") load("//rust/private:rustc.bzl", "BuildInfo") load("//rust/private:utils.bzl", "find_toolchain") load("//rust/platform:triple_mappings.bzl", "system_to_dylib_ext", "triple_to_system") @@ -34,7 +34,7 @@ _rust_rules = [ RustAnalyzerInfo = provider( doc = "RustAnalyzerInfo holds rust crate metadata for targets", fields = { - "crate": "CrateInfo", + "crate": "rust_common.crate_info", "deps": "List[RustAnalyzerInfo]: direct dependencies", "transitive_deps": "List[RustAnalyzerInfo]: transitive closure of dependencies", "cfgs": "List[String]: features or other compilation --cfg settings", @@ -45,7 +45,7 @@ RustAnalyzerInfo = provider( ) def _rust_analyzer_aspect_impl(target, ctx): - if CrateInfo not in target: + if rust_common.crate_info not in target: return [] toolchain = find_toolchain(ctx) @@ -68,7 +68,7 @@ def _rust_analyzer_aspect_impl(target, ctx): dep_infos += [dep[RustAnalyzerInfo] for dep in ctx.rule.attr.proc_macro_deps if RustAnalyzerInfo in dep] transitive_deps = depset(direct = dep_infos, order = "postorder", transitive = [dep.transitive_deps for dep in dep_infos]) - crate_info = target[CrateInfo] + crate_info = target[rust_common.crate_info] return [RustAnalyzerInfo( crate = crate_info, cfgs = cfgs, @@ -88,7 +88,7 @@ def find_proc_macro_dylib_path(toolchain, target): Returns: (path): The path to the proc macro dylib, or None if this crate is not a proc-macro. """ - if target[CrateInfo].type != "proc-macro": + if target[rust_common.crate_info].type != "proc-macro": return None dylib_ext = system_to_dylib_ext(triple_to_system(toolchain.target_triple))