Skip to content

fix: import TVF from ProSA to avoid prosa_utils import #65

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
reneca wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: import TVF from ProSA to avoid prosa_utils import #65

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ include = [

[workspace.dependencies]
prosa-utils = { version = "0.4.0", path = "prosa_utils", default-features = false }
prosa-macros = { version = "0.4.0", path = "prosa_macros" }
prosa-macros = { version = "0.4.1", path = "prosa_macros" }
thiserror = "2"
aquamarine = "0.6"
bytes = "1"
Expand Down
8 changes: 4 additions & 4 deletions prosa_book/src/ch02-02-creation.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ where
+ std::marker::Sized
+ std::clone::Clone
+ std::fmt::Debug
+ prosa_utils::msg::tvf::Tvf
+ prosa::core::msg::Tvf
+ std::default::Default,
{
/// Method called when the processor spawns
Expand Down Expand Up @@ -65,7 +65,7 @@ where
+ std::marker::Sized
+ std::clone::Clone
+ std::fmt::Debug
+ prosa_utils::msg::tvf::Tvf
+ prosa::core::msg::Tvf
+ std::default::Default,
{
/// Method to process incoming requests from internal
Expand All @@ -89,7 +89,7 @@ where
+ std::marker::Sized
+ std::clone::Clone
+ std::fmt::Debug
+ prosa_utils::msg::tvf::Tvf
+ prosa::core::msg::Tvf
+ std::default::Default,
{
/// Method to process incoming requests from external system
Expand Down Expand Up @@ -119,7 +119,7 @@ where
+ std::marker::Sized
+ std::clone::Clone
+ std::fmt::Debug
+ prosa_utils::msg::tvf::Tvf
+ prosa::core::msg::Tvf
+ std::default::Default,
{
const USER_AGENT: &str = "ProSA user agent";
Expand Down
2 changes: 1 addition & 1 deletion prosa_macros/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "prosa-macros"
version = "0.4.0"
version = "0.4.1"
authors.workspace = true
description = "ProSA macros"
homepage.workspace = true
Expand Down
8 changes: 4 additions & 4 deletions prosa_macros/src/proc.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ fn add_message_generic(generics: &mut syn::Generics) -> syn::parse::Result<()> {
generics.make_where_clause();
if let Some(ref mut where_clause) = generics.where_clause {
let message_where: syn::WherePredicate = syn::parse2(
quote! { M: 'static + std::marker::Send + std::marker::Sync + std::marker::Sized + std::clone::Clone + std::fmt::Debug + prosa_utils::msg::tvf::Tvf + std::default::Default },
quote! { M: 'static + std::marker::Send + std::marker::Sync + std::marker::Sized + std::clone::Clone + std::fmt::Debug + prosa::core::msg::Tvf + std::default::Default },
)?;
where_clause.predicates.push(message_where);
} else {
Expand Down Expand Up @@ -160,7 +160,7 @@ fn generate_struct_impl_bus_param(
Ok(quote! {
impl #item_generics prosa::core::proc::ProcBusParam for #item_ident #item_generics
where
M: 'static + std::marker::Send + std::marker::Sync + std::marker::Sized + std::clone::Clone + std::fmt::Debug + prosa_utils::msg::tvf::Tvf + std::default::Default,
M: 'static + std::marker::Send + std::marker::Sync + std::marker::Sized + std::clone::Clone + std::fmt::Debug + prosa::core::msg::Tvf + std::default::Default,
{
#[doc=concat!(" Getter of the ", stringify!(#item_ident), " processor ID")]
fn get_proc_id(&self) -> u32 {
Expand Down Expand Up @@ -195,7 +195,7 @@ fn generate_struct_impl_config(
// The definition must be done for the protocol
impl #item_generics prosa::core::proc::ProcConfig<M> for #item_ident #item_generics
where
M: 'static + std::marker::Send + std::marker::Sync + std::marker::Sized + std::clone::Clone + std::fmt::Debug + prosa_utils::msg::tvf::Tvf + std::default::Default,
M: 'static + std::marker::Send + std::marker::Sync + std::marker::Sized + std::clone::Clone + std::fmt::Debug + prosa::core::msg::Tvf + std::default::Default,
{
type Settings = #settings;

Expand Down Expand Up @@ -234,7 +234,7 @@ fn generate_struct_impl_epilogue(
// The definition must be done for the protocol
impl #item_generics prosa::core::proc::ProcEpilogue for #item_ident #item_generics
where
M: 'static + std::marker::Send + std::marker::Sync + std::marker::Sized + std::clone::Clone + std::fmt::Debug + prosa_utils::msg::tvf::Tvf + std::default::Default,
M: 'static + std::marker::Send + std::marker::Sync + std::marker::Sized + std::clone::Clone + std::fmt::Debug + prosa::core::msg::Tvf + std::default::Default,
{
fn get_proc_restart_delay(&self) -> (std::time::Duration, u32) {
#restart_settings_quote
Expand Down