Merge pull request #1728 from polywrap/chore/update-rust-plugin-bindings

chore: update rust plugin bindings

Author: dOrgJelli

packages/schema/bind/src/bindings/rust/plugin/templates/module-rs.mustache

@@ -2,9 +2,8 @@
 ///       All modifications will be overwritten.
 
 use std::sync::Arc;
-use polywrap_core::{invoke::Invoker};
-use polywrap_plugin::error::PluginError;
-use polywrap_plugin::module::PluginModule;
+use polywrap_core::invoke::Invoker;
+use polywrap_plugin::{error::PluginError, module::PluginModule};
 use serde::{Serialize, Deserialize};
 use super::types::*;
 

packages/schema/bind/src/bindings/rust/plugin/templates/types-rs.mustache

@@ -3,16 +3,12 @@
 
 // NOTE: This is an auto-generated file.
 //       All modifications will be overwritten.
+use polywrap_core::{invoke::Invoker, uri::Uri};
+use polywrap_msgpack::{decode, serialize};
+use polywrap_plugin::{error::PluginError, BigInt, BigNumber, Map, JSON};
 use serde::{Serialize, Deserialize};
-use num_bigint::BigInt;
-use bigdecimal::BigDecimal as BigNumber;
-use serde_json as JSON;
-use polywrap_msgpack::extensions::generic_map::GenericMap as Map;
 {{#importedModuleTypes}}
 use std::sync::Arc;
-use polywrap_msgpack::{decode, serialize};
-use polywrap_core::{invoke::{Invoker}, uri::Uri};
-use polywrap_plugin::error::PluginError;
 {{/importedModuleTypes}}
 
 // Env START //
@@ -129,7 +125,7 @@ impl {{#detectKeyword}}{{#toUpper}}{{type}}{{/toUpper}}{{/detectKeyword}} {
         .map_err(|e| PluginError::SubinvocationError {
             uri: uri.to_string(),
             method: "{{name}}".to_string(),
-            args: serde_json::to_string(&args).unwrap(),
+            args: JSON::to_string(&args).unwrap(),
             exception: e.to_string(),
         })?;
 
@@ -168,7 +164,7 @@ impl<'a> {{#detectKeyword}}{{#toUpper}}{{type}}{{/toUpper}}{{/detectKeyword}}<'a
         .map_err(|e| PluginError::SubinvocationError {
             uri: uri.to_string(),
             method: "{{name}}".to_string(),
-            args: serde_json::to_string(&args).unwrap(),
+            args: JSON::to_string(&args).unwrap(),
             exception: e.to_string(),
         })?;
 

packages/schema/bind/src/bindings/rust/plugin/templates/wrap.info-rs.mustache

@@ -1,7 +1,7 @@
 /// NOTE: This is an auto-generated file.
 ///       All modifications will be overwritten.
+use polywrap_plugin::JSON::{from_value, json};
 use wrap_manifest_schemas::versions::{WrapManifest, WrapManifestAbi};
-use serde_json::{json, from_value};
 
 {{#manifest}}
 pub fn get_manifest() -> WrapManifest {

packages/test-cases/cases/bind/sanity/output/plugin-rs/module.rs

@@ -2,9 +2,8 @@
 ///       All modifications will be overwritten.
 
 use std::sync::Arc;
-use polywrap_core::{invoke::Invoker};
-use polywrap_plugin::error::PluginError;
-use polywrap_plugin::module::PluginModule;
+use polywrap_core::invoke::Invoker;
+use polywrap_plugin::{error::PluginError, module::PluginModule};
 use serde::{Serialize, Deserialize};
 use super::types::*;
 

packages/test-cases/cases/bind/sanity/output/plugin-rs/types.rs

@@ -3,15 +3,11 @@
 
 // NOTE: This is an auto-generated file.
 //       All modifications will be overwritten.
+use polywrap_core::{invoke::Invoker, uri::Uri};
+use polywrap_msgpack::{decode, serialize};
+use polywrap_plugin::{error::PluginError, BigInt, BigNumber, Map, JSON};
 use serde::{Serialize, Deserialize};
-use num_bigint::BigInt;
-use bigdecimal::BigDecimal as BigNumber;
-use serde_json as JSON;
-use polywrap_msgpack::extensions::generic_map::GenericMap as Map;
 use std::sync::Arc;
-use polywrap_msgpack::{decode, serialize};
-use polywrap_core::{invoke::{Invoker}, uri::Uri};
-use polywrap_plugin::error::PluginError;
 
 // Env START //
 
@@ -241,7 +237,7 @@ impl<'a> TestImportModule<'a> {
         .map_err(|e| PluginError::SubinvocationError {
             uri: uri.to_string(),
             method: "importedMethod".to_string(),
-            args: serde_json::to_string(&args).unwrap(),
+            args: JSON::to_string(&args).unwrap(),
             exception: e.to_string(),
         })?;
 
@@ -261,7 +257,7 @@ impl<'a> TestImportModule<'a> {
         .map_err(|e| PluginError::SubinvocationError {
             uri: uri.to_string(),
             method: "anotherMethod".to_string(),
-            args: serde_json::to_string(&args).unwrap(),
+            args: JSON::to_string(&args).unwrap(),
             exception: e.to_string(),
         })?;
 
@@ -281,7 +277,7 @@ impl<'a> TestImportModule<'a> {
         .map_err(|e| PluginError::SubinvocationError {
             uri: uri.to_string(),
             method: "returnsArrayOfEnums".to_string(),
-            args: serde_json::to_string(&args).unwrap(),
+            args: JSON::to_string(&args).unwrap(),
             exception: e.to_string(),
         })?;
 

packages/test-cases/cases/bind/sanity/output/plugin-rs/wrap.info.rs

@@ -1,7 +1,7 @@
 /// NOTE: This is an auto-generated file.
 ///       All modifications will be overwritten.
+use polywrap_plugin::JSON::{from_value, json};
 use wrap_manifest_schemas::versions::{WrapManifest, WrapManifestAbi};
-use serde_json::{json, from_value};
 
 pub fn get_manifest() -> WrapManifest {
   WrapManifest {