T0b1/wasmtime
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix CI for Rust 1.61.0 (#4164)

Browse Source 
A new version of rustc was released this morning and we have a few small
breakages on our CI which need fixing:

* A new warning was coming out of the c-api crate about an unneeded
  `unsafe` block.
* The panic message of a task in `cranelift-object` needed updating
  since the standard library changed how it formats strings with the nul
  byte.
This commit is contained in:
Alex Crichton
2022-05-19 10:44:45 -05:00
committed by GitHub
parent 411f3d60f3
commit 0a0c232a14
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cranelift/object/tests/basic.rs
View File

@@ -200,7 +200,7 @@ fn libcall_function() {
#[test] #[test]
#[should_panic( #[should_panic(
expected = "Result::unwrap()` on an `Err` value: Backend(Symbol \"function\\u{0}with\\u{0}nul\\u{0}bytes\" has a null byte, which is disallowed" expected = "Result::unwrap()` on an `Err` value: Backend(Symbol \"function\\0with\\0nul\\0bytes\" has a null byte, which is disallowed"
)] )]
fn reject_nul_byte_symbol_for_func() { fn reject_nul_byte_symbol_for_func() {
let flag_builder = settings::builder(); let flag_builder = settings::builder();
@@ -224,7 +224,7 @@ fn reject_nul_byte_symbol_for_func() {
#[test] #[test]
#[should_panic( #[should_panic(
expected = "Result::unwrap()` on an `Err` value: Backend(Symbol \"data\\u{0}with\\u{0}nul\\u{0}bytes\" has a null byte, which is disallowed" expected = "Result::unwrap()` on an `Err` value: Backend(Symbol \"data\\0with\\0nul\\0bytes\" has a null byte, which is disallowed"
)] )]
fn reject_nul_byte_symbol_for_data() { fn reject_nul_byte_symbol_for_data() {
let flag_builder = settings::builder(); let flag_builder = settings::builder();

2
crates/c-api/src/func.rs
View File

@@ -265,7 +265,7 @@ pub(crate) unsafe fn c_callback_to_rust_fn(
// Translate the `wasmtime_val_t` results into the `results` space // Translate the `wasmtime_val_t` results into the `results` space
for (i, result) in out_results.iter().enumerate() { for (i, result) in out_results.iter().enumerate() {
results[i] = unsafe { result.to_val() }; results[i] = result.to_val();
} }
// Move our `vals` storage back into the store now that we no longer // Move our `vals` storage back into the store now that we no longer