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

rename PassiveElemIndex to ElemIndex and same for PassiveDataIndex (#1188)

Browse Source 
* rename PassiveElemIndex to ElemIndex and same for PassiveDataIndex (#1411)

* rename PassiveDataIndex to DataIndex

* rename PassiveElemIndex to ElemIndex

* Apply renamings to wasmtime as well

* Run rustfmt

Co-authored-by: csmoe <csmoe@msn.com>
This commit is contained in:
Alex Crichton
2020-03-02 08:55:25 -06:00
committed by GitHub
parent 2c5be49af0
commit 8597930eed
10 changed files with 37 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
cranelift/wasm/src/environ/dummy.rs
View File

@@ -11,8 +11,8 @@ use crate::environ::{
use crate::func_translator::FuncTranslator;
use crate::state::ModuleTranslationState;
use crate::translation_utils::{
DefinedFuncIndex, FuncIndex, Global, GlobalIndex, Memory, MemoryIndex, PassiveDataIndex,
PassiveElemIndex, SignatureIndex, Table, TableIndex,
DataIndex, DefinedFuncIndex, ElemIndex, FuncIndex, Global, GlobalIndex, Memory, MemoryIndex,
SignatureIndex, Table, TableIndex,
};
use core::convert::TryFrom;
use cranelift_codegen::cursor::FuncCursor;
@@ -607,7 +607,7 @@ impl<'data> ModuleEnvironment<'data> for DummyEnvironment {
fn declare_passive_element(
&mut self,
_elem_index: PassiveElemIndex,
_elem_index: ElemIndex,
_segments: Box<[FuncIndex]>,
) -> WasmResult<()> {
Ok(())
@@ -615,7 +615,7 @@ impl<'data> ModuleEnvironment<'data> for DummyEnvironment {
fn declare_passive_data(
&mut self,
_elem_index: PassiveDataIndex,
_elem_index: DataIndex,
_segments: &'data [u8],
) -> WasmResult<()> {
Ok(())

12
cranelift/wasm/src/environ/spec.rs
View File

@@ -8,8 +8,8 @@
use crate::state::{FuncTranslationState, ModuleTranslationState};
use crate::translation_utils::{
FuncIndex, Global, GlobalIndex, Memory, MemoryIndex, PassiveDataIndex, PassiveElemIndex,
SignatureIndex, Table, TableIndex,
DataIndex, ElemIndex, FuncIndex, Global, GlobalIndex, Memory, MemoryIndex, SignatureIndex,
Table, TableIndex,
};
use core::convert::From;
use cranelift_codegen::cursor::FuncCursor;
@@ -606,7 +606,7 @@ pub trait ModuleEnvironment<'data>: TargetEnvironment {
/// Declare a passive element segment.
fn declare_passive_element(
&mut self,
index: PassiveElemIndex,
index: ElemIndex,
elements: Box<[FuncIndex]>,
) -> WasmResult<()>;
@@ -620,11 +620,7 @@ pub trait ModuleEnvironment<'data>: TargetEnvironment {
}
/// Declare a passive data segment.
fn declare_passive_data(
&mut self,
data_index: PassiveDataIndex,
data: &'data [u8],
) -> WasmResult<()>;
fn declare_passive_data(&mut self, data_index: DataIndex, data: &'data [u8]) -> WasmResult<()>;
/// Provides the contents of a function body.
///