Skip to content

Commit 5d3f564

Browse files
authored
Merge pull request #50 from wasmx/stricter-imports
Be more strict on importing crates
2 parents 650b33b + 5dd3782 commit 5d3f564

File tree

6 files changed

+6
-11
lines changed

6 files changed

+6
-11
lines changed

libchisel/src/deployer.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1+
use super::ModuleCreator;
12
use parity_wasm::builder;
2-
3-
use super::*;
3+
use parity_wasm::elements::{CustomSection, Module};
44

55
use byteorder::{LittleEndian, WriteBytesExt};
66
use rustc_hex::FromHex;

libchisel/src/lib.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@ extern crate byteorder;
22
extern crate parity_wasm;
33
extern crate rustc_hex;
44

5+
use parity_wasm::elements::Module;
6+
57
pub mod checkstartfunc;
68
pub mod deployer;
79
pub mod remapimports;
810
pub mod trimexports;
911
pub mod verifyexports;
1012
pub mod verifyimports;
1113

12-
use parity_wasm::elements::*;
13-
1414
pub trait ModuleCreator {
1515
/// Returns new module.
1616
fn create(&self) -> Result<Module, String>;

libchisel/src/remapimports.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
use std::collections::HashMap;
22

3+
use super::ModuleTranslator;
34
use parity_wasm::elements::*;
45

5-
use super::*;
6-
76
#[derive(Hash, Eq, PartialEq, Debug, Clone)]
87
pub struct ImportPair {
98
pub module: String,

libchisel/src/trimexports.rs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
1-
use super::*;
2-
3-
use parity_wasm::builder::*;
1+
use super::ModuleTranslator;
42
use parity_wasm::elements::*;
53

64
/// Struct containing a list of valid exports.

libchisel/src/verifyexports.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
use super::ModuleValidator;
2-
32
use parity_wasm::elements::{
43
ExportSection, External, FunctionSection, FunctionType, ImportSection, Internal, Module, Type,
54
};

libchisel/src/verifyimports.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
use super::ModuleValidator;
2-
32
use parity_wasm::elements::{External, FunctionType, ImportSection, Module, Type, ValueType};
43

54
/// Enum representing a type of import and any extra data to check.

0 commit comments

Comments
 (0)