From aa1da858ade2297cec3496bb03a1ff2ba27a1b06 Mon Sep 17 00:00:00 2001
From: vms <michail.vms@gmail.com>
Date: Fri, 21 May 2021 21:15:02 +0300
Subject: [PATCH] fix clippy warnings; update crate versions

---
 Cargo.lock                                      | 8 ++++----
 crates/it-parser/Cargo.toml                     | 2 +-
 crates/module-interface/src/it_interface/mod.rs | 2 +-
 tools/cli/Cargo.toml                            | 2 +-
 tools/cli/src/main.rs                           | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 04606502..d724aae3 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1465,7 +1465,7 @@ dependencies = [
  "clap",
  "exitfailure",
  "marine-it-generator 0.5.2",
- "marine-it-parser 0.6.1",
+ "marine-it-parser 0.6.2",
  "marine-module-info-parser 0.1.0",
  "semver 0.11.0",
  "serde",
@@ -1499,7 +1499,7 @@ version = "0.5.2"
 dependencies = [
  "cargo_toml",
  "it-lilo",
- "marine-it-parser 0.6.1",
+ "marine-it-parser 0.6.2",
  "marine-macro-impl",
  "once_cell",
  "serde",
@@ -1546,7 +1546,7 @@ dependencies = [
 
 [[package]]
 name = "marine-it-parser"
-version = "0.6.1"
+version = "0.6.2"
 dependencies = [
  "anyhow",
  "itertools 0.10.0",
@@ -1641,7 +1641,7 @@ dependencies = [
  "log",
  "marine-it-generator 0.5.2",
  "marine-it-interfaces 0.4.0",
- "marine-it-parser 0.6.1",
+ "marine-it-parser 0.6.2",
  "marine-module-info-parser 0.1.0",
  "marine-module-interface",
  "marine-utils 0.2.0",
diff --git a/crates/it-parser/Cargo.toml b/crates/it-parser/Cargo.toml
index 04081ed8..0b14b351 100644
--- a/crates/it-parser/Cargo.toml
+++ b/crates/it-parser/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "marine-it-parser"
 description = "Fluence Marine interface types parser"
-version = "0.6.1"
+version = "0.6.2"
 authors = ["Fluence Labs"]
 license = "Apache-2.0"
 edition = "2018"
diff --git a/crates/module-interface/src/it_interface/mod.rs b/crates/module-interface/src/it_interface/mod.rs
index 9c4edcca..b9b74e7e 100644
--- a/crates/module-interface/src/it_interface/mod.rs
+++ b/crates/module-interface/src/it_interface/mod.rs
@@ -37,8 +37,8 @@ pub fn get_interface(mit: &MITInterfaces<'_>) -> RIResult<IModuleInterface> {
     } = get_record_types(mit, function_signatures.iter())?;
 
     let mm_interface = IModuleInterface {
-        record_types,
         export_record_types,
+        record_types,
         function_signatures,
     };
 
diff --git a/tools/cli/Cargo.toml b/tools/cli/Cargo.toml
index c5b12183..840acde5 100644
--- a/tools/cli/Cargo.toml
+++ b/tools/cli/Cargo.toml
@@ -13,7 +13,7 @@ path = "src/main.rs"
 
 [dependencies]
 marine-it-generator = { path = "../../crates/it-generator", version = "0.5.1" }
-marine-it-parser = { path = "../../crates/it-parser", version = "0.6.1" }
+marine-it-parser = { path = "../../crates/it-parser", version = "0.6.2" }
 marine-module-info-parser = { path = "../../crates/module-info-parser", version = "0.1.0" }
 
 semver = "0.11.0"
diff --git a/tools/cli/src/main.rs b/tools/cli/src/main.rs
index b469bf6a..286efcf9 100644
--- a/tools/cli/src/main.rs
+++ b/tools/cli/src/main.rs
@@ -94,7 +94,7 @@ fn aqua(args: &clap::ArgMatches<'_>) -> Result<(), anyhow::Error> {
         None => {
             let service_name = wasm_path
                 .file_stem()
-                .ok_or(anyhow::Error::msg("provided path isn't a path to a file"))?;
+                .ok_or_else(|| anyhow::Error::msg("provided path isn't a path to a file"))?;
 
             service_name.to_string_lossy()
         }