mirror of
https://github.com/trezor/trezor-firmware.git
synced 2024-12-20 21:38:26 +00:00
fix(core/rust): convert Qstr type to representation that matches C code
This commit is contained in:
parent
ab3c62ae71
commit
6af7b4a4b7
@ -49,6 +49,8 @@ fn generate_qstr_bindings() {
|
|||||||
// Tell cargo to invalidate the built crate whenever the header changes.
|
// Tell cargo to invalidate the built crate whenever the header changes.
|
||||||
println!("cargo:rerun-if-changed=qstr.h");
|
println!("cargo:rerun-if-changed=qstr.h");
|
||||||
|
|
||||||
|
let dest_file = PathBuf::from(out_path).join("qstr.rs");
|
||||||
|
|
||||||
bindgen::Builder::default()
|
bindgen::Builder::default()
|
||||||
.header("qstr.h")
|
.header("qstr.h")
|
||||||
// Build the Qstr enum as a newtype so we can define method on it.
|
// Build the Qstr enum as a newtype so we can define method on it.
|
||||||
@ -71,8 +73,17 @@ fn generate_qstr_bindings() {
|
|||||||
.parse_callbacks(Box::new(bindgen::CargoCallbacks))
|
.parse_callbacks(Box::new(bindgen::CargoCallbacks))
|
||||||
.generate()
|
.generate()
|
||||||
.expect("Unable to generate Rust QSTR bindings")
|
.expect("Unable to generate Rust QSTR bindings")
|
||||||
.write_to_file(PathBuf::from(out_path).join("qstr.rs"))
|
.write_to_file(&dest_file)
|
||||||
.unwrap();
|
.unwrap();
|
||||||
|
|
||||||
|
// rewrite the file to change internal representation of the qstr newtype
|
||||||
|
let qstr_generated = std::fs::read_to_string(&dest_file).unwrap();
|
||||||
|
let qstr_modified = qstr_generated.replace(
|
||||||
|
"pub struct Qstr(pub cty::c_uint);",
|
||||||
|
"pub struct Qstr(pub usize);",
|
||||||
|
);
|
||||||
|
assert_ne!(qstr_generated, qstr_modified, "Failed to rewrite type of Qstr in qstr.rs file.\nThis indicates that the generated file has changed. Please update the rewriting code.");
|
||||||
|
std::fs::write(&dest_file, qstr_modified).unwrap();
|
||||||
}
|
}
|
||||||
|
|
||||||
fn prepare_bindings() -> bindgen::Builder {
|
fn prepare_bindings() -> bindgen::Builder {
|
||||||
|
Loading…
Reference in New Issue
Block a user