Fix a conflict from merging two commits. One commit added methods to a trait, and the other added an implementation of said trait. They didn't result in merge conflicts, but do result in compile errors. Bug: 528225104 Change-Id: I651d5d7ed3ea0b92e484e024649453d86a6a6964 Reviewed-on: https://gn-review.googlesource.com/c/gn/+/24841 Reviewed-by: Takuto Ikuta <tikuta@google.com> Commit-Queue: Matt Stark <msta@google.com>
diff --git a/src/gn/starlark/crates/ffi/src/target_ref.rs b/src/gn/starlark/crates/ffi/src/target_ref.rs index 08a4db0..7626a88 100644 --- a/src/gn/starlark/crates/ffi/src/target_ref.rs +++ b/src/gn/starlark/crates/ffi/src/target_ref.rs
@@ -39,6 +39,8 @@ } impl types::TargetRef for TargetRef { + type Rule = rule::FrozenRule<crate::eval_context::EvalContext>; + fn label(&self) -> LabelRef<'_> { todo!() } @@ -47,6 +49,10 @@ todo!() } + fn rule(&self) -> Option<&'static Self::Rule> { + todo!() + } + fn outputs(&self) -> Vec<types::File> { todo!() } @@ -62,4 +68,12 @@ ) { todo!() } + + fn output_type(&self) -> Option<types::OutputType> { + todo!() + } + + fn builtin_attrs<'v>(&self, _heap: &Heap<'v>) -> Vec<Value<'v>> { + todo!() + } }