engine-q merge

2022-02-07 19:11:34 +00:00
parent 265ee1281d 9259a56a28
commit fdce6c49ab
1965 changed files with 119062 additions and 20 deletions
--- a/crates/nu-plugin/src/lib.rs
+++ b/crates/nu-plugin/src/lib.rs
@@ -1,6 +1,19 @@
+<<<<<<< HEAD
 pub mod jsonrpc;
 mod plugin;

 pub mod test_helpers;

 pub use crate::plugin::{serve_plugin, Plugin};
+=======
+mod plugin;
+mod protocol;
+mod serializers;
+
+#[allow(dead_code)]
+mod plugin_capnp;
+
+pub use plugin::{get_signature, serve_plugin, Plugin, PluginDeclaration};
+pub use protocol::{EvaluatedCall, LabeledError};
+pub use serializers::{capnp::CapnpSerializer, json::JsonSerializer, EncodingType};
+>>>>>>> 9259a56a28f1dd3a4b720ad815aa19c6eaf6adce