split fce_wit_interfaces

Cargo.lock

@@ -373,17 +373,15 @@ dependencies = [
  "wasmer-runtime",
  "wasmer-runtime-core",
  "wasmer-wasi",
+ "wit_parser",
 ]
 
 [[package]]
 name = "fce_wit_interfaces"
 version = "0.1.0"
 dependencies = [
- "anyhow",
  "multimap",
- "walrus",
  "wasmer-interface-types",
- "wasmer-runtime-core",
 ]
 
 [[package]]
@@ -516,6 +514,7 @@ name = "ipfs_node"
 version = "0.1.0"
 dependencies = [
  "fce",
+ "toml",
 ]
 
 [[package]]
@@ -936,6 +935,15 @@ dependencies = [
  "winapi",
 ]
 
+[[package]]
+name = "toml"
+version = "0.5.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ffc92d160b1eef40665be3a05630d003936a3bc7da7421277846c2613e92c71a"
+dependencies = [
+ "serde",
+]
+
 [[package]]
 name = "typenum"
 version = "1.12.0"
@@ -1229,5 +1237,16 @@ dependencies = [
  "clap",
  "exitfailure",
  "failure",
- "fce_wit_interfaces",
+ "wit_parser",
+]
+
+[[package]]
+name = "wit_parser"
+version = "0.1.0"
+dependencies = [
+ "anyhow",
+ "fce_wit_interfaces",
+ "walrus",
+ "wasmer-interface-types",
+ "wasmer-runtime-core",
 ]

Cargo.toml

@@ -1,6 +1,7 @@
 [workspace]
 members = [
     "crates/fce_wit_interfaces",
+    "crates/wit_parser",
     "examples/ipfs_node",
     "examples/ipfs_node/wasm/ipfs_node",
     "examples/ipfs_node/wasm/ipfs_rpc",

crates/fce_wit_interfaces/Cargo.toml

@@ -9,9 +9,5 @@ name = "fce_wit_interfaces"
 path = "src/lib.rs"
 
 [dependencies]
-walrus = "0.17.0"
-wasmer-core = { package = "wasmer-runtime-core", version = "0.17.0", features = ["dynamicfunc-fat-closures"] }
 wasmer-wit = { package = "wasmer-interface-types", git = "https://github.com/fluencelabs/interface-types", branch = "master"}
-
 multimap = "0.8.1"
-anyhow = "1.0.31"

crates/fce_wit_interfaces/src/interfaces/mod.rs

@@ -1,21 +0,0 @@
-/*
- * Copyright 2020 Fluence Labs Limited
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-mod errors;
-mod fce_wit_interfaces;
-
-pub use fce_wit_interfaces::*;
-pub use errors::*;

crates/fce_wit_interfaces/src/lib.rs

@@ -24,8 +24,8 @@
     unreachable_patterns
 )]
 
-mod interfaces;
+mod errors;
-mod wit_parser;
+mod fce_wit_interfaces;
 
-pub use crate::wit_parser::*;
+pub use errors::*;
-pub use crate::interfaces::*;
+pub use fce_wit_interfaces::*;

crates/wit_parser/Cargo.toml

@@ -0,0 +1,17 @@
+[package]
+name = "wit_parser"
+version = "0.1.0"
+authors = ["Fluence Labs"]
+edition = "2018"
+
+[lib]
+name = "wit_parser"
+path = "src/lib.rs"
+
+[dependencies]
+walrus = "0.17.0"
+wasmer-core = { package = "wasmer-runtime-core", version = "0.17.0"}
+wasmer-wit = { package = "wasmer-interface-types", git = "https://github.com/fluencelabs/interface-types", branch = "master" }
+fce_wit_interfaces = { path = "../fce_wit_interfaces" }
+
+anyhow = "1.0.31"

crates/wit_parser/src/extractor.rs

@@ -16,8 +16,8 @@
 
 use super::custom::WIT_SECTION_NAME;
 use super::errors::WITParserError;
-use crate::interfaces::FCEWITInterfaces;
 
+use fce_wit_interfaces::FCEWITInterfaces;
 use walrus::{IdsToIndices, ModuleConfig};
 use wasmer_wit::ast::Interfaces;
 use wasmer_core::Module as WasmerModule;

crates/wit_parser/src/lib.rs

@@ -13,12 +13,22 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+#![warn(rust_2018_idioms)]
+#![deny(
+    dead_code,
+    nonstandard_style,
+    unused_imports,
+    unused_mut,
+    unused_variables,
+    unused_unsafe,
+    unreachable_patterns
+)]
 
 mod custom;
+mod deleter;
+mod embedder;
 mod errors;
 mod extractor;
-mod embedder;
-mod deleter;
 
 pub use errors::WITParserError;
 

examples/ipfs_node/Cargo.toml

@@ -6,3 +6,4 @@ edition = "2018"
 
 [dependencies]
 fce = { path = "../../fce" }
+toml = "0.5.6"

examples/ipfs_node/Config.toml

@@ -0,0 +1,6 @@
+[ipfs_node]
+    [imports]
+    ipfs = "/usr/bin/ipfs"
+
+    [wasi]
+    preopened_dir = ["/tmp"]

fce/Cargo.toml

@@ -6,6 +6,7 @@ edition = "2018"
 
 [dependencies]
 fce_wit_interfaces = { path = "../crates/fce_wit_interfaces" }
+wit_parser = { path = "../crates/wit_parser" }
 
 wasmer-runtime = "0.17.0"
 # dynamicfunc-fat-closures allows using state inside DynamicFunc

fce/src/vm/errors.rs

@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-use fce_wit_interfaces::WITParserError;
 use fce_wit_interfaces::FCEWITInterfacesError;
+use wit_parser::WITParserError;
 
 use wasmer_wit::errors::InstructionError;
 use wasmer_runtime::error::{

fce/src/vm/instance/fce_module.rs

@@ -17,12 +17,12 @@
 use super::wit_prelude::*;
 use super::{IType, IValue, WValue};
 
-use fce_wit_interfaces::extract_fce_wit;
 use fce_wit_interfaces::FCEWITInterfaces;
 use wasmer_wit::interpreter::Interpreter;
 use wasmer_runtime::{compile, ImportObject};
 use wasmer_core::Instance as WasmerInstance;
 use wasmer_core::import::Namespace;
+use wit_parser::extract_fce_wit;
 
 use std::collections::HashMap;
 use std::convert::TryInto;

tools/wit_embedder/Cargo.toml

@@ -5,7 +5,7 @@ authors = ["Fluence Labs"]
 edition = "2018"
 
 [dependencies]
-fce_wit_interfaces = { path = "../../crates/fce_wit_interfaces" }
+wit_parser = { path = "../../crates/wit_parser" }
 clap = "2.33.1"
 exitfailure = "0.5.1"
 failure = "0.1.5"

tools/wit_embedder/src/main.rs

@@ -28,9 +28,9 @@ mod args;
 
 use args::*;
 
-use fce_wit_interfaces::embed_text_wit;
+use wit_parser::embed_text_wit;
-use fce_wit_interfaces::extract_text_wit;
+use wit_parser::extract_text_wit;
-use fce_wit_interfaces::delete_wit_section;
+use wit_parser::delete_wit_section;
 
 use clap::{App, AppSettings};
 use std::path::PathBuf;