Move buck2_interpreter_for_build into app

Summary: As per our general plan to move things across. Reviewed By: stepancheg Differential Revision: D40214957 fbshipit-source-id: 5d6b0cb19a12cb99e783b2a3633cfe7717f58900
facebook · Oct 9, 2022 · f3e18f9 · f3e18f9
1 parent dca3894
commit f3e18f9
Show file tree

Hide file tree

Showing 53 changed files with 20 additions and 20 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -6,6 +6,7 @@ members = [
     # @oss-disable: "attic/uniplate",
     # @oss-disable: "attic/uniplate_derive",
     "app/buck2_grpc",
+    "app/buck2_interpreter_for_build",
     "app/buck2_test",
     "app/buck2_test_api",
     "app/buck2_test_proto",
@@ -27,7 +28,6 @@ members = [
     "buck2_client",
     "buck2_common",
     "buck2_interpreter",
-    "buck2_interpreter_for_build",
     "buck2_node",
     "buck2_execute",
     "buck2_execute_impl",

diff --git a/buck2_interpreter_for_build/Cargo.toml → app/buck2_interpreter_for_build/Cargo.toml b/buck2_interpreter_for_build/Cargo.toml → app/buck2_interpreter_for_build/Cargo.toml
@@ -18,14 +18,14 @@ thiserror = { workspace = true }
 tracing = { workspace = true }
 twox-hash = { workspace = true }
 
-dice = { path = "../dice/dice" }
+dice = { path = "../../dice/dice" }
 gazebo = { workspace = true }
 starlark = { workspace = true }
 starlark_map = { workspace = true }
 
-buck2_common = { path = "../buck2_common" }
-buck2_core = { path = "../buck2_core" }
-buck2_node = { path = "../buck2_node" }
-buck2_interpreter = { path = "../buck2_interpreter" }
-buck2_query = { path = "../buck2_query" }
-buck2_query_parser = { path = "../app/buck2_query_parser" }
+buck2_common = { path = "../../buck2_common" }
+buck2_core = { path = "../../buck2_core" }
+buck2_node = { path = "../../buck2_node" }
+buck2_interpreter = { path = "../../buck2_interpreter" }
+buck2_query = { path = "../../buck2_query" }
+buck2_query_parser = { path = "../buck2_query_parser" }
diff --git a/buck2_interpreter_for_build/TARGETS → app/buck2_interpreter_for_build/TARGETS b/buck2_interpreter_for_build/TARGETS → app/buck2_interpreter_for_build/TARGETS
diff --git a/.../src/attrs/attribute_as_starlark_value.rs → .../src/attrs/attribute_as_starlark_value.rs b/.../src/attrs/attribute_as_starlark_value.rs → .../src/attrs/attribute_as_starlark_value.rs
diff --git a/...r_build/src/attrs/coerce/attr_type/any.rs → ...r_build/src/attrs/coerce/attr_type/any.rs b/...r_build/src/attrs/coerce/attr_type/any.rs → ...r_build/src/attrs/coerce/attr_type/any.rs
diff --git a/...r_build/src/attrs/coerce/attr_type/arg.rs → ...r_build/src/attrs/coerce/attr_type/arg.rs b/...r_build/src/attrs/coerce/attr_type/arg.rs → ...r_build/src/attrs/coerce/attr_type/arg.rs
diff --git a/..._build/src/attrs/coerce/attr_type/bool.rs → ..._build/src/attrs/coerce/attr_type/bool.rs b/..._build/src/attrs/coerce/attr_type/bool.rs → ..._build/src/attrs/coerce/attr_type/bool.rs
diff --git a/...trs/coerce/attr_type/configuration_dep.rs → ...trs/coerce/attr_type/configuration_dep.rs b/...trs/coerce/attr_type/configuration_dep.rs → ...trs/coerce/attr_type/configuration_dep.rs
diff --git a/...rc/attrs/coerce/attr_type/default_only.rs → ...rc/attrs/coerce/attr_type/default_only.rs b/...rc/attrs/coerce/attr_type/default_only.rs → ...rc/attrs/coerce/attr_type/default_only.rs
diff --git a/...r_build/src/attrs/coerce/attr_type/dep.rs → ...r_build/src/attrs/coerce/attr_type/dep.rs b/...r_build/src/attrs/coerce/attr_type/dep.rs → ...r_build/src/attrs/coerce/attr_type/dep.rs
diff --git a/..._build/src/attrs/coerce/attr_type/dict.rs → ..._build/src/attrs/coerce/attr_type/dict.rs b/..._build/src/attrs/coerce/attr_type/dict.rs → ..._build/src/attrs/coerce/attr_type/dict.rs
diff --git a/...src/attrs/coerce/attr_type/enumeration.rs → ...src/attrs/coerce/attr_type/enumeration.rs b/...src/attrs/coerce/attr_type/enumeration.rs → ...src/attrs/coerce/attr_type/enumeration.rs
diff --git a/...r_build/src/attrs/coerce/attr_type/int.rs → ...r_build/src/attrs/coerce/attr_type/int.rs b/...r_build/src/attrs/coerce/attr_type/int.rs → ...r_build/src/attrs/coerce/attr_type/int.rs
diff --git a/...build/src/attrs/coerce/attr_type/label.rs → ...build/src/attrs/coerce/attr_type/label.rs b/...build/src/attrs/coerce/attr_type/label.rs → ...build/src/attrs/coerce/attr_type/label.rs
diff --git a/..._build/src/attrs/coerce/attr_type/list.rs → ..._build/src/attrs/coerce/attr_type/list.rs b/..._build/src/attrs/coerce/attr_type/list.rs → ..._build/src/attrs/coerce/attr_type/list.rs
diff --git a/...r_build/src/attrs/coerce/attr_type/mod.rs → ...r_build/src/attrs/coerce/attr_type/mod.rs b/...r_build/src/attrs/coerce/attr_type/mod.rs → ...r_build/src/attrs/coerce/attr_type/mod.rs
diff --git a/...uild/src/attrs/coerce/attr_type/one_of.rs → ...uild/src/attrs/coerce/attr_type/one_of.rs b/...uild/src/attrs/coerce/attr_type/one_of.rs → ...uild/src/attrs/coerce/attr_type/one_of.rs
diff --git a/...uild/src/attrs/coerce/attr_type/option.rs → ...uild/src/attrs/coerce/attr_type/option.rs b/...uild/src/attrs/coerce/attr_type/option.rs → ...uild/src/attrs/coerce/attr_type/option.rs
diff --git a/...build/src/attrs/coerce/attr_type/query.rs → ...build/src/attrs/coerce/attr_type/query.rs b/...build/src/attrs/coerce/attr_type/query.rs → ...build/src/attrs/coerce/attr_type/query.rs
diff --git a/...uild/src/attrs/coerce/attr_type/source.rs → ...uild/src/attrs/coerce/attr_type/source.rs b/...uild/src/attrs/coerce/attr_type/source.rs → ...uild/src/attrs/coerce/attr_type/source.rs
diff --git a/.../coerce/attr_type/split_transition_dep.rs → .../coerce/attr_type/split_transition_dep.rs b/.../coerce/attr_type/split_transition_dep.rs → .../coerce/attr_type/split_transition_dep.rs
diff --git a/...uild/src/attrs/coerce/attr_type/string.rs → ...uild/src/attrs/coerce/attr_type/string.rs b/...uild/src/attrs/coerce/attr_type/string.rs → ...uild/src/attrs/coerce/attr_type/string.rs
diff --git a/...build/src/attrs/coerce/attr_type/tuple.rs → ...build/src/attrs/coerce/attr_type/tuple.rs b/...build/src/attrs/coerce/attr_type/tuple.rs → ...build/src/attrs/coerce/attr_type/tuple.rs
diff --git a/...or_build/src/attrs/coerce/coerced_attr.rs → ...or_build/src/attrs/coerce/coerced_attr.rs b/...or_build/src/attrs/coerce/coerced_attr.rs → ...or_build/src/attrs/coerce/coerced_attr.rs
diff --git a/...rpreter_for_build/src/attrs/coerce/ctx.rs → ...rpreter_for_build/src/attrs/coerce/ctx.rs b/...rpreter_for_build/src/attrs/coerce/ctx.rs → ...rpreter_for_build/src/attrs/coerce/ctx.rs
diff --git a/...reter_for_build/src/attrs/coerce/error.rs → ...reter_for_build/src/attrs/coerce/error.rs b/...reter_for_build/src/attrs/coerce/error.rs → ...reter_for_build/src/attrs/coerce/error.rs
diff --git a/...rpreter_for_build/src/attrs/coerce/mod.rs → ...rpreter_for_build/src/attrs/coerce/mod.rs b/...rpreter_for_build/src/attrs/coerce/mod.rs → ...rpreter_for_build/src/attrs/coerce/mod.rs
diff --git a/...ter_for_build/src/attrs/coerce/testing.rs → ...ter_for_build/src/attrs/coerce/testing.rs b/...ter_for_build/src/attrs/coerce/testing.rs → ...ter_for_build/src/attrs/coerce/testing.rs
diff --git a/buck2_interpreter_for_build/src/attrs/mod.rs → ...k2_interpreter_for_build/src/attrs/mod.rs b/buck2_interpreter_for_build/src/attrs/mod.rs → ...k2_interpreter_for_build/src/attrs/mod.rs
diff --git a/..._for_build/src/interpreter/calculation.rs → ..._for_build/src/interpreter/calculation.rs b/..._for_build/src/interpreter/calculation.rs → ..._for_build/src/interpreter/calculation.rs
diff --git a/...r_for_build/src/interpreter/configuror.rs → ...r_for_build/src/interpreter/configuror.rs b/...r_for_build/src/interpreter/configuror.rs → ...r_for_build/src/interpreter/configuror.rs
diff --git a/...erpreter_for_build/src/interpreter/mod.rs → ...erpreter_for_build/src/interpreter/mod.rs b/...erpreter_for_build/src/interpreter/mod.rs → ...erpreter_for_build/src/interpreter/mod.rs
diff --git a/...build/src/interpreter/module_internals.rs → ...build/src/interpreter/module_internals.rs b/...build/src/interpreter/module_internals.rs → ...build/src/interpreter/module_internals.rs
diff --git a/...eter_for_build/src/interpreter/natives.rs → ...eter_for_build/src/interpreter/natives.rs b/...eter_for_build/src/interpreter/natives.rs → ...eter_for_build/src/interpreter/natives.rs
diff --git a/buck2_interpreter_for_build/src/lib.rs → app/buck2_interpreter_for_build/src/lib.rs b/buck2_interpreter_for_build/src/lib.rs → app/buck2_interpreter_for_build/src/lib.rs
diff --git a/...erpreter_for_build/src/nodes/attr_spec.rs → ...erpreter_for_build/src/nodes/attr_spec.rs b/...erpreter_for_build/src/nodes/attr_spec.rs → ...erpreter_for_build/src/nodes/attr_spec.rs
diff --git a/buck2_interpreter_for_build/src/nodes/mod.rs → ...k2_interpreter_for_build/src/nodes/mod.rs b/buck2_interpreter_for_build/src/nodes/mod.rs → ...k2_interpreter_for_build/src/nodes/mod.rs
diff --git a/...reter_for_build/src/nodes/unconfigured.rs → ...reter_for_build/src/nodes/unconfigured.rs b/...reter_for_build/src/nodes/unconfigured.rs → ...reter_for_build/src/nodes/unconfigured.rs
diff --git a/...preter_for_build/src/provider/callable.rs → ...preter_for_build/src/provider/callable.rs b/...preter_for_build/src/provider/callable.rs → ...preter_for_build/src/provider/callable.rs
diff --git a/...interpreter_for_build/src/provider/mod.rs → ...interpreter_for_build/src/provider/mod.rs b/...interpreter_for_build/src/provider/mod.rs → ...interpreter_for_build/src/provider/mod.rs
diff --git a/...2_interpreter_for_build/src/transition.rs → ...2_interpreter_for_build/src/transition.rs b/...2_interpreter_for_build/src/transition.rs → ...2_interpreter_for_build/src/transition.rs
diff --git a/app/buck2_test/Cargo.toml b/app/buck2_test/Cargo.toml
@@ -30,7 +30,7 @@ buck2_core = { path = "../../buck2_core" }
 buck2_data = { path = "../../buck2_data" }
 buck2_execute_impl = { path = "../../buck2_execute_impl" }
 buck2_interpreter = { path = "../../buck2_interpreter" }
-buck2_interpreter_for_build = { path = "../../buck2_interpreter_for_build" }
+buck2_interpreter_for_build = { path = "../buck2_interpreter_for_build" }
 buck2_node = { path = "../../buck2_node" }
 buck2_server_ctx = { path = "../../buck2_server_ctx" }
 cli_proto = { path = "../../cli_proto" }

diff --git a/app/buck2_test/TARGETS b/app/buck2_test/TARGETS
@@ -21,6 +21,7 @@ rust_library(
         "fbsource//third-party/rust:tracing",
         "fbsource//third-party/rust:uuid",
         "//buck2/app/buck2_grpc:buck2_grpc",
+        "//buck2/app/buck2_interpreter_for_build:buck2_interpreter_for_build",
         "//buck2/app/buck2_test_api:buck2_test_api",
         "//buck2/buck2_build_api:buck2_build_api",
         "//buck2/buck2_common:buck2_common",
@@ -30,7 +31,6 @@ rust_library(
         "//buck2/buck2_execute:buck2_execute",
         "//buck2/buck2_execute_impl:buck2_execute_impl",
         "//buck2/buck2_interpreter:buck2_interpreter",
-        "//buck2/buck2_interpreter_for_build:buck2_interpreter_for_build",
         "//buck2/buck2_node:buck2_node",
         "//buck2/buck2_server_ctx:buck2_server_ctx",
         "//buck2/cli_proto:cli_proto",

diff --git a/buck2_audit/Cargo.toml b/buck2_audit/Cargo.toml
@@ -32,7 +32,7 @@ buck2_data = { path = "../buck2_data" }
 buck2_events = { path = "../buck2_events" }
 buck2_execute = { path = "../buck2_execute" }
 buck2_interpreter = { path = "../buck2_interpreter" }
-buck2_interpreter_for_build = { path = "../buck2_interpreter_for_build" }
+buck2_interpreter_for_build = { path = "../app/buck2_interpreter_for_build" }
 buck2_node = { path = "../buck2_node" }
 buck2_query = { path = "../buck2_query" }
 buck2_server_ctx = { path = "../buck2_server_ctx" }

diff --git a/buck2_audit/TARGETS b/buck2_audit/TARGETS
@@ -20,6 +20,7 @@ rust_library(
         "fbsource//third-party/rust:serde",
         "fbsource//third-party/rust:serde_json",
         "fbsource//third-party/rust:thiserror",
+        "//buck2/app/buck2_interpreter_for_build:buck2_interpreter_for_build",
         "//buck2/buck2_build_api:buck2_build_api",
         "//buck2/buck2_client:buck2_client",
         "//buck2/buck2_common:buck2_common",
@@ -28,7 +29,6 @@ rust_library(
         "//buck2/buck2_events:buck2_events",
         "//buck2/buck2_execute:buck2_execute",
         "//buck2/buck2_interpreter:buck2_interpreter",
-        "//buck2/buck2_interpreter_for_build:buck2_interpreter_for_build",
         "//buck2/buck2_node:buck2_node",
         "//buck2/buck2_query:buck2_query",
         "//buck2/buck2_server_ctx:buck2_server_ctx",

diff --git a/buck2_build_api/Cargo.toml b/buck2_build_api/Cargo.toml
@@ -66,7 +66,7 @@ buck2_data = { path = "../buck2_data" }
 buck2_events = { path = "../buck2_events" }
 buck2_execute = { path = "../buck2_execute" }
 buck2_interpreter = { path = "../buck2_interpreter" }
-buck2_interpreter_for_build = { path = "../buck2_interpreter_for_build" }
+buck2_interpreter_for_build = { path = "../app/buck2_interpreter_for_build" }
 buck2_node = { path = "../buck2_node" }
 buck2_query = { path = "../buck2_query" }
 buck2_query_parser = { path = "../app/buck2_query_parser" }

diff --git a/buck2_build_api/TARGETS b/buck2_build_api/TARGETS
@@ -48,6 +48,7 @@ rust_library(
         "fbsource//third-party/rust:tokio",
         "fbsource//third-party/rust:tokio-stream",
         "fbsource//third-party/rust:tracing",
+        "//buck2/app/buck2_interpreter_for_build:buck2_interpreter_for_build",
         "//buck2/app/buck2_query_parser:buck2_query_parser",
         "//buck2/app/buck2_test_api:buck2_test_api",
         "//buck2/buck2_build_api_derive:buck2_build_api_derive",
@@ -57,7 +58,6 @@ rust_library(
         "//buck2/buck2_events:buck2_events",
         "//buck2/buck2_execute:buck2_execute",
         "//buck2/buck2_interpreter:buck2_interpreter",
-        "//buck2/buck2_interpreter_for_build:buck2_interpreter_for_build",
         "//buck2/buck2_node:buck2_node",
         "//buck2/buck2_query:buck2_query",
         "//buck2/cli_proto:cli_proto",

diff --git a/buck2_bxl/Cargo.toml b/buck2_bxl/Cargo.toml
@@ -35,7 +35,7 @@ buck2_core = { path = "../buck2_core" }
 buck2_data = { path = "../buck2_data" }
 buck2_execute = { path = "../buck2_execute" }
 buck2_interpreter = { path = "../buck2_interpreter" }
-buck2_interpreter_for_build = { path = "../buck2_interpreter_for_build" }
+buck2_interpreter_for_build = { path = "../app/buck2_interpreter_for_build" }
 buck2_node = { path = "../buck2_node" }
 buck2_query = { path = "../buck2_query" }
 buck2_query_parser = { path = "../app/buck2_query_parser" }

diff --git a/buck2_bxl/TARGETS b/buck2_bxl/TARGETS
@@ -23,6 +23,7 @@ rust_library(
         "fbsource//third-party/rust:serde_json",
         "fbsource//third-party/rust:thiserror",
         "fbsource//third-party/rust:tokio",
+        "//buck2/app/buck2_interpreter_for_build:buck2_interpreter_for_build",
         "//buck2/app/buck2_query_parser:buck2_query_parser",
         "//buck2/buck2_build_api:buck2_build_api",
         "//buck2/buck2_common:buck2_common",
@@ -31,7 +32,6 @@ rust_library(
         "//buck2/buck2_events:buck2_events",
         "//buck2/buck2_execute:buck2_execute",
         "//buck2/buck2_interpreter:buck2_interpreter",
-        "//buck2/buck2_interpreter_for_build:buck2_interpreter_for_build",
         "//buck2/buck2_node:buck2_node",
         "//buck2/buck2_query:buck2_query",
         "//buck2/buck2_server_ctx:buck2_server_ctx",

diff --git a/buck2_server/Cargo.toml b/buck2_server/Cargo.toml
@@ -45,7 +45,7 @@ buck2_execute = { path = "../buck2_execute" }
 buck2_execute_impl = { path = "../buck2_execute_impl" }
 buck2_forkserver = { path = "../app/buck2_forkserver" }
 buck2_interpreter = { path = "../buck2_interpreter" }
-buck2_interpreter_for_build = { path = "../buck2_interpreter_for_build" }
+buck2_interpreter_for_build = { path = "../app/buck2_interpreter_for_build" }
 buck2_server_ctx = { path = "../buck2_server_ctx" }
 cli_proto = { path = "../cli_proto" }
 buck2_events = { path = "../buck2_events" }

diff --git a/buck2_server/TARGETS b/buck2_server/TARGETS
@@ -35,6 +35,7 @@ rust_library(
         "fbsource//third-party/rust:tonic",
         "fbsource//third-party/rust:tracing",
         "//buck2/app/buck2_forkserver:buck2_forkserver",
+        "//buck2/app/buck2_interpreter_for_build:buck2_interpreter_for_build",
         "//buck2/buck2_build_api:buck2_build_api",
         "//buck2/buck2_common:buck2_common",
         "//buck2/buck2_core:buck2_core",
@@ -43,7 +44,6 @@ rust_library(
         "//buck2/buck2_execute:buck2_execute",
         "//buck2/buck2_execute_impl:buck2_execute_impl",
         "//buck2/buck2_interpreter:buck2_interpreter",
-        "//buck2/buck2_interpreter_for_build:buck2_interpreter_for_build",
         "//buck2/buck2_server_ctx:buck2_server_ctx",
         "//buck2/cli_proto:cli_proto",
         "//buck2/dice/dice:dice",

diff --git a/buck2_server_commands/Cargo.toml b/buck2_server_commands/Cargo.toml
@@ -38,7 +38,7 @@ buck2_core = { path = "../buck2_core" }
 buck2_data = { path = "../buck2_data" }
 buck2_events = { path = "../buck2_events" }
 buck2_execute = { path = "../buck2_execute" }
-buck2_interpreter_for_build = { path = "../buck2_interpreter_for_build" }
+buck2_interpreter_for_build = { path = "../app/buck2_interpreter_for_build" }
 buck2_node = { path = "../buck2_node" }
 buck2_query = { path = "../buck2_query" }
 buck2_server_ctx = { path = "../buck2_server_ctx" }

diff --git a/buck2_server_commands/TARGETS b/buck2_server_commands/TARGETS
@@ -30,13 +30,13 @@ rust_library(
         "fbsource//third-party/rust:tonic",
         "fbsource//third-party/rust:tracing",
         "fbsource//third-party/rust:tracing-subscriber",
+        "//buck2/app/buck2_interpreter_for_build:buck2_interpreter_for_build",
         "//buck2/buck2_build_api:buck2_build_api",
         "//buck2/buck2_common:buck2_common",
         "//buck2/buck2_core:buck2_core",
         "//buck2/buck2_data:buck2_data",
         "//buck2/buck2_events:buck2_events",
         "//buck2/buck2_execute:buck2_execute",
-        "//buck2/buck2_interpreter_for_build:buck2_interpreter_for_build",
         "//buck2/buck2_node:buck2_node",
         "//buck2/buck2_query:buck2_query",
         "//buck2/buck2_server_ctx:buck2_server_ctx",