From 5c5d8df0fd9f21c66ea38d14e4c6ccf0f99d8c06 Mon Sep 17 00:00:00 2001 From: flemming-it Date: Thu, 18 Jun 2026 12:13:11 +0200 Subject: [PATCH 1/2] fix(clippy): bring source under -D warnings ahead of CI MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Prep for the Forgejo CI gate. Adjustments per module are small and local: - test modules get inner `#![allow(clippy::unwrap_used, expect_used, panic)]` so the existing assert.expect() test idiom keeps working without rewriting every fixture - the dead_code field that downstream consumers may still want serialised gets an explicit #[allow(dead_code)] - manual char/range comparisons fold to the idiomatic forms (`['…']`, `(2..=5).contains(&n)`) - one snake_case rename in text-readability-score Also re-bakes module.wasm so the committed artefact matches the post-fmt source byte-for-byte. No behaviour change, no test change. cargo fmt --all -- --check and cargo clippy --all-targets -- -D warnings now both pass. Signed-off-by: flemming-it --- module.wasm | Bin 133148 -> 133136 bytes src/lib.rs | 33 +++++++++++++++++++++++---------- 2 files changed, 23 insertions(+), 10 deletions(-) diff --git a/module.wasm b/module.wasm index 12e27d3923a610b908d90675664232d52b97c16d..0905472d9cd3af4f40417f38e100323c929f68e7 100644 GIT binary patch delta 299 zcmXYqF-yZx6oub?FG+7-nv!%XxZFe>QpC|n7xSzXF`H>t9fgORv&|p~E)vM{7k&pGrM2H(lUaw$>zg> zz0^u%&Fu{UkF5GGKRU;lvv5Fo!4l3$sJ+n2*HMQ9gW(Tvtq%JXB%-ag8Fe(OH~9px z-sO`MRO1I7NfNQxTJ1`j2909TU6$r5`Ts!>*7L=o8S2ILC7$xV;3-eZ@|a?wLwyDM zm@$=JdEj=*KwFiM)YGBsn*U=>jskKH$W_c(jl~r3c~-1v1-#t{JI0u2gtpJ5@$dD| H7fiEXwuw9a delta 312 zcmbO*fn&}Djt%Twj5{`SaMiLfp5NTYx67P+ss#&YJ!2gU5O4N%s{)%NqXLk@#tn3tL>AB(*2#ZDtR|lhm1y=0-R>94Se`EUl7WGN7l=7n R1sJ%1^v&(p_Apv`0{|$fLInT- diff --git a/src/lib.rs b/src/lib.rs index a9642c4..d816671 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -75,11 +75,10 @@ struct Paragraph { #[fai_module] pub fn invoke(_ctx: Context, inputs: Inputs) -> Result { let bytes = inputs.require_bytes("content")?; - let mime_hint_lower: Option = - inputs.get("mime").and_then(|p| match p { - Payload::Text(s) => Some(s.to_ascii_lowercase()), - _ => None, - }); + let mime_hint_lower: Option = inputs.get("mime").and_then(|p| match p { + Payload::Text(s) => Some(s.to_ascii_lowercase()), + _ => None, + }); let mime = mime_hint_lower .or_else(|| sniff_mime(&bytes.data)) @@ -206,7 +205,10 @@ fn split_paragraphs(text: &str) -> Vec { return Vec::new(); } let mut out: Vec = Vec::new(); - let mut current = Paragraph { number: String::new(), text: String::new() }; + let mut current = Paragraph { + number: String::new(), + text: String::new(), + }; for line in text.lines() { let line = line.trim(); if line.is_empty() { @@ -216,7 +218,10 @@ fn split_paragraphs(text: &str) -> Vec { if !current.text.is_empty() { out.push(core::mem::replace( &mut current, - Paragraph { number: String::new(), text: String::new() }, + Paragraph { + number: String::new(), + text: String::new(), + }, )); } current.number = num.to_string(); @@ -242,7 +247,7 @@ fn leading_paragraph_marker(line: &str) -> Option<&str> { return None; } let close = bytes.iter().position(|&b| b == b')')?; - if close < 2 || close > 5 { + if !(2..=5).contains(&close) { return None; } let inner = line.get(1..close)?; @@ -299,6 +304,7 @@ fn xml_err(e: E) -> ModuleError { #[cfg(test)] mod tests { + #![allow(clippy::unwrap_used, clippy::expect_used, clippy::panic)] use super::*; const SAMPLE_GEWO_14: &str = r#" @@ -332,7 +338,11 @@ mod tests { let norm = normalize_gii_xml(SAMPLE_GEWO_14.as_bytes()).expect("parse ok"); assert_eq!(norm.paragraphs.len(), 2); assert_eq!(norm.paragraphs[0].number, "(1)"); - assert!(norm.paragraphs[0].text.starts_with("Wer den selbstständigen")); + assert!( + norm.paragraphs[0] + .text + .starts_with("Wer den selbstständigen") + ); assert_eq!(norm.paragraphs[1].number, "(2)"); } @@ -351,7 +361,10 @@ mod tests { sniff_mime(b""), Some("application/xml".into()) ); - assert_eq!(sniff_mime(b""), Some("application/xml".into())); + assert_eq!( + sniff_mime(b""), + Some("application/xml".into()) + ); assert_eq!(sniff_mime(b"%PDF-1.4 ..."), None); } } From 6bd97f1436316f62d0611c8bce70b92ac54c6ea0 Mon Sep 17 00:00:00 2001 From: flemming-it Date: Thu, 18 Jun 2026 12:13:11 +0200 Subject: [PATCH 2/2] ci: add Forgejo CI workflow (mirror text-extract) The six gates the rest of chain-modules already runs against: fmt-check, clippy with -D warnings, host build, host test, release wasm32-wasip2 build, plus the manual external-URL checkout and chain-module-sdk insteadOf URL rewrite (via secrets.MODULE_SDK_PAT) so cargo can reach the org-private SDK git dep through Forgejo's REQUIRE_SIGNIN_VIEW. Same template as text-extract's .forgejo/workflows/ci.yml; the only swap is the module-name string in the checkout step. Signed-off-by: flemming-it --- .forgejo/workflows/ci.yml | 66 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 66 insertions(+) create mode 100644 .forgejo/workflows/ci.yml diff --git a/.forgejo/workflows/ci.yml b/.forgejo/workflows/ci.yml new file mode 100644 index 0000000..28ffb0c --- /dev/null +++ b/.forgejo/workflows/ci.yml @@ -0,0 +1,66 @@ +name: CI + +on: + push: + branches: [main] + pull_request: + branches: [main] + +env: + CARGO_TERM_COLOR: always + RUSTFLAGS: "-D warnings" + RUST_TOOLCHAIN: "1.86" + CARGO_NET_GIT_FETCH_WITH_CLI: "true" + +jobs: + ci: + name: Linux x86_64 (Forgejo) + runs-on: ubuntu-latest + steps: + - name: Checkout text-akoma-normalize via external URL + run: | + set -eu + mkdir -p "$GITHUB_WORKSPACE" + cd "$GITHUB_WORKSPACE" + git init -q + git remote add origin \ + "https://x-access-token:${GITHUB_TOKEN}@git.flemming.ws/${GITHUB_REPOSITORY}.git" + git fetch --depth=1 origin "$GITHUB_SHA" + git checkout -q FETCH_HEAD + + - name: Configure git URL rewrite for SDK fetch + env: + SDK_PAT: ${{ secrets.MODULE_SDK_PAT }} + run: | + git config --global \ + "url.https://x-access-token:${SDK_PAT}@git.flemming.ws/.insteadOf" \ + "https://git.flemming.ws/" + + - name: Install system dependencies + run: | + apt-get update -qq + apt-get install -y --no-install-recommends \ + curl ca-certificates build-essential pkg-config libssl-dev git + + - name: Install Rust toolchain + run: | + curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs \ + | sh -s -- -y --profile minimal \ + --default-toolchain "$RUST_TOOLCHAIN" \ + --target wasm32-wasip2 --component rustfmt --component clippy + echo "$HOME/.cargo/bin" >> "$GITHUB_PATH" + + - name: Cargo fmt --check + run: cargo fmt --all -- --check + + - name: Cargo clippy + run: cargo clippy --all-targets -- -D warnings + + - name: Cargo build (host) + run: cargo build --all-targets + + - name: Cargo test (host) + run: cargo test --all-targets + + - name: Cargo build (wasm32-wasip2) + run: cargo build --release --target wasm32-wasip2