From e4dcf553a2786560f12676696a8fb8e2966f91d6 Mon Sep 17 00:00:00 2001 From: Sergey Pepyakin Date: Tue, 16 Apr 2019 14:39:34 +0200 Subject: [PATCH] Rename. --- src/prepare/mod.rs | 4 ++-- validation/src/lib.rs | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/prepare/mod.rs b/src/prepare/mod.rs index 1873a79..874eeb8 100644 --- a/src/prepare/mod.rs +++ b/src/prepare/mod.rs @@ -3,7 +3,7 @@ use alloc::prelude::v1::*; use crate::{ isa, - validation::{validate_module, Error, Validation}, + validation::{validate_module, Error, Validator}, }; use parity_wasm::elements::Module; @@ -24,7 +24,7 @@ pub struct WasmiValidation { // This implementation of `Validation` is compiling wasm code at the // validation time. -impl Validation for WasmiValidation { +impl Validator for WasmiValidation { type Output = Vec; type FuncValidator = compile::Compiler; fn new(_module: &Module) -> Self { diff --git a/validation/src/lib.rs b/validation/src/lib.rs index a62ea98..d8bf94b 100644 --- a/validation/src/lib.rs +++ b/validation/src/lib.rs @@ -69,14 +69,14 @@ impl From for Error { } } -pub trait Validation { +pub trait Validator { type Output; type FuncValidator: FuncValidator; fn new(module: &Module) -> Self; fn on_function_validated( &mut self, index: u32, - output: <::FuncValidator as FuncValidator>::Output, + output: <::FuncValidator as FuncValidator>::Output, ); fn finish(self) -> Self::Output; } @@ -95,7 +95,7 @@ pub trait FuncValidator { /// A module validator that just validates modules and produces no result. pub struct PlainValidator; -impl Validation for PlainValidator { +impl Validator for PlainValidator { type Output = (); type FuncValidator = PlainFuncValidator; fn new(_module: &Module) -> PlainValidator { @@ -104,7 +104,7 @@ impl Validation for PlainValidator { fn on_function_validated( &mut self, _index: u32, - _output: <::FuncValidator as FuncValidator>::Output, + _output: <::FuncValidator as FuncValidator>::Output, ) -> () { () } @@ -136,7 +136,7 @@ impl FuncValidator for PlainFuncValidator { } } -pub fn validate_module(module: &Module) -> Result { +pub fn validate_module(module: &Module) -> Result { let mut context_builder = ModuleContextBuilder::new(); let mut imported_globals = Vec::new(); let mut validation = V::new(&module);