1705693 - Broken Rust-y gtests for qcms

Status: RESOLVED FIXED

(Core :: Graphics: Color Management, defect, P1)

Description

[Jan-Erik Rediger [:janerik]]

When running mach rusttests on my M1 macbook I get an error:

 0:54.78 error[E0308]: mismatched types
 0:54.78    --> gfx/qcms/src/gtest.rs:667:54
 0:54.78     |
 0:54.78 667 |                     assert!(self.ProduceVerifyOutput(qcms_transform_data_rgb_out_lut_neon))
 0:54.78     |                                                      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 0:54.78     |                                                      |
 0:54.78     |                                                      expected enum `Option`, found fn item
 0:54.78     |                                                      help: try using a variant of the expected enum: `Some(qcms_transform_data_rgb_out_lut_neon)`
 0:54.78     |
 0:54.78     = note: expected enum `Option<for<'r> unsafe fn(&'r transform::qcms_transform, *const u8, *mut u8, usize)>`
 0:54.78             found fn item `for<'r> unsafe fn(&'r transform::qcms_transform, *const u8, *mut u8, usize) {qcms_transform_data_rgb_out_lut_neon}`

ProduceVerifyOutput takes an Option<...>. I don't think this code ever worked, not sure how it didn't trigger earlier (might also be that my build setup is otherwise busted, but regardless the code can not work).

I'll post a patch that fixes this.

Comment 1

[Jan-Erik Rediger [:janerik]]

Attachment: Bug 1705693 - Pass verifier callback as an option. r?aosmond!

ProduceVerifyOutput takes an transform_fn_t, which is a type
definition for Option<unsafe fn(...)>.
So we need to pass Some. This code can never have worked correctly.

Comment 2

[Pulsebot]

Pushed by [e-mail]:
https://hg.mozilla.org/integration/autoland/rev/fcc0e685e684
Pass verifier callback as an option. r=aosmond

Comment 3

[Alexandru Michis [:malexandru]]

https://hg.mozilla.org/mozilla-central/rev/fcc0e685e684