Skip to content

fix: ExternalRunnerTestInfo.type matches constructor #1318

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
lf- wants to merge 1 commit into
base: main
Choose a base branch
from
+6 −6
Open

fix: ExternalRunnerTestInfo.type matches constructor #1318

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions app/buck2_build_api/src/interpreter/rule_defs/provider/builtin/external_runner_test_info.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ use crate::interpreter::rule_defs::resolved_macro::ResolvedStringWithMacros;
#[repr(C)]
pub struct ExternalRunnerTestInfoGen<V: ValueLifetimeless> {
/// A Starlark value representing the type of this test.
test_type: ValueOfUncheckedGeneric<V, String>,
r#type: ValueOfUncheckedGeneric<V, String>,

/// A Starlark value representing the command for this test. The external test runner is what
/// gives meaning to this command.
Expand Down Expand Up @@ -129,8 +129,8 @@ pub struct ExternalRunnerTestInfoGen<V: ValueLifetimeless> {

// NOTE: All the methods here unwrap because we validate at freeze time.
impl FrozenExternalRunnerTestInfo {
pub fn test_type(&self) -> &str {
self.test_type.to_value().get().unpack_str().unwrap()
pub fn r#type(&self) -> &str {
self.r#type.to_value().get().unpack_str().unwrap()
}

pub fn command<'v>(&self) -> impl Iterator<Item = TestCommandMember<'v>> {
Expand Down Expand Up @@ -558,7 +558,7 @@ where
{
parse_network_access(v)?;
}
info.test_type
info.r#type
.get()
.to_value()
.unpack_str()
Expand Down Expand Up @@ -588,7 +588,7 @@ fn external_runner_test_info_creator(globals: &mut GlobalsBuilder) {
#[starlark(default = NoneType)] network_access: Value<'v>,
) -> starlark::Result<ExternalRunnerTestInfo<'v>> {
let res = ExternalRunnerTestInfo {
test_type: ValueOfUnchecked::new(r#type),
r#type: ValueOfUnchecked::new(r#type),
command: ValueOfUnchecked::new(command),
env: ValueOfUnchecked::new(env),
labels: ValueOfUnchecked::new(labels),
Expand Down
2 changes: 1 addition & 1 deletion app/buck2_build_api/src/interpreter/rule_defs/provider/test_provider.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ impl TestProvider for FrozenExternalRunnerTestInfo {

let spec = ExternalRunnerSpec {
target,
test_type: self.test_type().to_owned(),
test_type: self.r#type().to_owned(),
command,
env,
labels: self.labels().map(|l| l.to_owned()).collect(),
Expand Down
Loading