Skip to content
This repository was archived by the owner on Jan 22, 2026. It is now read-only.

Change how system.rs imports blocks to avoid merge conflicts #39

Closed
imunproductive wants to merge 4 commits into from
Closed

Change how system.rs imports blocks to avoid merge conflicts #39

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
96fef1d
refactor how system.rs imports blocks
imunproductive Dec 26, 2024
f8b6fa6
trigger ci
imunproductive Dec 26, 2024
b1d44f1
Merge branch 'master' into fix/system-use
artob Jan 22, 2026
12622bb
Merge branch 'master' into fix/system-use
artob Jan 22, 2026
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
19 changes: 12 additions & 7 deletions lib/protoflow-blocks/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,13 +31,18 @@ pub use types::*;

pub use protoflow_core::{SystemBuilding, SystemExecution};

include!("blocks/core.rs"); // CoreBlocks
include!("blocks/flow.rs"); // FlowBlocks
include!("blocks/hash.rs"); // HashBlocks
include!("blocks/io.rs"); // IoBlocks
include!("blocks/math.rs"); // MathBlocks
include!("blocks/sys.rs"); // SysBlocks
include!("blocks/text.rs"); // TextBlocks
pub mod blocks {
use super::*;

include!("blocks/core.rs"); // CoreBlocks
include!("blocks/flow.rs"); // FlowBlocks
include!("blocks/hash.rs"); // HashBlocks
include!("blocks/io.rs"); // IoBlocks
include!("blocks/math.rs"); // MathBlocks
include!("blocks/sys.rs"); // SysBlocks
include!("blocks/text.rs"); // TextBlocks
}
pub use blocks::*;

pub trait AllBlocks:
CoreBlocks + FlowBlocks + HashBlocks + IoBlocks + MathBlocks + SysBlocks + TextBlocks
Expand Down
6 changes: 2 additions & 4 deletions lib/protoflow-blocks/src/system.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,10 @@
#![allow(dead_code)]

use crate::{
blocks::*,
prelude::{fmt, Arc, Box, Bytes, FromStr, Rc, String, ToString},
types::{DelayType, Encoding},
AllBlocks, Buffer, ConcatStrings, Const, CoreBlocks, Count, Decode, DecodeCsv, DecodeHex,
DecodeJson, Delay, Drop, Encode, EncodeCsv, EncodeHex, EncodeJson, FlowBlocks, HashBlocks,
IoBlocks, MathBlocks, Random, ReadDir, ReadEnv, ReadFile, ReadStdin, SplitString, SysBlocks,
TextBlocks, WriteFile, WriteStderr, WriteStdout,
AllBlocks, CoreBlocks, FlowBlocks, HashBlocks, IoBlocks, MathBlocks, SysBlocks, TextBlocks,
};
#[cfg(all(feature = "std", feature = "serde"))]
use crate::{ReadSocket, WriteSocket};
Expand Down
Loading