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

Fix warning about deprecated std::array::IntoIter

Browse Source
This commit is contained in:
Nick Fitzgerald
2022-01-06 10:46:09 -08:00
parent 23efaf2196
commit 6e0f732993
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
crates/wasmtime/src/func.rs
View File

@@ -1459,7 +1459,7 @@ macro_rules! impl_wasm_host_results {
fn func_type(params: impl Iterator<Item = ValType>) -> FuncType { fn func_type(params: impl Iterator<Item = ValType>) -> FuncType {
FuncType::new( FuncType::new(
params, params,
std::array::IntoIter::new([$($t::valtype(),)*]), IntoIterator::into_iter([$($t::valtype(),)*]),
) )
} }

16
tests/all/limits.rs
View File

@@ -28,7 +28,7 @@ fn test_limits() -> Result<()> {
let instance = Instance::new(&mut store, &module, &[])?; let instance = Instance::new(&mut store, &module, &[])?;
// Test instance exports and host objects hitting the limit // Test instance exports and host objects hitting the limit
for memory in std::array::IntoIter::new([ for memory in IntoIterator::into_iter([
instance.get_memory(&mut store, "m").unwrap(), instance.get_memory(&mut store, "m").unwrap(),
Memory::new(&mut store, MemoryType::new(0, None))?, Memory::new(&mut store, MemoryType::new(0, None))?,
]) { ]) {
@@ -46,7 +46,7 @@ fn test_limits() -> Result<()> {
} }
// Test instance exports and host objects hitting the limit // Test instance exports and host objects hitting the limit
for table in std::array::IntoIter::new([ for table in IntoIterator::into_iter([
instance.get_table(&mut store, "t").unwrap(), instance.get_table(&mut store, "t").unwrap(),
Table::new( Table::new(
&mut store, &mut store,
@@ -137,7 +137,7 @@ async fn test_limits_async() -> Result<()> {
let instance = Instance::new_async(&mut store, &module, &[]).await?; let instance = Instance::new_async(&mut store, &module, &[]).await?;
// Test instance exports and host objects hitting the limit // Test instance exports and host objects hitting the limit
for memory in std::array::IntoIter::new([ for memory in IntoIterator::into_iter([
instance.get_memory(&mut store, "m").unwrap(), instance.get_memory(&mut store, "m").unwrap(),
Memory::new_async(&mut store, MemoryType::new(0, None)).await?, Memory::new_async(&mut store, MemoryType::new(0, None)).await?,
]) { ]) {
@@ -156,7 +156,7 @@ async fn test_limits_async() -> Result<()> {
} }
// Test instance exports and host objects hitting the limit // Test instance exports and host objects hitting the limit
for table in std::array::IntoIter::new([ for table in IntoIterator::into_iter([
instance.get_table(&mut store, "t").unwrap(), instance.get_table(&mut store, "t").unwrap(),
Table::new_async( Table::new_async(
&mut store, &mut store,
@@ -201,7 +201,7 @@ fn test_limits_memory_only() -> Result<()> {
let instance = Instance::new(&mut store, &module, &[])?; let instance = Instance::new(&mut store, &module, &[])?;
// Test instance exports and host objects hitting the limit // Test instance exports and host objects hitting the limit
for memory in std::array::IntoIter::new([ for memory in IntoIterator::into_iter([
instance.get_memory(&mut store, "m").unwrap(), instance.get_memory(&mut store, "m").unwrap(),
Memory::new(&mut store, MemoryType::new(0, None))?, Memory::new(&mut store, MemoryType::new(0, None))?,
]) { ]) {
@@ -219,7 +219,7 @@ fn test_limits_memory_only() -> Result<()> {
} }
// Test instance exports and host objects *not* hitting the limit // Test instance exports and host objects *not* hitting the limit
for table in std::array::IntoIter::new([ for table in IntoIterator::into_iter([
instance.get_table(&mut store, "t").unwrap(), instance.get_table(&mut store, "t").unwrap(),
Table::new( Table::new(
&mut store, &mut store,
@@ -282,7 +282,7 @@ fn test_limits_table_only() -> Result<()> {
let instance = Instance::new(&mut store, &module, &[])?; let instance = Instance::new(&mut store, &module, &[])?;
// Test instance exports and host objects *not* hitting the limit // Test instance exports and host objects *not* hitting the limit
for memory in std::array::IntoIter::new([ for memory in IntoIterator::into_iter([
instance.get_memory(&mut store, "m").unwrap(), instance.get_memory(&mut store, "m").unwrap(),
Memory::new(&mut store, MemoryType::new(0, None))?, Memory::new(&mut store, MemoryType::new(0, None))?,
]) { ]) {
@@ -293,7 +293,7 @@ fn test_limits_table_only() -> Result<()> {
} }
// Test instance exports and host objects hitting the limit // Test instance exports and host objects hitting the limit
for table in std::array::IntoIter::new([ for table in IntoIterator::into_iter([
instance.get_table(&mut store, "t").unwrap(), instance.get_table(&mut store, "t").unwrap(),
Table::new( Table::new(
&mut store, &mut store,