restructuring complete

.gitea/workflows/cargo-publish.yaml

@@ -4,28 +4,27 @@ on:
     branches:
       - master
 
-#jobs:
-#  format:
-#    name: cargo CI
-#    permissions:
-#      # Give the default GITHUB_TOKEN write permission to commit and push the
-#      # added or changed files to the repository.
-#      contents: write
-#    steps:
-#      - name: get repo
-#        uses: actions/checkout@v4
-#      - name: install rust
-#        uses: dtolnay/rust-toolchain@stable
-#      - name: config custom registry
-#        run: |
-#          mkdir -p ~/.cargo/
-#          echo -e '[registry]
-#          cscherr= "cscherr"
-#
-#          [registries.cscherr]
-#          index = "sparse+https://git.cscherr.de/api/packages/PlexSheep/cargo/"
-#          ' > ~/.cargo/config.toml
-#          cat ~/.cargo/config.toml
-#      - name: publish crates on git.cscherr.de
-#        run: |
-#            cargo workspaces publish --registry cscherr
+jobs:
+  format:
+    name: cargo CI
+    permissions:
+      # Give the default GITHUB_TOKEN write permission to commit and push the
+      # added or changed files to the repository.
+      contents: write
+    steps:
+      - name: get repo
+        uses: actions/checkout@v4
+      - name: install rust
+        uses: dtolnay/rust-toolchain@stable
+      - name: config custom registry
+        run: |
+          mkdir -p ~/.cargo/
+          echo "" > ~/.cargo/config.toml
+          echo "[registry]" >> ~/.cargo/config.toml
+          echo 'cscherr = "cscherr"' >> ~/.cargo/config.toml
+          echo '[registries.cscherr]' >> ~/.cargo/config.toml
+          echo 'index = "https://git.cscherr.de/PlexSheep/_cargo-index.git"' >> ~/.cargo/config.toml
+          cat ~/.cargo/config.toml
+      - name: publish crates on git.cscherr.de
+        run: |
+          cargo workspaces publish --registry cscherr

.gitea/workflows/cargo.yaml

@@ -1,4 +1,4 @@
-name: Cargo Check, Format, Fix and Test
+name: cargo devel CI
 on:
   push:
     branches:
@@ -22,11 +22,11 @@ jobs:
       - name: config custom registry
         run: |
           mkdir -p ~/.cargo/
-          echo -e '[registry]\n\
-          cscherr= "cscherr"\n\
-
-          [registries.cscherr]\n\
-          index = "sparse+https://git.cscherr.de/api/packages/PlexSheep/cargo/"' > ~/.cargo/config.toml
+          echo "" > ~/.cargo/config.toml
+          echo "[registry]" >> ~/.cargo/config.toml
+          echo 'cscherr = "cscherr"' >> ~/.cargo/config.toml
+          echo '[registries.cscherr]' >> ~/.cargo/config.toml
+          echo 'index = "https://git.cscherr.de/PlexSheep/_cargo-index.git"' >> ~/.cargo/config.toml
           cat ~/.cargo/config.toml
       - name: cargo check
         run: cargo check --all-features --all-targets

Cargo.toml

@@ -55,7 +55,7 @@ math = []
 log = []
 bintols = []
 net = []
-bin = ["bintols", "math", "dep:clap", "dep:clap-num", "dep:clap-verbosity-flag"]
+bin = ["dep:clap", "dep:clap-num", "dep:clap-verbosity-flag"]
 
 [lib]
 name = "libpt"
@@ -68,10 +68,12 @@ crate-type = [
 [[bin]]
 name = "ccc"
 path = "src/ccc/mod.rs"
+required-features = ["bin", "math"]
 
 [[bin]]
 name = "hedu"
 path = "src/hedu/mod.rs"
+required-features = ["bin", "bintols"]
 
 
 [dependencies]

members/libpt-bintols/src/hedu/mod.rs

@@ -6,7 +6,7 @@
 //! This crate is currently empty.
 
 use anyhow::{bail, Result};
-use libpt_bintols::display::{bytes_to_bin, humanbytes};
+use crate::display::{bytes_to_bin, humanbytes};
 use libpt_log::{debug, error, info, trace, warn};
 use std::io::{prelude::*, BufReader, Read, SeekFrom};
 

members/libpt-bintols/src/lib.rs

@@ -25,3 +25,4 @@ pub const YOBI: u128 = 2u128.pow(80);
 // use libpt_core;
 pub mod datalayout;
 pub mod display;
+pub mod hedu;

members/libpt-math/src/ccc/mod.rs

@@ -19,8 +19,6 @@
 #![warn(clippy::pedantic)]
 
 //// IMPORTS ///////////////////////////////////////////////////////////////////////////////////////
-use libpt_log;
-use libpt_math;
 
 //// TYPES /////////////////////////////////////////////////////////////////////////////////////////
 

members/libpt-math/src/lib.rs

@@ -15,6 +15,7 @@
 #![warn(clippy::pedantic)]
 
 //// IMPORTS ///////////////////////////////////////////////////////////////////////////////////////
+pub mod ccc;
 
 //// TYPES /////////////////////////////////////////////////////////////////////////////////////////
 

src/hedu/mod.rs

@@ -13,7 +13,7 @@
 
 //// IMPORTS ///////////////////////////////////////////////////////////////////////////////////////
 
-use libpt::{hedu::*, log::*};
+use libpt::{log::*, bintols::hedu::*};
 
 use clap::Parser;
 use clap_verbosity_flag::{InfoLevel, Verbosity};
@@ -88,6 +88,11 @@ pub struct Cli {
     /// If left empty or set as "-", the program will read from stdin.
     pub data_source: Option<String>,
 }
+impl Cli {
+    fn parse() -> Cli {
+        todo!()
+    }
+}
 
 //// IMPLEMENTATION ////////////////////////////////////////////////////////////////////////////////
 

src/lib.rs

@@ -12,8 +12,6 @@ pub use libpt_bintols as bintols;
 pub use libpt_ccc as ccc;
 #[cfg(feature = "core")]
 pub use libpt_core as core;
-#[cfg(feature = "hedu")]
-pub use libpt_hedu as hedu;
 #[cfg(feature = "log")]
 pub use libpt_log as log;
 #[cfg(feature = "math")]