From 396e03a2ec7373107ff528732613c4aba67990fa Mon Sep 17 00:00:00 2001 From: Andreas Schaeffer Date: Wed, 18 Sep 2024 23:03:54 +0200 Subject: [PATCH 1/2] Build with rust stable --- .run/Build Stable.run.xml | 22 +++++ .run/Build.run.xml | 9 ++- .run/Test.run.xml | 12 +-- Cargo.toml | 1 + plugins/arithmetic/crates/plugin/Cargo.toml | 10 +++ plugins/arithmetic/crates/plugin/build.rs | 18 +++++ .../plugin/src/behaviour/entity/counter.rs | 3 + plugins/arithmetic/crates/plugin/src/lib.rs | 3 - plugins/base/crates/plugin/src/lib.rs | 4 +- plugins/binary/crates/plugin/src/lib.rs | 3 - plugins/color/crates/plugin/src/lib.rs | 3 - plugins/comparison/crates/plugin/src/lib.rs | 3 - plugins/config/crates/plugin/src/lib.rs | 78 ------------------ plugins/connector/crates/plugin/src/lib.rs | 3 - .../connector/crates/plugin/src/tests/mod.rs | 2 +- plugins/date-time/crates/plugin/src/lib.rs | 3 - plugins/file/crates/plugin/src/lib.rs | 3 - plugins/flow/crates/plugin/src/lib.rs | 72 ----------------- plugins/git/crates/plugin/src/lib.rs | 3 - plugins/graphql-client/src/lib.rs | 61 -------------- .../graphql-schema-visualization/src/lib.rs | 40 ---------- plugins/http/crates/plugin/src/lib.rs | 3 - plugins/json/crates/plugin/src/lib.rs | 3 - plugins/logical/crates/plugin/src/lib.rs | 3 - plugins/metadata/crates/plugin/src/lib.rs | 3 - plugins/numeric/crates/plugin/src/lib.rs | 3 - plugins/random/crates/plugin/src/lib.rs | 3 - plugins/result/crates/plugin/src/lib.rs | 6 -- plugins/state/crates/plugin/src/lib.rs | 6 -- plugins/string/crates/plugin/src/lib.rs | 80 ------------------- .../crates/plugin/src/lib.rs | 73 ----------------- plugins/taxonomy/crates/plugin/src/lib.rs | 2 - plugins/trigger/crates/plugin/src/lib.rs | 3 - plugins/value/crates/model/src/lib.rs | 3 - plugins/value/crates/plugin/src/lib.rs | 3 - 35 files changed, 68 insertions(+), 482 deletions(-) create mode 100644 .run/Build Stable.run.xml diff --git a/.run/Build Stable.run.xml b/.run/Build Stable.run.xml new file mode 100644 index 00000000..157d1fbb --- /dev/null +++ b/.run/Build Stable.run.xml @@ -0,0 +1,22 @@ + + + + \ No newline at end of file diff --git a/.run/Build.run.xml b/.run/Build.run.xml index 824d89b5..6034e7be 100644 --- a/.run/Build.run.xml +++ b/.run/Build.run.xml @@ -1,7 +1,11 @@ + - + \ No newline at end of file diff --git a/.run/Test.run.xml b/.run/Test.run.xml index f618d036..88e17b6e 100644 --- a/.run/Test.run.xml +++ b/.run/Test.run.xml @@ -1,20 +1,22 @@ + - + \ No newline at end of file diff --git a/Cargo.toml b/Cargo.toml index 9273a773..5c2cc2ad 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -100,6 +100,7 @@ rand = "0.8" rand_chacha = "0.3" random-string = "1.0" rust-embed = { version = "8.0", features = ["debug-embed", "compression"] } +rustc_version = "0.4" semver = "1.0" serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" diff --git a/plugins/arithmetic/crates/plugin/Cargo.toml b/plugins/arithmetic/crates/plugin/Cargo.toml index c16727f6..d8fa0485 100644 --- a/plugins/arithmetic/crates/plugin/Cargo.toml +++ b/plugins/arithmetic/crates/plugin/Cargo.toml @@ -40,17 +40,27 @@ reactive-graph-runtime-model = { workspace = true } reactive-graph-model-arithmetic = { version = "0.10.0", path = "../../crates/model" } reactive-graph-model-result = { version = "0.10.0", path = "../../../result/crates/model" } +[build-dependencies] +rustc_version = { workspace = true } + [dev-dependencies] default-test = { workspace = true } reactive-graph-graph = { workspace = true, features = ["test"] } reactive-graph-test-utils = { workspace = true } +[features] +default = [] +rustc_nightly = [] + [lib] # Plugins use crate-type cdylib # https://doc.rust-lang.org/reference/linkage.html # https://users.rust-lang.org/t/what-is-the-difference-between-dylib-and-cdylib/28847/3 crate-type = ["cdylib"] +[lints.rust] +unexpected_cfgs = { level = "warn", check-cfg = ['cfg(rustc_nightly)'] } + [package.metadata.cargo-post.dependencies] toml = "0.8" serde = { version = "1.0", features = ["derive"] } diff --git a/plugins/arithmetic/crates/plugin/build.rs b/plugins/arithmetic/crates/plugin/build.rs index 8f7525ab..f843d50d 100644 --- a/plugins/arithmetic/crates/plugin/build.rs +++ b/plugins/arithmetic/crates/plugin/build.rs @@ -1,3 +1,21 @@ +extern crate rustc_version; +use rustc_version::version_meta; +use rustc_version::Channel; fn main() { println!("cargo:rerun-if-changed=types"); + // Set cfg flags depending on release channel + match version_meta().unwrap().channel { + Channel::Stable => { + println!("cargo:rustc-cfg=rustc_stable"); + } + Channel::Beta => { + println!("cargo:rustc-cfg=rustc_beta"); + } + Channel::Nightly => { + println!("cargo:rustc-cfg=rustc_nightly"); + } + Channel::Dev => { + println!("cargo:rustc-cfg=rustc_dev"); + } + } } diff --git a/plugins/arithmetic/crates/plugin/src/behaviour/entity/counter.rs b/plugins/arithmetic/crates/plugin/src/behaviour/entity/counter.rs index f72064a1..97d13956 100644 --- a/plugins/arithmetic/crates/plugin/src/behaviour/entity/counter.rs +++ b/plugins/arithmetic/crates/plugin/src/behaviour/entity/counter.rs @@ -54,6 +54,8 @@ mod tests { use reactive_graph_reactive_model_impl::ReactiveProperties; use reactive_graph_runtime_model::ActionProperties::TRIGGER; + // TODO: This test should be moved to the reactive model + #[cfg(feature = "rustc_nightly")] #[test] fn rx_counter_test() { let id = Uuid::new_v4(); @@ -85,6 +87,7 @@ mod tests { assert_eq!(3, counter.result, "The behaviour should have been dropped."); } + #[cfg(feature = "rustc_nightly")] #[test] fn rx_counter_2_test() { let counter = Counter1::new(false, 0u64); diff --git a/plugins/arithmetic/crates/plugin/src/lib.rs b/plugins/arithmetic/crates/plugin/src/lib.rs index a88b1f3a..372ef53f 100644 --- a/plugins/arithmetic/crates/plugin/src/lib.rs +++ b/plugins/arithmetic/crates/plugin/src/lib.rs @@ -1,6 +1,3 @@ -#![feature(register_tool)] -#![register_tool(tarpaulin)] - pub mod behaviour; pub mod plugin; pub mod providers; diff --git a/plugins/base/crates/plugin/src/lib.rs b/plugins/base/crates/plugin/src/lib.rs index 70d6de5d..60024347 100644 --- a/plugins/base/crates/plugin/src/lib.rs +++ b/plugins/base/crates/plugin/src/lib.rs @@ -1,6 +1,4 @@ -#![feature(register_tool)] -#![feature(once_cell_try)] -#![register_tool(tarpaulin)] +// #![feature(once_cell_try)] #![allow(clippy::map_entry)] pub mod plugin; diff --git a/plugins/binary/crates/plugin/src/lib.rs b/plugins/binary/crates/plugin/src/lib.rs index e6376428..5f30703a 100644 --- a/plugins/binary/crates/plugin/src/lib.rs +++ b/plugins/binary/crates/plugin/src/lib.rs @@ -1,6 +1,3 @@ -#![feature(register_tool)] -#![register_tool(tarpaulin)] - pub mod behaviour; pub mod plugin; pub mod providers; diff --git a/plugins/color/crates/plugin/src/lib.rs b/plugins/color/crates/plugin/src/lib.rs index a88b1f3a..372ef53f 100644 --- a/plugins/color/crates/plugin/src/lib.rs +++ b/plugins/color/crates/plugin/src/lib.rs @@ -1,6 +1,3 @@ -#![feature(register_tool)] -#![register_tool(tarpaulin)] - pub mod behaviour; pub mod plugin; pub mod providers; diff --git a/plugins/comparison/crates/plugin/src/lib.rs b/plugins/comparison/crates/plugin/src/lib.rs index a88b1f3a..372ef53f 100644 --- a/plugins/comparison/crates/plugin/src/lib.rs +++ b/plugins/comparison/crates/plugin/src/lib.rs @@ -1,6 +1,3 @@ -#![feature(register_tool)] -#![register_tool(tarpaulin)] - pub mod behaviour; pub mod plugin; pub mod providers; diff --git a/plugins/config/crates/plugin/src/lib.rs b/plugins/config/crates/plugin/src/lib.rs index a4573969..372ef53f 100644 --- a/plugins/config/crates/plugin/src/lib.rs +++ b/plugins/config/crates/plugin/src/lib.rs @@ -1,81 +1,3 @@ -#![feature(register_tool)] -#![register_tool(tarpaulin)] - pub mod behaviour; pub mod plugin; pub mod providers; - -// #![allow(clippy::map_entry)] -// -// #[macro_use] -// extern crate query_interface; -// -// use std::sync::Arc; -// -// use reactive_graph_core_di as di; -// use reactive_graph_graph as model; -// use reactive_graph_model_config as model_config; -// use reactive_graph_model_file as model_file; -// use reactive_graph_model_result as model_result; -// use reactive_graph_model_runtime as model_runtime; -// use reactive_graph_plugin_api as plugins; -// use reactive_graph_reactive as reactive; -// -// use log::error; -// -// use crate::di::profiles; -// use crate::di::Container; -// use crate::di::Provider; -// use crate::plugin::ConfigPlugin; -// use crate::plugins::Plugin; -// use crate::plugins::PluginDependency; -// use crate::plugins::PluginLoadingError; -// -// pub mod behaviour; -// pub mod plugin; -// pub mod providers; -// -// pub static PLUGIN_NAME: &str = env!("CARGO_PKG_NAME"); -// pub static PLUGIN_DESCRIPTION: &str = env!("CARGO_PKG_DESCRIPTION"); -// pub static PLUGIN_VERSION: &str = env!("CARGO_PKG_VERSION"); -// -// pub fn get() -> Container { -// Container::::new() -// } -// -// pub fn construct_plugin() -> Result, PluginLoadingError> { -// let mut container = get::(); -// let container = &mut container; -// let plugin = Provider::::create(container); -// let plugin = Arc::new(plugin); -// let plugin: Result, _> = ::query_arc(plugin); -// match plugin { -// Ok(plugin) => Ok(plugin), -// Err(_) => { -// error!("Failed to construct plugin {}", PLUGIN_NAME); -// Err(PluginLoadingError::PluginContainerInitializationError) -// } -// } -// } -// -// plugins::export_plugin!(register, get_dependencies, PLUGIN_NAME, PLUGIN_DESCRIPTION, PLUGIN_VERSION); -// -// #[allow(improper_ctypes_definitions)] -// extern "C" fn register(registrar: &mut dyn plugins::PluginRegistrar) { -// if let Err(error) = log4rs::init_file("config/logging.toml", Default::default()) { -// println!("Failed to configure logger in {}: {}", PLUGIN_NAME, error); -// } -// if let Ok(plugin) = construct_plugin() { -// registrar.register_plugin(Box::new(plugin)); -// } -// } -// -// #[allow(improper_ctypes_definitions)] -// extern "C" fn get_dependencies() -> Vec { -// vec![ -// PluginDependency::new("reactive-graph-plugin-base", ">=0.9.0, <0.10.0"), -// PluginDependency::new("reactive-graph-plugin-file", ">=0.9.0, <0.10.0"), -// PluginDependency::new("reactive-graph-plugin-trigger", ">=0.9.0, <0.10.0"), -// PluginDependency::new("reactive-graph-plugin-result", ">=0.9.0, <0.10.0"), -// ] -// } diff --git a/plugins/connector/crates/plugin/src/lib.rs b/plugins/connector/crates/plugin/src/lib.rs index a88b1f3a..372ef53f 100644 --- a/plugins/connector/crates/plugin/src/lib.rs +++ b/plugins/connector/crates/plugin/src/lib.rs @@ -1,6 +1,3 @@ -#![feature(register_tool)] -#![register_tool(tarpaulin)] - pub mod behaviour; pub mod plugin; pub mod providers; diff --git a/plugins/connector/crates/plugin/src/tests/mod.rs b/plugins/connector/crates/plugin/src/tests/mod.rs index 05c522fb..bc493408 100644 --- a/plugins/connector/crates/plugin/src/tests/mod.rs +++ b/plugins/connector/crates/plugin/src/tests/mod.rs @@ -1,5 +1,5 @@ mod default_connector_test; mod function_test; -#[tarpaulin::ignore] +#[cfg(not(tarpaulin_include))] mod utils; diff --git a/plugins/date-time/crates/plugin/src/lib.rs b/plugins/date-time/crates/plugin/src/lib.rs index e3d65327..a219dfa2 100644 --- a/plugins/date-time/crates/plugin/src/lib.rs +++ b/plugins/date-time/crates/plugin/src/lib.rs @@ -1,6 +1,3 @@ -#![feature(register_tool)] -#![register_tool(tarpaulin)] - pub mod api; pub mod behaviour; pub mod implementation; diff --git a/plugins/file/crates/plugin/src/lib.rs b/plugins/file/crates/plugin/src/lib.rs index a88b1f3a..372ef53f 100644 --- a/plugins/file/crates/plugin/src/lib.rs +++ b/plugins/file/crates/plugin/src/lib.rs @@ -1,6 +1,3 @@ -#![feature(register_tool)] -#![register_tool(tarpaulin)] - pub mod behaviour; pub mod plugin; pub mod providers; diff --git a/plugins/flow/crates/plugin/src/lib.rs b/plugins/flow/crates/plugin/src/lib.rs index 50547781..3e0d4c81 100644 --- a/plugins/flow/crates/plugin/src/lib.rs +++ b/plugins/flow/crates/plugin/src/lib.rs @@ -1,74 +1,2 @@ -#![feature(register_tool)] -#![register_tool(tarpaulin)] - pub mod plugin; pub mod providers; - -// #![feature(register_tool)] -// #![register_tool(tarpaulin)] -// #![allow(clippy::map_entry)] -// -// #[macro_use] -// extern crate query_interface; -// -// use std::sync::Arc; -// -// use reactive_graph_core_di as di; -// use reactive_graph_plugin_api as plugins; -// use log::error; -// -// use crate::di::profiles; -// use crate::di::Container; -// use crate::di::Provider; -// use crate::plugin::FlowPlugin; -// use crate::plugins::Plugin; -// use crate::plugins::PluginDependency; -// use crate::plugins::PluginLoadingError; -// -// pub mod plugin; -// pub mod providers; -// -// pub static PLUGIN_NAME: &str = env!("CARGO_PKG_NAME"); -// pub static PLUGIN_DESCRIPTION: &str = env!("CARGO_PKG_DESCRIPTION"); -// pub static PLUGIN_VERSION: &str = env!("CARGO_PKG_VERSION"); -// -// pub fn get() -> Container { -// Container::::new() -// } -// -// pub fn construct_plugin() -> Result, PluginLoadingError> { -// let mut container = get::(); -// let container = &mut container; -// let plugin = Provider::::create(container); -// let plugin = Arc::new(plugin); -// let plugin: Result, _> = ::query_arc(plugin); -// if plugin.is_err() { -// error!("Failed to construct plugin"); -// return Err(PluginLoadingError::PluginContainerInitializationError); -// } -// Ok(plugin.unwrap()) -// } -// -// plugins::export_plugin!(register, get_dependencies, PLUGIN_NAME, PLUGIN_DESCRIPTION, PLUGIN_VERSION); -// -// #[allow(improper_ctypes_definitions)] -// extern "C" fn register(registrar: &mut dyn plugins::PluginRegistrar) { -// if let Err(error) = log4rs::init_file("config/logging.toml", Default::default()) { -// println!("Failed to configure logger in {}: {}", PLUGIN_NAME, error); -// } -// if let Ok(plugin) = construct_plugin() { -// registrar.register_plugin(Box::new(plugin)); -// } -// } -// -// #[allow(improper_ctypes_definitions)] -// extern "C" fn get_dependencies() -> Vec { -// vec![PluginDependency::new("reactive-graph-plugin-base", ">=0.9.0, <0.10.0")] -// } -// -// #[cfg(test)] -// use reactive_graph_core_builder as builder; -// -// #[cfg(test)] -// #[tarpaulin::ignore] -// pub mod tests; diff --git a/plugins/git/crates/plugin/src/lib.rs b/plugins/git/crates/plugin/src/lib.rs index a88b1f3a..372ef53f 100644 --- a/plugins/git/crates/plugin/src/lib.rs +++ b/plugins/git/crates/plugin/src/lib.rs @@ -1,6 +1,3 @@ -#![feature(register_tool)] -#![register_tool(tarpaulin)] - pub mod behaviour; pub mod plugin; pub mod providers; diff --git a/plugins/graphql-client/src/lib.rs b/plugins/graphql-client/src/lib.rs index 0f0ec58b..9c58d51c 100644 --- a/plugins/graphql-client/src/lib.rs +++ b/plugins/graphql-client/src/lib.rs @@ -1,65 +1,4 @@ -#![feature(register_tool)] -#![register_tool(tarpaulin)] #![allow(clippy::map_entry)] pub mod plugin; pub mod provider; - -// #[macro_use] -// extern crate query_interface; -// -// use std::sync::Arc; -// -// use reactive_graph_config as config; -// use reactive_graph_core_di as di; -// use reactive_graph_plugin_api as plugins; -// use log::error; -// -// use crate::di::profiles; -// use crate::di::Container; -// use crate::di::Provider; -// use crate::plugin::GraphQlClientPlugin; -// use crate::plugins::Plugin; -// use crate::plugins::PluginDependency; -// use crate::plugins::PluginLoadingError; -// -// pub mod plugin; -// pub mod provider; -// -// pub static PLUGIN_NAME: &str = env!("CARGO_PKG_NAME"); -// pub static PLUGIN_DESCRIPTION: &str = env!("CARGO_PKG_DESCRIPTION"); -// pub static PLUGIN_VERSION: &str = env!("CARGO_PKG_VERSION"); -// -// pub fn get() -> Container { -// Container::::new() -// } -// -// pub fn construct_plugin() -> Result, PluginLoadingError> { -// let mut container = get::(); -// let container = &mut container; -// let plugin = Provider::::create(container); -// let plugin = Arc::new(plugin); -// let plugin: Result, _> = ::query_arc(plugin); -// if plugin.is_err() { -// error!("Failed to construct plugin"); -// return Err(PluginLoadingError::PluginContainerInitializationError); -// } -// Ok(plugin.unwrap()) -// } -// -// plugins::export_plugin!(register, get_dependencies, PLUGIN_NAME, PLUGIN_DESCRIPTION, PLUGIN_VERSION); -// -// #[allow(improper_ctypes_definitions)] -// extern "C" fn register(registrar: &mut dyn plugins::PluginRegistrar) { -// if let Err(error) = log4rs::init_file("config/logging.toml", Default::default()) { -// println!("Failed to configure logger in {}: {}", PLUGIN_NAME, error); -// } -// if let Ok(plugin) = construct_plugin() { -// registrar.register_plugin(Box::new(plugin)); -// } -// } -// -// #[allow(improper_ctypes_definitions)] -// extern "C" fn get_dependencies() -> Vec { -// vec![] -// } diff --git a/plugins/graphql-schema-visualization/src/lib.rs b/plugins/graphql-schema-visualization/src/lib.rs index f8adb0b7..9c58d51c 100644 --- a/plugins/graphql-schema-visualization/src/lib.rs +++ b/plugins/graphql-schema-visualization/src/lib.rs @@ -1,44 +1,4 @@ -#![feature(register_tool)] -#![register_tool(tarpaulin)] #![allow(clippy::map_entry)] pub mod plugin; pub mod provider; - -// pub static PLUGIN_NAME: &str = env!("CARGO_PKG_NAME"); -// pub static PLUGIN_DESCRIPTION: &str = env!("CARGO_PKG_DESCRIPTION"); -// pub static PLUGIN_VERSION: &str = env!("CARGO_PKG_VERSION"); -// -// pub fn get() -> Container { -// Container::::new() -// } -// -// pub fn construct_plugin() -> Result, PluginLoadingError> { -// let mut container = get::(); -// let container = &mut container; -// let plugin = Provider::::create(container); -// let plugin = Arc::new(plugin); -// let plugin: Result, _> = ::query_arc(plugin); -// if plugin.is_err() { -// error!("Failed to construct plugin"); -// return Err(PluginLoadingError::PluginContainerInitializationError); -// } -// Ok(plugin.unwrap()) -// } -// -// plugins::export_plugin!(register, get_dependencies, PLUGIN_NAME, PLUGIN_DESCRIPTION, PLUGIN_VERSION); -// -// #[allow(improper_ctypes_definitions)] -// extern "C" fn register(registrar: &mut dyn plugins::PluginRegistrar) { -// if let Err(error) = log4rs::init_file("config/logging.toml", Default::default()) { -// println!("Failed to configure logger in {}: {}", PLUGIN_NAME, error); -// } -// if let Ok(plugin) = construct_plugin() { -// registrar.register_plugin(Box::new(plugin)); -// } -// } -// -// #[allow(improper_ctypes_definitions)] -// extern "C" fn get_dependencies() -> Vec { -// vec![] -// } diff --git a/plugins/http/crates/plugin/src/lib.rs b/plugins/http/crates/plugin/src/lib.rs index a88b1f3a..372ef53f 100644 --- a/plugins/http/crates/plugin/src/lib.rs +++ b/plugins/http/crates/plugin/src/lib.rs @@ -1,6 +1,3 @@ -#![feature(register_tool)] -#![register_tool(tarpaulin)] - pub mod behaviour; pub mod plugin; pub mod providers; diff --git a/plugins/json/crates/plugin/src/lib.rs b/plugins/json/crates/plugin/src/lib.rs index a88b1f3a..372ef53f 100644 --- a/plugins/json/crates/plugin/src/lib.rs +++ b/plugins/json/crates/plugin/src/lib.rs @@ -1,6 +1,3 @@ -#![feature(register_tool)] -#![register_tool(tarpaulin)] - pub mod behaviour; pub mod plugin; pub mod providers; diff --git a/plugins/logical/crates/plugin/src/lib.rs b/plugins/logical/crates/plugin/src/lib.rs index a88b1f3a..372ef53f 100644 --- a/plugins/logical/crates/plugin/src/lib.rs +++ b/plugins/logical/crates/plugin/src/lib.rs @@ -1,6 +1,3 @@ -#![feature(register_tool)] -#![register_tool(tarpaulin)] - pub mod behaviour; pub mod plugin; pub mod providers; diff --git a/plugins/metadata/crates/plugin/src/lib.rs b/plugins/metadata/crates/plugin/src/lib.rs index 4038276a..3e0d4c81 100644 --- a/plugins/metadata/crates/plugin/src/lib.rs +++ b/plugins/metadata/crates/plugin/src/lib.rs @@ -1,5 +1,2 @@ -#![feature(register_tool)] -#![register_tool(tarpaulin)] - pub mod plugin; pub mod providers; diff --git a/plugins/numeric/crates/plugin/src/lib.rs b/plugins/numeric/crates/plugin/src/lib.rs index 42af2c6b..525f8b23 100644 --- a/plugins/numeric/crates/plugin/src/lib.rs +++ b/plugins/numeric/crates/plugin/src/lib.rs @@ -1,6 +1,3 @@ -#![feature(register_tool)] -#![register_tool(tarpaulin)] - pub mod api; pub mod behaviour; pub mod constants; diff --git a/plugins/random/crates/plugin/src/lib.rs b/plugins/random/crates/plugin/src/lib.rs index a88b1f3a..372ef53f 100644 --- a/plugins/random/crates/plugin/src/lib.rs +++ b/plugins/random/crates/plugin/src/lib.rs @@ -1,6 +1,3 @@ -#![feature(register_tool)] -#![register_tool(tarpaulin)] - pub mod behaviour; pub mod plugin; pub mod providers; diff --git a/plugins/result/crates/plugin/src/lib.rs b/plugins/result/crates/plugin/src/lib.rs index 60a665aa..c5b8a801 100644 --- a/plugins/result/crates/plugin/src/lib.rs +++ b/plugins/result/crates/plugin/src/lib.rs @@ -1,10 +1,4 @@ -#![feature(register_tool)] -#![register_tool(tarpaulin)] #![allow(clippy::map_entry)] pub mod plugin; pub mod providers; - -// #[cfg(test)] -// #[tarpaulin::ignore] -// pub mod tests; diff --git a/plugins/state/crates/plugin/src/lib.rs b/plugins/state/crates/plugin/src/lib.rs index 9ed88baa..909ea45f 100644 --- a/plugins/state/crates/plugin/src/lib.rs +++ b/plugins/state/crates/plugin/src/lib.rs @@ -1,5 +1,3 @@ -#![feature(register_tool)] -#![register_tool(tarpaulin)] #![allow(clippy::map_entry)] use reactive_graph_model_state as model_state; @@ -8,7 +6,3 @@ use reactive_graph_model_value as model_value; pub mod behaviour; pub mod plugin; pub mod providers; - -// #[cfg(test)] -// #[tarpaulin::ignore] -// pub mod tests; diff --git a/plugins/string/crates/plugin/src/lib.rs b/plugins/string/crates/plugin/src/lib.rs index 05aff3bb..372ef53f 100644 --- a/plugins/string/crates/plugin/src/lib.rs +++ b/plugins/string/crates/plugin/src/lib.rs @@ -1,83 +1,3 @@ -#![feature(register_tool)] -#![register_tool(tarpaulin)] - pub mod behaviour; pub mod plugin; pub mod providers; - -// #![feature(register_tool)] -// #![register_tool(tarpaulin)] -// #![allow(clippy::map_entry)] -// -// #[macro_use] -// extern crate query_interface; -// -// use std::sync::Arc; -// -// use reactive_graph_core_di as di; -// use reactive_graph_graph as model; -// use reactive_graph_model_result as model_result; -// use reactive_graph_model_string as model_string; -// use reactive_graph_plugin_api as plugins; -// use reactive_graph_reactive as reactive; -// use log::error; -// -// use crate::di::profiles; -// use crate::di::Container; -// use crate::di::Provider; -// use crate::plugin::StringPlugin; -// use crate::plugins::Plugin; -// use crate::plugins::PluginDependency; -// use crate::plugins::PluginLoadingError; -// -// pub mod behaviour; -// pub mod plugin; -// pub mod providers; -// -// pub static PLUGIN_NAME: &str = env!("CARGO_PKG_NAME"); -// pub static PLUGIN_DESCRIPTION: &str = env!("CARGO_PKG_DESCRIPTION"); -// pub static PLUGIN_VERSION: &str = env!("CARGO_PKG_VERSION"); -// -// pub fn get() -> Container { -// Container::::new() -// } -// -// pub fn construct_plugin() -> Result, PluginLoadingError> { -// let mut container = get::(); -// let container = &mut container; -// let plugin = Provider::::create(container); -// let plugin = Arc::new(plugin); -// let plugin: Result, _> = ::query_arc(plugin); -// if plugin.is_err() { -// error!("Failed to construct plugin"); -// return Err(PluginLoadingError::PluginContainerInitializationError); -// } -// Ok(plugin.unwrap()) -// } -// -// plugins::export_plugin!(register, get_dependencies, PLUGIN_NAME, PLUGIN_DESCRIPTION, PLUGIN_VERSION); -// -// #[allow(improper_ctypes_definitions)] -// extern "C" fn register(registrar: &mut dyn plugins::PluginRegistrar) { -// if let Err(error) = log4rs::init_file("config/logging.toml", Default::default()) { -// println!("Failed to configure logger in {}: {}", PLUGIN_NAME, error); -// } -// if let Ok(plugin) = construct_plugin() { -// registrar.register_plugin(Box::new(plugin)); -// } -// } -// -// #[allow(improper_ctypes_definitions)] -// extern "C" fn get_dependencies() -> Vec { -// vec![ -// PluginDependency::new("reactive-graph-plugin-base", ">=0.9.0, <0.10.0"), -// PluginDependency::new("reactive-graph-plugin-result", ">=0.9.0, <0.10.0"), -// ] -// } -// -// #[cfg(test)] -// use reactive_graph_core_builder as builder; -// -// #[cfg(test)] -// #[tarpaulin::ignore] -// pub mod tests; diff --git a/plugins/system-environment/crates/plugin/src/lib.rs b/plugins/system-environment/crates/plugin/src/lib.rs index c1362b58..6cd54986 100644 --- a/plugins/system-environment/crates/plugin/src/lib.rs +++ b/plugins/system-environment/crates/plugin/src/lib.rs @@ -1,5 +1,3 @@ -#![feature(register_tool)] -#![register_tool(tarpaulin)] #![allow(clippy::map_entry)] use reactive_graph_model_system_environment as model_system_environment; @@ -7,74 +5,3 @@ use reactive_graph_model_system_environment as model_system_environment; pub mod factory; pub mod plugin; pub mod providers; - -// #[cfg(test)] -// #[tarpaulin::ignore] -// pub mod tests; - -// #[macro_use] -// extern crate query_interface; -// -// use std::sync::Arc; -// -// use reactive_graph_core_builder as builder; -// use reactive_graph_core_di as di; -// use reactive_graph_model_system_environment as model_system_environment; -// use reactive_graph_plugin_api as plugins; -// use log::error; -// -// use crate::di::profiles; -// use crate::di::Container; -// use crate::di::Provider; -// use crate::plugin::SystemEnvironmentPlugin; -// use crate::plugins::Plugin; -// use crate::plugins::PluginDependency; -// use crate::plugins::PluginLoadingError; -// -// pub mod plugin; -// pub mod providers; -// -// pub static PLUGIN_NAME: &str = env!("CARGO_PKG_NAME"); -// pub static PLUGIN_DESCRIPTION: &str = env!("CARGO_PKG_DESCRIPTION"); -// pub static PLUGIN_VERSION: &str = env!("CARGO_PKG_VERSION"); -// -// pub fn get() -> Container { -// Container::::new() -// } -// -// pub fn construct_plugin() -> Result, PluginLoadingError> { -// let mut container = get::(); -// let container = &mut container; -// let plugin = Provider::::create(container); -// let plugin = Arc::new(plugin); -// let plugin: Result, _> = ::query_arc(plugin); -// if plugin.is_err() { -// error!("Failed to construct plugin"); -// return Err(PluginLoadingError::PluginContainerInitializationError); -// } -// Ok(plugin.unwrap()) -// } -// -// plugins::export_plugin!(register, get_dependencies, PLUGIN_NAME, PLUGIN_DESCRIPTION, PLUGIN_VERSION); -// -// #[allow(improper_ctypes_definitions)] -// extern "C" fn register(registrar: &mut dyn plugins::PluginRegistrar) { -// if let Err(error) = log4rs::init_file("config/logging.toml", Default::default()) { -// println!("Failed to configure logger in {}: {}", PLUGIN_NAME, error); -// } -// if let Ok(plugin) = construct_plugin() { -// registrar.register_plugin(Box::new(plugin)); -// } -// } -// -// #[allow(improper_ctypes_definitions)] -// extern "C" fn get_dependencies() -> Vec { -// vec![ -// PluginDependency::new("reactive-graph-plugin-base", ">=0.9.0, <0.10.0"), -// PluginDependency::new("reactive-graph-plugin-value", ">=0.9.0, <0.10.0"), -// ] -// } -// -// #[cfg(test)] -// #[tarpaulin::ignore] -// pub mod tests; diff --git a/plugins/taxonomy/crates/plugin/src/lib.rs b/plugins/taxonomy/crates/plugin/src/lib.rs index d0acce4c..c5b8a801 100644 --- a/plugins/taxonomy/crates/plugin/src/lib.rs +++ b/plugins/taxonomy/crates/plugin/src/lib.rs @@ -1,5 +1,3 @@ -#![feature(register_tool)] -#![register_tool(tarpaulin)] #![allow(clippy::map_entry)] pub mod plugin; diff --git a/plugins/trigger/crates/plugin/src/lib.rs b/plugins/trigger/crates/plugin/src/lib.rs index 4038276a..3e0d4c81 100644 --- a/plugins/trigger/crates/plugin/src/lib.rs +++ b/plugins/trigger/crates/plugin/src/lib.rs @@ -1,5 +1,2 @@ -#![feature(register_tool)] -#![register_tool(tarpaulin)] - pub mod plugin; pub mod providers; diff --git a/plugins/value/crates/model/src/lib.rs b/plugins/value/crates/model/src/lib.rs index 96e7ce8d..f8289e1e 100644 --- a/plugins/value/crates/model/src/lib.rs +++ b/plugins/value/crates/model/src/lib.rs @@ -1,6 +1,3 @@ -#![feature(unboxed_closures)] -#![feature(fn_traits)] - pub use component::value::*; pub use entity_type::value::*; diff --git a/plugins/value/crates/plugin/src/lib.rs b/plugins/value/crates/plugin/src/lib.rs index a88b1f3a..372ef53f 100644 --- a/plugins/value/crates/plugin/src/lib.rs +++ b/plugins/value/crates/plugin/src/lib.rs @@ -1,6 +1,3 @@ -#![feature(register_tool)] -#![register_tool(tarpaulin)] - pub mod behaviour; pub mod plugin; pub mod providers; From 7374aceb46f705fb6ebbb34005128998ab586500 Mon Sep 17 00:00:00 2001 From: Andreas Schaeffer Date: Wed, 18 Sep 2024 23:06:23 +0200 Subject: [PATCH 2/2] The CI builds with rust stable --- .github/workflows/rust.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index 70dedc79..bc7e826c 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -26,14 +26,15 @@ jobs: strategy: matrix: os: [ ubuntu-latest, macos-latest, windows-latest ] + toolchain: [ stable, nightly-2024-08-19 ] runs-on: ${{ matrix.os }} steps: - name: VCS Checkout uses: actions/checkout@v4 - - name: Install latest nightly + - name: Install rust toolchain uses: dtolnay/rust-toolchain@master with: - toolchain: nightly-2024-08-19 + toolchain: ${{ matrix.toolchain }} - name: Setup Node.js 18 uses: actions/setup-node@v3 with: