From 8b84aaaf612b1c4414d4d7285cce2eeced96327b Mon Sep 17 00:00:00 2001 From: p11 Date: Sun, 12 Nov 2023 12:11:59 +0100 Subject: [PATCH] Updated pukram2html version, no need to add newline at end of block anymore --- Cargo.lock | 15 ++++++++------- src/main.rs | 29 ++++++++++++----------------- 2 files changed, 20 insertions(+), 24 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 26d45b0..23b90d0 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -8,11 +8,6 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "405b47b778683e13f388382bf1fb59e54e1008a2e6d048fb2b63672632863c95" -[[package]] -name = "formatting" -version = "0.1.0" -source = "git+https://gitlab.com/porky11/formatting#7edec9731c042bd2cdd7f3a1674cb2e1b0303e42" - [[package]] name = "hermit-abi" version = "0.3.2" @@ -102,6 +97,12 @@ dependencies = [ "unicode-ident", ] +[[package]] +name = "pukram-formatting" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1bee8fffac6d7af5542feccd3e2010dffcc1384498ed0834712c4958ece2fe7" + [[package]] name = "pukram-server" version = "0.1.0" @@ -116,9 +117,9 @@ dependencies = [ [[package]] name = "pukram2html" version = "0.1.0" -source = "git+https://gitlab.com/porky11/pukram2html#fd8d848986f80ea9ec173fd0b91966f88ea6fa6d" +source = "git+https://gitlab.com/porky11/pukram2html#ba7292d514eccc10c2774f97dccb9e871234e982" dependencies = [ - "formatting", + "pukram-formatting", ] [[package]] diff --git a/src/main.rs b/src/main.rs index f3a318a..297a125 100644 --- a/src/main.rs +++ b/src/main.rs @@ -472,15 +472,13 @@ fn handle_relative_connection( let mut has_text = false; convert_extended( - lines - .take_while(|line| { - let empty = line.trim().is_empty(); - if !empty { - has_text = true; - } - !empty || !has_text - }) - .chain(std::iter::once(String::new())), + lines.take_while(|line| { + let empty = line.trim().is_empty(); + if !empty { + has_text = true; + } + !empty || !has_text + }), &mut stream, Settings::default() .with_handler(handle_entry) @@ -539,14 +537,11 @@ fn handle_relative_connection( } } convert_subheader( - lines - .clone() - .take_while(|line| { - let empty = line.trim().is_empty(); - last_empty = empty; - empty && !last_empty - }) - .chain(std::iter::once(String::new())), + lines.clone().take_while(|line| { + let empty = line.trim().is_empty(); + last_empty = empty; + empty && !last_empty + }), &mut stream, 1, );