fluencelabs/wasmer
1
0
Fork 0
mirror of https://github.com/fluencelabs/wasmer synced 2025-06-23 13:41:32 +00:00
Code Issues Projects Releases Wiki Activity

More review fixes

Browse Source
This commit is contained in:
Lachlan Sneff
2019-01-29 13:04:42 -08:00
parent 767fdbd950
commit 581363119b
15 changed files with 76 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
lib/runtime-core/src/backing.rs
View File

@ -434,15 +434,15 @@ fn import_memories(
.and_then(|namespace| namespace.get_export(&name));
match memory_import {
Some(Export::Memory(mut memory)) => {
if expected_memory_desc.fits_in_imported(memory.description()) {
if expected_memory_desc.fits_in_imported(memory.descriptor()) {
memories.push(memory.clone());
vm_memories.push(memory.vm_local_memory());
} else {
link_errors.push(LinkError::IncorrectMemoryDescription {
link_errors.push(LinkError::IncorrectMemoryDescriptor {
namespace: namespace.clone(),
name: name.clone(),
expected: *expected_memory_desc,
found: memory.description(),
found: memory.descriptor(),
});
}
}
@ -493,15 +493,15 @@ fn import_tables(
.and_then(|namespace| namespace.get_export(&name));
match table_import {
Some(Export::Table(mut table)) => {
if expected_table_desc.fits_in_imported(table.description()) {
if expected_table_desc.fits_in_imported(table.descriptor()) {
vm_tables.push(table.vm_local_table());
tables.push(table);
} else {
link_errors.push(LinkError::IncorrectTableDescription {
link_errors.push(LinkError::IncorrectTableDescriptor {
namespace: namespace.clone(),
name: name.clone(),
expected: *expected_table_desc,
found: table.description(),
found: table.descriptor(),
});
}
}
@ -552,15 +552,15 @@ fn import_globals(
.and_then(|namespace| namespace.get_export(name));
match import {
Some(Export::Global(mut global)) => {
if global.description() == *imported_global_desc {
if global.descriptor() == *imported_global_desc {
vm_globals.push(global.vm_local_global());
globals.push(global);
} else {
link_errors.push(LinkError::IncorrectGlobalDescription {
link_errors.push(LinkError::IncorrectGlobalDescriptor {
namespace: namespace.clone(),
name: name.clone(),
expected: *imported_global_desc,
found: global.description(),
found: global.descriptor(),
});
}
}