Adopt and apply nightly rustfmt configuration

.rustfmt.toml

@@ -1,27 +1,33 @@
 unstable_features = true
-match_block_trailing_comma = true
 max_width = 80
-reorder_imports = false
+inline_attribute_width = 40
-reorder_modules = false
+
-use_field_init_shorthand = true
-use_try_shorthand = true
 skip_macro_invocations = ["concat"]
 
-# not stabilized yet
+imports_granularity = "Crate"
-# blank_lines_lower_bound = 1
+group_imports = "StdExternalCrate"
-# where_single_line = true
+
-# overflow_delimited_expr = true
+fn_single_line = true
-# normalize_doc_attributes = true
+match_block_trailing_comma = true
-# normalize_comments = true
+use_field_init_shorthand = true
-# inline_attribute_width = 40
+use_try_shorthand = true
-# imports_granularity = "Crate"
+hex_literal_case = "Lower"
-# hex_literal_case = "Lower"
+where_single_line = true
-# group_imports = "StdExternalCrate"
+condense_wildcard_suffixes = true
-# format_strings = true
+combine_control_expr = false
-# force_multiline_blocks = true
+empty_item_single_line = true
-# error_on_unformatted = true
+reorder_impl_items = true
-# error_on_line_overflow = true
+trailing_semicolon = false
-# condense_wildcard_suffixes = true
+
-# doc_comment_code_block_width = 70
+wrap_comments = true
-# format_code_in_doc_comments = true
+normalize_comments = true
-# wrap_comments = true
+normalize_doc_attributes = true
+format_code_in_doc_comments = true
+doc_comment_code_block_width = 70
+
+error_on_unformatted = true
+error_on_line_overflow = true
+
+ignore = [
+    "tests/mocks",
+]

src/graph.rs

@@ -1,24 +1,24 @@
 use std::{collections::HashMap, path::PathBuf};
 
-use serde::{Serialize, Deserialize};
+pub use edge::Edge;
+pub use meta::{Config, Meta};
+pub use node::Node;
+use serde::{Deserialize, Serialize};
 
-use crate::syntax::{
+use crate::{
-    command::Arguments,
+    prelude::*,
-    content::{
+    syntax::{
-        self,
+        command::Arguments,
-        parser::{flatten, Token, token::Anchor},
+        content::{
+            self,
+            parser::{Token, flatten, token::Anchor},
+        },
     },
 };
-use crate::prelude::*;
-pub use {
-    node::Node,
-    edge::Edge,
-    meta::{Meta, Config},
-};
 
-pub mod node;
 pub mod edge;
 pub mod meta;
+pub mod node;
 
 #[derive(Serialize, Deserialize, Clone, Default, PartialEq, Eq, Debug)]
 pub struct Graph {
@@ -399,7 +399,7 @@ impl Graph {
         } else {
             log!(
                 VERBOSE,
-                "Chasing candidate for query {query}, collapsed {collapsed_query}"
+                "Chasing candidate: query {query}, collapsed {collapsed_query}"
             );
         }
 

src/graph/edge.rs

@@ -1,4 +1,4 @@
-use serde::{Serialize, Deserialize};
+use serde::{Deserialize, Serialize};
 
 #[derive(Serialize, Deserialize, Clone, Default, PartialEq, Eq, Debug)]
 pub struct Edge {

src/graph/meta.rs

@@ -1,6 +1,6 @@
-use crate::prelude::*;
+use serde::{Deserialize, Serialize};
 
-use serde::{Serialize, Deserialize};
+use crate::prelude::*;
 
 #[derive(Serialize, Deserialize, Clone, PartialEq, Eq, Debug)]
 pub struct Meta {
@@ -105,15 +105,9 @@ impl Default for Config {
 }
 
 // See: https://github.com/serde-rs/serde/issues/368
-fn mktrue() -> bool {
+fn mktrue() -> bool { true }
-    true
+fn mkfalse() -> bool { false }
-}
+fn mk8() -> u16 { 8 }
-fn mkfalse() -> bool {
-    false
-}
-fn mk8() -> u16 {
-    8
-}
 
 #[derive(Serialize, Deserialize, Clone, PartialEq, Eq, Debug)]
 pub struct Version {
@@ -314,9 +308,8 @@ impl std::fmt::Display for VersionErrorCause {
 
 #[cfg(test)]
 mod tests {
-    use crate::graph::Graph;
-
     use super::*;
+    use crate::graph::Graph;
 
     #[test]
     fn empty_footer_text() {

src/graph/node.rs

@@ -1,6 +1,6 @@
 use std::collections::HashMap;
 
-use serde::{Serialize, Deserialize};
+use serde::{Deserialize, Serialize};
 
 use super::edge::Edge;
 
@@ -118,7 +118,9 @@ mod tests {
         assert_eq!(
             format!("{node}"),
             format!(
-                "Node 404 [title:'Not Found' text:15l summary:{} redirect:{redirect}]",
+                "Node 404 [title:'Not Found' \
+                    text:15l summary:{} \
+                    redirect:{redirect}]",
                 summary.len(),
             )
         );

src/lib.rs

@@ -1,16 +1,17 @@
 use std::{sync, time};
 
 pub mod prelude {
-    pub use crate::log;
+    pub use crate::{
-    pub use crate::tlog;
+        log,
-    pub use crate::log::Level::*;
+        log::{Level::*, now},
-    pub use crate::log::now;
+        tlog,
+    };
 }
 
 pub mod graph;
+pub mod log;
 pub mod router;
 pub mod syntax;
-pub mod log;
 
 pub static ONSET: sync::LazyLock<time::Instant> =
     sync::LazyLock::new(time::Instant::now);

src/log.rs

@@ -32,7 +32,7 @@ impl Data {
         let path = make_display_path(captured_path, &env_level);
 
         let is_silent = env_level <= Level::SILENT;
-        let message_level_is_within_env_level = message_level <= env_level;
+        let level_within_env_level = message_level <= env_level;
         let excluded_in_code =
             !EXCLUSIONS.iter().all(|&s| !trace_string.contains(s));
         let excluded_by_env =
@@ -41,7 +41,7 @@ impl Data {
             filter.is_empty() || captured_path.contains(&filter);
 
         let should_log = !is_silent
-            && message_level_is_within_env_level
+            && level_within_env_level
             && !excluded_in_code
             && !excluded_by_env
             && matches_filter;
@@ -51,7 +51,7 @@ impl Data {
             eprintln!(
                 "Log decision for message from {path}: {should_log} given\n\
                 is_silent: {is_silent} (expected false)\n\
-                message_level_is_within_env_level: {message_level_is_within_env_level}\n\
+                level_within_env_level: {level_within_env_level}\n\
                 excluded_in_code: {excluded_in_code} (expected false)\n\
                 excluded_by_env: {excluded_by_env} (expected false)\n\
                 matches_filter: {matches_filter}\n\
@@ -118,9 +118,7 @@ macro_rules! tlog {
     }};
 }
 
-pub fn now() -> Instant {
+pub fn now() -> Instant { Instant::now() }
-    Instant::now()
-}
 
 #[allow(clippy::print_stderr)]
 pub fn elog(function: &str, message: &str) {
@@ -211,9 +209,7 @@ pub fn wrap(s: &str) -> String {
         }
     }
 
-    fn escape(s: &str) -> String {
+    fn escape(s: &str) -> String { s.escape_debug().collect() }
-        s.escape_debug().collect()
-    }
 
     symbolize(&quote(&escape(s)))
 }

src/router.rs

@@ -3,13 +3,13 @@ use axum::{Router, routing::get};
 use crate::graph::Graph;
 
 mod handlers {
-    pub mod graph;
-    pub mod template;
-    pub mod raw;
-    pub mod navigation;
-    pub mod fixed;
     pub mod error;
+    pub mod fixed;
+    pub mod graph;
     pub mod mime;
+    pub mod navigation;
+    pub mod raw;
+    pub mod template;
 }
 
 #[derive(Clone)]
@@ -49,11 +49,6 @@ pub fn new(graph: Graph) -> Router {
 
 #[cfg(test)]
 mod tests {
-    use crate::{
-        graph::{Graph, Config, Meta},
-    };
-
-    use super::*;
     use axum::{
         body::Body,
         http::{Request, StatusCode},
@@ -61,6 +56,9 @@ mod tests {
     };
     use tower::ServiceExt as _;
 
+    use super::*;
+    use crate::graph::{Config, Graph, Meta};
+
     async fn request(uri: &str, config: Option<&Config>) -> Response<Body> {
         let default_graph = Graph::load();
         let graph = Graph {

src/router/handlers/error.rs

@@ -68,10 +68,8 @@ pub async fn not_found(State(state): State<GlobalState>) -> Response<Body> {
 
 #[cfg(test)]
 mod tests {
-    use axum::{
+    use axum::{extract::State, http::StatusCode};
-        http::{StatusCode},
+
-        extract::State,
-    };
     use super::*;
 
     #[tokio::test]

src/router/handlers/fixed.rs

@@ -1,16 +1,13 @@
 use axum::{
+    body::Body,
+    extract::{Path, State},
     http::{HeaderValue, Response, StatusCode, header},
-    {
-        body::Body,
-        extract::{Path, State},
-    },
 };
 
-use crate::prelude::*;
 use crate::{
     graph::{Format, Graph, SerialErrorCause},
-    router::{GlobalState, handlers},
+    prelude::*,
-    router::handlers::mime::Mime,
+    router::{GlobalState, handlers, handlers::mime::Mime},
 };
 
 pub async fn file(

src/router/handlers/graph.rs

@@ -1,7 +1,8 @@
 use axum::{
-    extract::State,
+    body::Body,
-    response::IntoResponse as _,
+    extract::{Path, State},
-    {body::Body, extract::Path, http::Response, response::Redirect},
+    http::Response,
+    response::{IntoResponse as _, Redirect},
 };
 
 use crate::{
@@ -49,13 +50,10 @@ pub async fn node(
 
 #[cfg(test)]
 mod tests {
-    use axum::{
+    use axum::http::{HeaderName, StatusCode};
-        http::{HeaderName, StatusCode},
-    };
-
-    use crate::graph::{Format, Graph};
 
     use super::*;
+    use crate::graph::{Format, Graph};
 
     async fn wrap_node(query: &str) -> Response<Body> {
         let state = GlobalState {

src/router/handlers/navigation.rs

@@ -1,4 +1,6 @@
-use axum::{Form, body::Body, extract::State, http::Response, response::Redirect};
+use axum::{
+    Form, body::Body, extract::State, http::Response, response::Redirect,
+};
 
 use crate::{
     prelude::*,
@@ -58,9 +60,9 @@ pub struct Query {
 #[cfg(test)]
 mod tests {
     use axum::http::StatusCode;
-    use crate::graph::Graph;
 
     use super::*;
+    use crate::graph::Graph;
 
     async fn wrap_page(path: &str) -> Response<Body> {
         let state = GlobalState {

src/router/handlers/raw.rs

@@ -1,6 +1,6 @@
 use axum::{
     body::Body,
-    http::{header, HeaderValue, Response, StatusCode},
+    http::{HeaderValue, Response, StatusCode, header},
 };
 
 use crate::prelude::*;

src/router/handlers/template.rs

@@ -1,6 +1,6 @@
 use axum::{
     body::Body,
-    http::{header, Response, StatusCode},
+    http::{Response, StatusCode, header},
 };
 
 use crate::{
@@ -135,9 +135,8 @@ fn emergency_wrap(error: &tera::Error) -> String {
 
 #[cfg(test)]
 mod tests {
-    use crate::graph::Graph;
-
     use super::*;
+    use crate::graph::Graph;
 
     #[test]
     fn by_filename_forced_error() {

src/syntax/content.rs

@@ -1,6 +1,6 @@
 use std::mem::discriminant;
 
-use parser::{Token, Lexeme};
+use parser::{Lexeme, Token};
 
 use crate::graph::Graph;
 
@@ -43,9 +43,7 @@ impl TokenOutput {
     }
 }
 
-pub fn parse(text: &str, graph: &Graph) -> String {
+pub fn parse(text: &str, graph: &Graph) -> String { parser::read(text, graph) }
-    parser::read(text, graph)
-}
 
 pub fn rich_parse(text: &str, graph: &Graph) -> TokenOutput {
     parser::rich_read(text, graph)
@@ -53,9 +51,8 @@ pub fn rich_parse(text: &str, graph: &Graph) -> TokenOutput {
 
 #[cfg(test)]
 mod tests {
-    use crate::syntax::content::parser::token::{Bold, Oblique};
-
     use super::*;
+    use crate::syntax::content::parser::token::{Bold, Oblique};
 
     #[test]
     fn only() {

src/syntax/content/parser.rs

@@ -1,15 +1,18 @@
-use crate::{prelude::*, graph::Graph, syntax::content::TokenOutput};
 use context::{Block, Inline};
+pub use lexeme::Lexeme;
 use lexer::{LEXMAP, lex};
-pub use {lexeme::Lexeme, token::Token, state::State};
+pub use state::State;
+pub use token::Token;
+
+use crate::{graph::Graph, prelude::*, syntax::content::TokenOutput};
 
-pub mod token;
-pub mod lexer;
-pub mod lexeme;
-pub mod segment;
 pub mod context;
+pub mod lexeme;
+pub mod lexer;
 pub mod point;
+pub mod segment;
 pub mod state;
+pub mod token;
 
 fn parse(tokens: &[Token]) -> String {
     tokens.iter().map(Token::render).collect::<String>()
@@ -46,16 +49,10 @@ pub fn flatten(input: &str, graph: &Graph) -> String {
 
 #[cfg(test)]
 mod tests {
-    use crate::{
-        graph::Graph,
-        syntax::content::parser::{token::header::Level},
-    };
-
     use super::*;
+    use crate::{graph::Graph, syntax::content::parser::token::header::Level};
 
-    fn read_noconfig(input: &str) -> String {
+    fn read_noconfig(input: &str) -> String { read(input, &Graph::default()) }
-        read(input, &Graph::default())
-    }
 
     #[test]
     fn empty_render_is_empty() {
@@ -65,7 +62,10 @@ mod tests {
     #[test]
     fn mixed_sample() {
         let en = "`this |test|` tries ## to |brea|k|: things";
-        let html = r#"<p><code>this |test|</code> tries ## to <a class="detached" title="" href="/node/k">brea</a>: things</p>"#;
+        let html = concat!(
+            r#"<p><code>this |test|</code> tries ## to <a "#,
+            r#"class="detached" title="" href="/node/k">brea</a>: things</p>"#,
+        );
 
         assert_eq!(read_noconfig(en), html);
     }

src/syntax/content/parser/context.rs

@@ -3,9 +3,9 @@ use crate::syntax::content::parser::{
     token::{Header, Paragraph, PreFormat, Verse},
 };
 
+pub mod anchor;
 pub mod block;
 pub mod inline;
-pub mod anchor;
 pub mod list;
 pub mod quote;
 pub mod table;
@@ -68,7 +68,7 @@ pub fn close(state: &State, tokens: &mut Vec<Token>) {
 
 #[cfg(test)]
 mod tests {
-    use crate::syntax::content::parser::{context::Block, State};
+    use crate::syntax::content::parser::{State, context::Block};
 
     #[test]
     #[should_panic(expected = "End of input with open list")]

src/syntax/content/parser/context/anchor.rs

@@ -1,7 +1,7 @@
 use crate::{
-    prelude::*,
-    syntax::content::parser::{context::Inline, Lexeme, State, Token},
     graph::Graph,
+    prelude::*,
+    syntax::content::parser::{Lexeme, State, Token, context::Inline},
 };
 
 /// Handles open anchor contexts until an anchor token is fully parsed.
@@ -162,11 +162,9 @@ fn push(
 
 #[cfg(test)]
 mod tests {
-    use crate::{syntax::content::parser, graph::Graph};
+    use crate::{graph::Graph, syntax::content::parser};
 
-    fn read(input: &str) -> String {
+    fn read(input: &str) -> String { parser::read(input, &Graph::default()) }
-        parser::read(input, &Graph::default())
-    }
 
     #[test]
     fn flanking() {
@@ -188,7 +186,10 @@ mod tests {
     fn flanking_with_trailing_comma_and_space() {
         assert_eq!(
             read("|Node|, at"),
-            r#"<p><a class="detached" title="" href="/node/Node">Node</a>, at</p>"#
+            concat!(
+                r#"<p><a class="detached" title="" "#,
+                r#"href="/node/Node">Node</a>, at</p>"#,
+            )
         );
     }
 
@@ -204,7 +205,8 @@ mod tests {
     fn needless_three_pipe_anchor() {
         assert_eq!(
             read("|Node|Destination|"),
-            r#"<p><a class="detached" title="" href="/node/Destination">Node</a></p>"#
+            concat!(r#"<p><a class="detached" title="" "#,
+            r#"href="/node/Destination">Node</a></p>"#)
         );
     }
 
@@ -212,7 +214,10 @@ mod tests {
     fn nonleading_second_pipe() {
         assert_eq!(
             read("Go to Node|Destination|, here"),
-            r#"<p>Go to <a class="detached" title="" href="/node/Destination">Node</a>, here</p>"#,
+            concat!(
+                r#"<p>Go to <a class="detached" title="" "#,
+                r#"href="/node/Destination">Node</a>, here</p>"#
+            ),
         );
     }
 
@@ -220,7 +225,9 @@ mod tests {
     fn anchor_to_node_s() {
         assert_eq!(
             read("The |letter s|s|'s node: |s|!"),
-            r#"<p>The <a class="detached" title="" href="/node/s">letter s</a>'s node: <a class="detached" title="" href="/node/s">s</a>!</p>"#
+            concat!(r#"<p>The <a class="detached" title="" "#,
+                r#"href="/node/s">letter s</a>'s node: "#,
+                r#"<a class="detached" title="" href="/node/s">s</a>!</p>"#)
         );
     }
 
@@ -228,7 +235,10 @@ mod tests {
     fn nonleading_plural_anchor() {
         assert_eq!(
             read("The flower|s bloomed"),
-            r#"<p>The <a class="detached" title="" href="/node/flower">flowers</a> bloomed</p>"#
+            concat!(
+                r#"<p>The <a class="detached" title="" "#,
+                r#"href="/node/flower">flowers</a> bloomed</p>"#,
+            )
         );
     }
 
@@ -236,7 +246,9 @@ mod tests {
     fn leading_plural_anchor() {
         assert_eq!(
             read("Interfaces are |element|s of |system|s."),
-            r#"<p>Interfaces are <a class="detached" title="" href="/node/element">elements</a> of <a class="detached" title="" href="/node/system">systems</a>.</p>"#
+            concat!(r#"<p>Interfaces are <a class="detached" title="" "#,
+                r#"href="/node/element">elements</a> of <a class="detached" "#,
+                r#"title="" href="/node/system">systems</a>.</p>"#)
         );
     }
 
@@ -244,7 +256,11 @@ mod tests {
     fn leading_multiword_anchor() {
         assert_eq!(
             read("interactions are |basic elements| of systems"),
-            r#"<p>interactions are <a class="detached" title="" href="/node/basic elements">basic elements</a> of systems</p>"#
+            concat!(
+                r#"<p>interactions are <a class="detached" title="""#,
+                r#" href="/node/basic elements">basic elements</a> "#,
+                r#"of systems</p>"#,
+            ),
         );
     }
 
@@ -252,7 +268,9 @@ mod tests {
     fn explicit_end_of_destination() {
         assert_eq!(
             read("interactions are |basic elements|BasicElements| of systems"),
-            r#"<p>interactions are <a class="detached" title="" href="/node/BasicElements">basic elements</a> of systems</p>"#
+            concat!(r#"<p>interactions are <a class="detached" title="" "#,
+                r#"href="/node/BasicElements">basic elements</a> of "#,
+                r#"systems</p>"#)
         );
     }
 
@@ -260,7 +278,11 @@ mod tests {
     fn explicit_end_of_external_destination() {
         assert_eq!(
             read("this |anchor example|https://example.com| is external"),
-            r#"<p>this <a class="external" title="" href="https://example.com">anchor example</a> is external</p>"#
+            concat!(
+                r#"<p>this <a class="external" title="" "#,
+                r#"href="https://example.com">anchor example</a> is "#,
+                r#"external</p>"#
+            )
         );
     }
 
@@ -276,7 +298,10 @@ mod tests {
     fn external_anchor_destination_at_eoi() {
         assert_eq!(
             read("a b|https://example.com"),
-            r#"<p>a <a class="external" title="" href="https://example.com">b</a></p>"#
+            concat!(
+                r#"<p>a <a class="external" title="" "#,
+                r#"href="https://example.com">b</a></p>"#,
+            )
         );
     }
 
@@ -284,7 +309,10 @@ mod tests {
     fn nonleading_plural_anchor_at_eoi() {
         assert_eq!(
             read("element|s"),
-            r#"<p><a class="detached" title="" href="/node/element">elements</a></p>"#
+            concat!(
+                r#"<p><a class="detached" title="" "#,
+                r#"href="/node/element">elements</a></p>"#,
+            )
         );
     }
 
@@ -292,17 +320,22 @@ mod tests {
     fn leading_plural_anchor_at_eoi() {
         assert_eq!(
             read("|element|s"),
-            r#"<p><a class="detached" title="" href="/node/element">elements</a></p>"#
+            concat!(
+                r#"<p><a class="detached" title="" "#,
+                r#"href="/node/element">elements</a></p>"#,
+            )
         );
     }
 
     #[test]
     fn http_external_anchor() {
         assert_eq!(
-            read(
+            read("a |false dichotomy|https://wikipedia.org/False_dilemma|."),
-                "a |false dichotomy|https://en.wikipedia.org/wiki/False_dilemma|."
+            concat!(
+                r#"<p>a <a class="external" title="" "#,
+                r#"href="https://wikipedia.org/False_dilemma">"#,
+                r#"false dichotomy</a>.</p>"#,
             ),
-            r#"<p>a <a class="external" title="" href="https://en.wikipedia.org/wiki/False_dilemma">false dichotomy</a>.</p>"#
         );
     }
 
@@ -315,7 +348,8 @@ mod tests {
                 "at rustup.rs",
             )),
             concat!(
-                r#"<p><a class="external" title="" href="https://rustup.rs/">Rust toolchain</a>"#,
+                r#"<p><a class="external" title="" "#,
+                r#"href="https://rustup.rs/">Rust toolchain</a>"#,
                 "\n",
                 "at rustup.rs</p>",
             )
@@ -326,7 +360,11 @@ mod tests {
     fn http_external_anchor_leading_no_third_then_space() {
         assert_eq!(
             read("|Rust toolchain|https://rustup.rs/ at rustup.rs"),
-            r#"<p><a class="external" title="" href="https://rustup.rs/">Rust toolchain</a> at rustup.rs</p>"#
+            concat!(
+                r#"<p><a class="external" title="" "#,
+                r#"href="https://rustup.rs/">Rust toolchain</a> "#,
+                r#"at rustup.rs</p>"#,
+            ),
         );
     }
 
@@ -334,7 +372,10 @@ mod tests {
     fn http_external_anchor_leading_no_third_then_eoi() {
         assert_eq!(
             read("|Rust toolchain|https://rustup.rs/"),
-            r#"<p><a class="external" title="" href="https://rustup.rs/">Rust toolchain</a></p>"#
+            concat!(
+                r#"<p><a class="external" title="" "#,
+                r#"href="https://rustup.rs/">Rust toolchain</a></p>"#,
+            )
         );
     }
 
@@ -344,7 +385,10 @@ mod tests {
             read("\n|SomeAnchor|\n"),
             concat!(
                 "\n",
-                r#"<p><a class="detached" title="" href="/node/SomeAnchor">SomeAnchor</a></p>"#
+                concat!(
+                    r#"<p><a class="detached" title="" "#,
+                    r#"href="/node/SomeAnchor">SomeAnchor</a></p>"#,
+                )
             ),
         );
     }
@@ -354,9 +398,11 @@ mod tests {
         assert_eq!(
             read("|SomeAnchor|\n|SomeOtherAnchor|\n"),
             concat!(
-                r#"<p><a class="detached" title="" href="/node/SomeAnchor">SomeAnchor</a>"#,
+                r#"<p><a class="detached" title="" "#,
+                r#"href="/node/SomeAnchor">SomeAnchor</a>"#,
                 "\n",
-                r#"<a class="detached" title="" href="/node/SomeOtherAnchor">SomeOtherAnchor</a></p>"#
+                r#"<a class="detached" title="" "#,
+                r#"href="/node/SomeOtherAnchor">SomeOtherAnchor</a></p>"#,
             )
         );
     }
@@ -366,10 +412,12 @@ mod tests {
         assert_eq!(
             read("|SomeAnchor|\n\n|SomeOtherAnchor|\n"),
             concat!(
-                r#"<p><a class="detached" title="" href="/node/SomeAnchor">SomeAnchor</a></p>"#,
+                r#"<p><a class="detached" title="" "#,
+                r#"href="/node/SomeAnchor">SomeAnchor</a></p>"#,
                 "\n",
                 "\n",
-                r#"<p><a class="detached" title="" href="/node/SomeOtherAnchor">SomeOtherAnchor</a></p>"#
+                r#"<p><a class="detached" title="" "#,
+                r#"href="/node/SomeOtherAnchor">SomeOtherAnchor</a></p>"#,
             ),
         );
     }
@@ -378,7 +426,10 @@ mod tests {
     fn trailing_anchor() {
         assert_eq!(
             read("see acks|acks"),
-            r#"<p>see <a class="detached" title="" href="/node/acks">acks</a></p>"#
+            concat!(
+                r#"<p>see <a class="detached" title="" "#,
+                r#"href="/node/acks">acks</a></p>"#,
+            )
         );
     }
 
@@ -388,8 +439,9 @@ mod tests {
             read("\nsee acks|acks\n"),
             concat!(
                 "\n",
-                r#"<p>see <a class="detached" title="" href="/node/acks">acks</a></p>"#
+                r#"<p>see <a class="detached" title="" "#,
-            )
+                r#"href="/node/acks">acks</a></p>"#,
+            ),
         );
     }
 
@@ -417,7 +469,10 @@ mod tests {
     fn anchor_with_trailing_single_quote() {
         assert_eq!(
             read("the |lion|'s mouth"),
-            r#"<p>the <a class="detached" title="" href="/node/lion">lion</a>'s mouth</p>"#,
+            concat!(
+                r#"<p>the <a class="detached" title="" "#,
+                r#"href="/node/lion">lion</a>'s mouth</p>"#,
+            )
         );
     }
 
@@ -425,7 +480,10 @@ mod tests {
     fn anchor_with_trailing_double_quote() {
         assert_eq!(
             read(r#"the "|real|" motive"#),
-            r#"<p>the "<a class="detached" title="" href="/node/real">real</a>" motive</p>"#,
+            concat!(
+                r#"<p>the "<a class="detached" title="" "#,
+                r#"href="/node/real">real</a>" motive</p>"#,
+            )
         );
     }
 
@@ -433,7 +491,10 @@ mod tests {
     fn anchor_with_trailing_parenthesis() {
         assert_eq!(
             read("this (though |true|) was questioned"),
-            r#"<p>this (though <a class="detached" title="" href="/node/true">true</a>) was questioned</p>"#,
+            concat!(
+                r#"<p>this (though <a class="detached" title="" "#,
+                r#"href="/node/true">true</a>) was questioned</p>"#,
+            )
         );
     }
 
@@ -441,7 +502,10 @@ mod tests {
     fn anchor_with_leading_single_quote() {
         assert_eq!(
             read("the 'real|Reality' motive"),
-            r#"<p>the '<a class="detached" title="" href="/node/Reality">real</a>' motive</p>"#,
+            concat!(
+                r#"<p>the '<a class="detached" title="" "#,
+                r#"href="/node/Reality">real</a>' motive</p>"#,
+            )
         );
     }
 
@@ -449,7 +513,10 @@ mod tests {
     fn anchor_with_leading_double_quote() {
         assert_eq!(
             read(r#"the "real|Reality" motive"#),
-            r#"<p>the "<a class="detached" title="" href="/node/Reality">real</a>" motive</p>"#,
+            concat!(
+                r#"<p>the "<a class="detached" title="" "#,
+                r#"href="/node/Reality">real</a>" motive</p>"#,
+            )
         );
     }
 
@@ -457,7 +524,10 @@ mod tests {
     fn anchor_with_leading_parenthesis() {
         assert_eq!(
             read("her (last|Surname) name"),
-            r#"<p>her (<a class="detached" title="" href="/node/Surname">last</a>) name</p>"#,
+            concat!(
+                r#"<p>her (<a class="detached" title="" "#,
+                r#"href="/node/Surname">last</a>) name</p>"#,
+            )
         );
     }
 
@@ -465,7 +535,10 @@ mod tests {
     fn anchor_with_internal_apostrophe() {
         assert_eq!(
             read("the |lion's mouth|album was released"),
-            r#"<p>the <a class="detached" title="" href="/node/album">lion's mouth</a> was released</p>"#
+            concat!(
+                r#"<p>the <a class="detached" title="" "#,
+                r#"href="/node/album">lion's mouth</a> was released</p>"#,
+            )
         );
     }
 
@@ -473,7 +546,10 @@ mod tests {
     fn nonleading_anchor_with_internal_apostrophe() {
         assert_eq!(
             read("they decided to stay at Jane's|YellowHouse that night"),
-            r#"<p>they decided to stay at <a class="detached" title="" href="/node/YellowHouse">Jane's</a> that night</p>"#
+            concat!(
+                r#"<p>they decided to stay at <a class="detached" title="" "#,
+                r#"href="/node/YellowHouse">Jane's</a> that night</p>"#,
+            )
         );
     }
 
@@ -481,7 +557,10 @@ mod tests {
     fn nonleading_anchor_with_internal_apostrophe_at_eoi() {
         assert_eq!(
             read("they decided to stay at Jane's|YellowHouse"),
-            r#"<p>they decided to stay at <a class="detached" title="" href="/node/YellowHouse">Jane's</a></p>"#
+            concat!(
+                r#"<p>they decided to stay at <a class="detached" "#,
+                r#"title="" href="/node/YellowHouse">Jane's</a></p>"#,
+            )
         );
     }
 
@@ -489,7 +568,10 @@ mod tests {
     fn nonleading_anchor_with_internal_apostrophe_at_soi() {
         assert_eq!(
             read("Jane's|YellowHouse that night"),
-            r#"<p><a class="detached" title="" href="/node/YellowHouse">Jane's</a> that night</p>"#
+            concat!(
+                r#"<p><a class="detached" title="" "#,
+                r#"href="/node/YellowHouse">Jane's</a> that night</p>"#,
+            )
         );
     }
 
@@ -497,7 +579,10 @@ mod tests {
     fn anchor_with_internal_double_quotes() {
         assert_eq!(
             read(r#"the |"real"|Truth motive"#),
-            r#"<p>the <a class="detached" title="" href="/node/Truth">"real"</a> motive</p>"#,
+            concat!(
+                r#"<p>the <a class="detached" title="" "#,
+                r#"href="/node/Truth">"real"</a> motive</p>"#,
+            )
         );
     }
 
@@ -505,7 +590,10 @@ mod tests {
     fn anchor_with_internal_double_quotes_wrapping_spaced_words() {
         assert_eq!(
             read(r#"the |"bare reality"|Ideology they believed"#),
-            r#"<p>the <a class="detached" title="" href="/node/Ideology">"bare reality"</a> they believed</p>"#,
+            concat!(
+                r#"<p>the <a class="detached" title="" "#,
+                r#"href="/node/Ideology">"bare reality"</a> they believed</p>"#,
+            )
         );
     }
 
@@ -513,7 +601,10 @@ mod tests {
     fn anchor_with_internal_parenthesis() {
         assert_eq!(
             read("her |last (name)|Surname was Amad"),
-            r#"<p>her <a class="detached" title="" href="/node/Surname">last (name)</a> was Amad</p>"#,
+            concat!(
+                r#"<p>her <a class="detached" title="" "#,
+                r#"href="/node/Surname">last (name)</a> was Amad</p>"#,
+            )
         );
     }
 
@@ -521,7 +612,11 @@ mod tests {
     fn anchor_with_internal_parenthesis_wrapping_spaced_words() {
         assert_eq!(
             read("this |truth (though questionable) was fine|Absurd to them "),
-            r#"<p>this <a class="detached" title="" href="/node/Absurd">truth (though questionable) was fine</a> to them</p>"#
+            concat!(
+                r#"<p>this <a class="detached" title="" "#,
+                r#"href="/node/Absurd">truth (though questionable) was "#,
+                r#"fine</a> to them</p>"#,
+            )
         );
     }
 }

src/syntax/content/parser/context/block.rs

@@ -8,7 +8,7 @@ use crate::{
         parser::{
             Block, Lexeme, State, Token,
             token::{
-                Header, List, LineBreak, Literal, Paragraph, PreFormat, Quote,
+                Header, LineBreak, List, Literal, Paragraph, PreFormat, Quote,
                 Table, Verse,
             },
         },
@@ -124,16 +124,14 @@ pub fn parse(
 mod tests {
 
     use crate::{
-        syntax::content::parser::{
-            self, Block, Token, context, State,
-            token::{Header, header::Level, PreFormat},
-        },
         graph::Graph,
+        syntax::content::parser::{
+            self, Block, State, Token, context,
+            token::{Header, PreFormat, header::Level},
+        },
     };
 
-    fn read(input: &str) -> String {
+    fn read(input: &str) -> String { parser::read(input, &Graph::default()) }
-        parser::read(input, &Graph::default())
-    }
 
     #[test]
     fn pre() {

src/syntax/content/parser/context/inline.rs

@@ -1,17 +1,16 @@
 use std::{iter::Peekable, slice::Iter};
 
 use crate::{
+    graph::Graph,
     prelude::*,
     syntax::content::{
         Parseable as _,
         parser::{
-            Lexeme, State,
+            Inline, Lexeme, State, Token, context,
             state::AnchorBuffer,
-            Inline, context, Token,
             token::{Anchor, Code, Literal},
         },
     },
-    graph::Graph,
 };
 
 pub fn parse(

src/syntax/content/parser/context/list.rs

@@ -1,11 +1,11 @@
 use std::{iter::Peekable, slice::Iter};
 
 use crate::{
+    graph::Graph,
     prelude::*,
     syntax::content::parser::{
-        context::Block, Token, Lexeme, State, state, token::Item, format,
+        Lexeme, State, Token, context::Block, format, state, token::Item,
     },
-    graph::Graph,
 };
 
 /// Handles open list contexts until a list is fully parsed.
@@ -88,13 +88,11 @@ pub fn parse(
 #[cfg(test)]
 mod tests {
     use crate::{
-        syntax::content::parser::{self, context::list::parse, Lexeme, State},
         graph::Graph,
+        syntax::content::parser::{self, Lexeme, State, context::list::parse},
     };
 
-    fn read(input: &str) -> String {
+    fn read(input: &str) -> String { parser::read(input, &Graph::default()) }
-        parser::read(input, &Graph::default())
-    }
 
     #[test]
     fn unordered_list() {

src/syntax/content/parser/context/table.rs

@@ -117,11 +117,9 @@ pub fn parse(
 
 #[cfg(test)]
 mod tests {
-    use crate::{syntax::content::parser, graph::Graph};
+    use crate::{graph::Graph, syntax::content::parser};
 
-    fn read(input: &str) -> String {
+    fn read(input: &str) -> String { parser::read(input, &Graph::default()) }
-        parser::read(input, &Graph::default())
-    }
 
     fn read_loaded(input: &str) -> String {
         parser::read(input, &Graph::load())
@@ -250,11 +248,13 @@ mod tests {
                 "<table>", "\n",
                 "    <tr>", "\n",
                 "        <td>a</td>", "\n",
-                r#"        <td><a class="detached" title="" href="/node/Node">Node</a></td>"#, "\n",
+                r#"        <td><a class="detached" title="" "#,
+                r#"href="/node/Node">Node</a></td>"#, "\n",
                 "        <td>c</td>", "\n",
                 "    </tr>", "\n",
                 "</table>", "\n",
-        ));
+        )
+        );
     }
 
     #[test]
@@ -270,11 +270,14 @@ mod tests {
                 "<table>", "\n",
                 "    <tr>", "\n",
                 "        <td>a</td>", "\n",
-                r#"        <td><a class="attached" title="A node is defined in your graph file starting with a table header of the form:" href="/node/Node">Node</a></td>"#, "\n",
+                r#"        <td><a class="attached" title="A node is defined "#,
+                r#"in your graph file starting with a table header of the "#,
+                r#"form:" href="/node/Node">Node</a></td>"#, "\n",
                 "        <td>c</td>", "\n",
                 "    </tr>", "\n",
                 "</table>", "\n",
-        ));
+        )
+        );
     }
 
     #[test]

src/syntax/content/parser/lexeme.rs

@@ -1,6 +1,6 @@
 use std::fmt;
 
-use crate::{syntax::content::parser::segment::delimiter::Delimiters};
+use crate::syntax::content::parser::segment::delimiter::Delimiters;
 
 #[derive(Clone, Debug, Default)]
 pub struct Lexeme {
@@ -22,25 +22,15 @@ impl Lexeme {
         }
     }
 
-    pub fn text(&self) -> String {
+    pub fn text(&self) -> String { self.text.clone() }
-        self.text.clone()
-    }
 
-    pub fn next(&self) -> String {
+    pub fn next(&self) -> String { self.next.clone() }
-        self.next.clone()
-    }
 
-    pub fn last(&self) -> bool {
+    pub fn last(&self) -> bool { self.last }
-        self.last
-    }
 
-    pub fn first(&self) -> bool {
+    pub fn first(&self) -> bool { self.first }
-        self.first
-    }
 
-    pub fn mutate_text(&mut self, new: &str) {
+    pub fn mutate_text(&mut self, new: &str) { self.text = new.to_string(); }
-        self.text = new.to_string();
-    }
 
     pub fn as_char(&self) -> Option<char> {
         if self.text.chars().count() == 1 {
@@ -141,9 +131,7 @@ impl Lexeme {
                 .is_some_and(|c| delimiters.is_delimiter(c))
     }
 
-    pub fn next_first_char(&self) -> Option<char> {
+    pub fn next_first_char(&self) -> Option<char> { self.next.chars().nth(0) }
-        self.next.chars().nth(0)
-    }
 
     pub fn match_first_char(&self, query: char) -> bool {
         self.text.chars().nth(0).is_some_and(|c| c == query)

src/syntax/content/parser/lexer.rs

@@ -1,13 +1,14 @@
 use crate::{
-    prelude::*,
     graph::Graph,
+    prelude::*,
     syntax::content::{
-        TokenOutput, Parseable as _, LexMap,
+        LexMap, Parseable as _, TokenOutput,
         parser::{
+            context,
             lexeme::Lexeme,
-            token::{Token, LineBreak, Literal},
+            point, segment,
             state::State,
-            segment, context, point,
+            token::{LineBreak, Literal, Token},
         },
     },
 };

src/syntax/content/parser/point.rs

@@ -58,17 +58,18 @@ pub fn parse(
 
 #[cfg(test)]
 mod tests {
-    use crate::{syntax::content::parser, graph::Graph};
+    use crate::{graph::Graph, syntax::content::parser};
 
-    fn read(input: &str) -> String {
+    fn read(input: &str) -> String { parser::read(input, &Graph::default()) }
-        parser::read(input, &Graph::default())
-    }
 
     #[test]
     fn oblique_anchor() {
         assert_eq!(
             read("w _|S|_ w"),
-            r#"<p>w <em><a class="detached" title="" href="/node/S">S</a></em> w</p>"#
+            concat!(
+                r#"<p>w <em><a class="detached" title="" "#,
+                r#"href="/node/S">S</a></em> w</p>"#,
+            )
         );
     }
 
@@ -76,7 +77,8 @@ mod tests {
     fn oblique_anchor_with_trailing_comma() {
         assert_eq!(
             read("w _|S|_, w"),
-            r#"<p>w <em><a class="detached" title="" href="/node/S">S</a></em>, w</p>"#
+            concat!(r#"<p>w <em><a class="detached" title="" "#,
+            r#"href="/node/S">S</a></em>, w</p>"#)
         );
     }
 
@@ -84,9 +86,17 @@ mod tests {
     fn oblique() {
         assert_eq!(
             read(
-                "_|this anchor is oblique|o as are these literals_ but not these _just these_, not this _and these with an |anc80r| again_"
+                "_|this anchor is oblique|o as are these literals_ but not \
+                    these _just these_, not this _and these with an |anc80r| \
+                    again_"
             ),
-            r#"<p><em><a class="detached" title="" href="/node/o">this anchor is oblique</a> as are these literals</em> but not these <em>just these</em>, not this <em>and these with an <a class="detached" title="" href="/node/anc80r">anc80r</a> again</em></p>"#
+            concat!(
+                r#"<p><em><a class="detached" title="" href="/node/o">"#,
+                r#"this anchor is oblique</a> as are these literals</em> "#,
+                r#"but not these <em>just these</em>, not this <em>and these "#,
+                r#"with an <a class="detached" title="" "#,
+                r#"href="/node/anc80r">anc80r</a> again</em></p>"#,
+            )
         );
     }
 

src/syntax/content/parser/segment.rs

@@ -1,6 +1,4 @@
-pub fn segment(text: &str) -> Vec<String> {
+pub fn segment(text: &str) -> Vec<String> { delimiter::atomize(text) }
-    delimiter::atomize(text)
-}
 
 pub mod delimiter {
 
@@ -146,7 +144,8 @@ pub mod delimiter {
         fn atomize_flankign_sentence() {
             assert_eq!(
                 atomize(
-                    "about_colors: the colors _amber_, _orange_ and _yellow mustard_ to `jane_bishop@mail.com`."
+                    "about_colors: the colors _amber_, _orange_ and \
+                        _yellow mustard_ to `jane_bishop@mail.com`."
                 ),
                 vec![
                     "about_colors",
@@ -188,7 +187,8 @@ pub mod delimiter {
         #[test]
         fn atomize_words() {
             let actual = atomize(
-                "    justification for  the actions   of those  who hold authority   inevitably dwindles  ",
+                "    justification for  the actions   of those  who hold \
+                    authority   inevitably dwindles  ",
             );
             let expected = vec![
                 " ",
@@ -285,7 +285,8 @@ pub mod delimiter {
         #[test]
         fn atomize_pipes_and_ticks() {
             let actual = atomize(
-                "every other |time| as `it could or |perhaps somehow|then or now| it was` perceived",
+                "every other |time| as `it could or |perhaps somehow|then or \
+                    now| it was` perceived",
             );
             let expected = vec![
                 "every",

src/syntax/content/parser/state.rs

@@ -101,24 +101,24 @@ mod tests {
     #[test]
     fn anchor_buffer_display_with_text_set() {
         let mut buffer = AnchorBuffer::default();
-        buffer.text = String::from("mX8Z7yWmsK");
+        buffer.text = String::from("mX8Z7sK");
         println!("{buffer:#?}");
         println!("{buffer}");
         assert_eq!(
             format!("{buffer}"),
-            r#"AnchorBuffer [text: "mX8Z7yWmsK"] >> Anchor <empty> -> <unknown>"#
+            r#"AnchorBuffer [text: "mX8Z7sK"] >> Anchor <empty> -> <unknown>"#
         );
     }
 
     #[test]
     fn anchor_buffer_display_with_destination_set() {
         let mut buffer = AnchorBuffer::default();
-        buffer.destination = String::from("VP2aqGngAq");
+        buffer.destination = String::from("VP2gAq");
         println!("{buffer:#?}");
         println!("{buffer}");
         assert_eq!(
             format!("{buffer}"),
-            r#"AnchorBuffer [, dest: "VP2aqGngAq"] >> Anchor <empty> -> <unknown>"#
+            r#"AnchorBuffer [, dest: "VP2gAq"] >> Anchor <empty> -> <unknown>"#
         );
     }
 
@@ -131,7 +131,10 @@ mod tests {
         println!("{buffer}");
         assert_eq!(
             format!("{buffer}"),
-            r#"AnchorBuffer [text: "ECJrzgkBHg", dest: "9dy6gQ2g3E"] >> Anchor <empty> -> <unknown>"#
+            concat!(
+                r#"AnchorBuffer [text: "ECJrzgkBHg", dest: "9dy6gQ2g3E"] "#,
+                r#">> Anchor <empty> -> <unknown>"#,
+            )
         );
     }
 }

src/syntax/content/parser/token.rs

@@ -1,4 +1,4 @@
-use crate::syntax::content::{Parseable as _};
+use crate::syntax::content::Parseable as _;
 
 pub mod anchor;
 pub mod bold;
@@ -18,12 +18,23 @@ pub mod table;
 pub mod underline;
 pub mod verse;
 
-pub use {
+pub use anchor::Anchor;
-    anchor::Anchor, bold::Bold, checkbox::CheckBox, code::Code, header::Header,
+pub use bold::Bold;
-    item::Item, linebreak::LineBreak, list::List, literal::Literal,
+pub use checkbox::CheckBox;
-    oblique::Oblique, paragraph::Paragraph, preformat::PreFormat, quote::Quote,
+pub use code::Code;
-    strike::Strike, table::Table, underline::Underline, verse::Verse,
+pub use header::Header;
-};
+pub use item::Item;
+pub use linebreak::LineBreak;
+pub use list::List;
+pub use literal::Literal;
+pub use oblique::Oblique;
+pub use paragraph::Paragraph;
+pub use preformat::PreFormat;
+pub use quote::Quote;
+pub use strike::Strike;
+pub use table::Table;
+pub use underline::Underline;
+pub use verse::Verse;
 
 #[derive(Debug, Eq, PartialEq, Clone)]
 pub enum Token {

src/syntax/content/parser/token/anchor.rs

@@ -1,6 +1,6 @@
 use crate::{
-    syntax::content::{Parseable, parser::Lexeme},
     graph::Node,
+    syntax::content::{Parseable, parser::Lexeme},
 };
 
 #[derive(Default, Debug, Clone, Eq, PartialEq)]
@@ -15,58 +15,36 @@ pub struct Anchor {
 }
 
 impl Anchor {
-    pub fn text(&self) -> String {
+    pub fn text(&self) -> String { self.text.clone() }
-        self.text.clone()
-    }
 
-    pub fn set_text(&mut self, text: &str) {
+    pub fn set_text(&mut self, text: &str) { self.text = String::from(text); }
-        self.text = String::from(text);
-    }
 
-    pub fn text_push(&mut self, text: &str) {
+    pub fn text_push(&mut self, text: &str) { self.text.push_str(text); }
-        self.text.push_str(text);
-    }
 
-    pub fn destination(&self) -> Option<String> {
+    pub fn destination(&self) -> Option<String> { self.destination.clone() }
-        self.destination.clone()
-    }
 
     pub fn set_destination(&mut self, destination: Option<&str>) {
         self.destination = destination.map(str::to_string);
         self.route();
     }
 
-    pub fn balanced(&self) -> bool {
+    pub fn balanced(&self) -> bool { self.balanced }
-        self.balanced
-    }
 
-    pub fn set_balanced(&mut self, balanced: bool) {
+    pub fn set_balanced(&mut self, balanced: bool) { self.balanced = balanced; }
-        self.balanced = balanced;
-    }
 
-    pub fn external(&self) -> bool {
+    pub fn external(&self) -> bool { self.external }
-        self.external
-    }
 
-    pub fn set_external(&mut self, external: bool) {
+    pub fn set_external(&mut self, external: bool) { self.external = external; }
-        self.external = external;
-    }
 
-    pub fn set_leading(&mut self, leading: bool) {
+    pub fn set_leading(&mut self, leading: bool) { self.leading = leading; }
-        self.leading = leading;
-    }
 
-    pub fn node(&self) -> Option<Node> {
+    pub fn node(&self) -> Option<Node> { self.node.clone() }
-        self.node.clone()
-    }
 
     pub fn set_node(&mut self, node: &Node) {
         self.node = Some(node.to_owned());
     }
 
-    pub fn node_id(&self) -> Option<String> {
+    pub fn node_id(&self) -> Option<String> { self.node_id.clone() }
-        self.node_id.clone()
-    }
 
     pub fn set_node_id(&mut self, id: &str) {
         self.node_id = Some(id.to_owned());
@@ -105,7 +83,8 @@ impl Parseable for Anchor {
     fn render(&self) -> String {
         let Some(destination) = &self.destination else {
             panic!(
-                "Attempt to render anchor {self:#?} without knowing its destination."
+                "Attempt to render anchor {self:#?} without knowing \
+                its destination."
             )
         };
 
@@ -131,9 +110,7 @@ impl Parseable for Anchor {
         )
     }
 
-    fn flatten(&self) -> String {
+    fn flatten(&self) -> String { self.text.clone() }
-        self.text.clone()
-    }
 }
 
 impl std::fmt::Display for Anchor {
@@ -177,9 +154,8 @@ impl std::fmt::Display for Anchor {
 #[cfg(test)]
 mod tests {
 
-    use crate::syntax::content::parser::Token;
-
     use super::*;
+    use crate::syntax::content::parser::Token;
 
     #[test]
     fn render_anchor() {
@@ -188,7 +164,10 @@ mod tests {
         anchor.set_destination(Some("AnchorDest"));
         assert_eq!(
             anchor.render(),
-            r#"<a class="detached" title="" href="/node/AnchorDest">AnchorText</a>"#
+            concat!(
+                r#"<a class="detached" title="" "#,
+                r#"href="/node/AnchorDest">AnchorText</a>"#,
+            )
         );
     }
 
@@ -196,9 +175,7 @@ mod tests {
     #[should_panic(
         expected = "Attempt to lex an anchor directly from a lexeme"
     )]
-    fn lex() {
+    fn lex() { Anchor::lex(&Lexeme::default()); }
-        Anchor::lex(&Lexeme::default());
-    }
 
     #[test]
     #[should_panic(expected = "without knowing its destination")]

src/syntax/content/parser/token/bold.rs

@@ -1,6 +1,4 @@
-use crate::{
+use crate::syntax::content::{Lexeme, Parseable};
-    syntax::content::{Parseable, Lexeme},
-};
 
 #[derive(Debug, Clone, Eq, PartialEq)]
 pub struct Bold {
@@ -8,15 +6,11 @@ pub struct Bold {
 }
 
 impl Bold {
-    pub fn new(open: bool) -> Bold {
+    pub fn new(open: bool) -> Bold { Bold { open } }
-        Bold { open }
-    }
 }
 
 impl Parseable for Bold {
-    fn probe(lexeme: &Lexeme) -> bool {
+    fn probe(lexeme: &Lexeme) -> bool { lexeme.text() == "*" }
-        lexeme.text() == "*"
-    }
 
     fn lex(_lexeme: &Lexeme) -> Bold {
         panic!("Attempt to lex a bold tag directly from a lexeme")
@@ -30,9 +24,7 @@ impl Parseable for Bold {
         }
     }
 
-    fn flatten(&self) -> String {
+    fn flatten(&self) -> String { String::default() }
-        String::default()
-    }
 }
 
 impl std::fmt::Display for Bold {
@@ -44,9 +36,8 @@ impl std::fmt::Display for Bold {
 
 #[cfg(test)]
 mod tests {
-    use crate::syntax::content::parser::Token;
-
     use super::*;
+    use crate::syntax::content::parser::Token;
 
     #[test]
     fn render() {
@@ -61,9 +52,7 @@ mod tests {
     #[should_panic(
         expected = "Attempt to lex a bold tag directly from a lexeme"
     )]
-    fn lex() {
+    fn lex() { Bold::lex(&Lexeme::default()); }
-        Bold::lex(&Lexeme::default());
-    }
 
     #[test]
     fn token_display() {

src/syntax/content/parser/token/checkbox.rs

@@ -1,6 +1,4 @@
-use crate::{
+use crate::syntax::content::{Lexeme, Parseable};
-    syntax::content::{Parseable, Lexeme},
-};
 
 #[derive(Debug, Clone, Eq, PartialEq)]
 pub struct CheckBox {
@@ -8,9 +6,7 @@ pub struct CheckBox {
 }
 
 impl CheckBox {
-    pub fn new(checked: bool) -> CheckBox {
+    pub fn new(checked: bool) -> CheckBox { CheckBox { checked } }
-        CheckBox { checked }
-    }
 }
 
 impl Parseable for CheckBox {
@@ -34,9 +30,7 @@ impl Parseable for CheckBox {
         format!(r#"<input type="checkbox"{toggle}/>"#)
     }
 
-    fn flatten(&self) -> String {
+    fn flatten(&self) -> String { String::default() }
-        String::default()
-    }
 }
 
 impl std::fmt::Display for CheckBox {
@@ -48,9 +42,8 @@ impl std::fmt::Display for CheckBox {
 
 #[cfg(test)]
 mod tests {
-    use crate::syntax::content::parser::Token;
-
     use super::*;
+    use crate::syntax::content::parser::Token;
 
     #[test]
     fn render() {

src/syntax/content/parser/token/code.rs

@@ -1,6 +1,4 @@
-use crate::{
+use crate::syntax::content::{Lexeme, Parseable};
-    syntax::content::{Parseable, Lexeme},
-};
 
 #[derive(Debug, Clone, Eq, PartialEq)]
 pub struct Code {
@@ -8,15 +6,11 @@ pub struct Code {
 }
 
 impl Code {
-    pub fn new(open: bool) -> Code {
+    pub fn new(open: bool) -> Code { Code { open } }
-        Code { open }
-    }
 }
 
 impl Parseable for Code {
-    fn probe(lexeme: &Lexeme) -> bool {
+    fn probe(lexeme: &Lexeme) -> bool { lexeme.text() == "`" }
-        lexeme.text() == "`"
-    }
 
     fn lex(_lexeme: &Lexeme) -> Code {
         panic!("Attempt to lex a code tag directly from a lexeme")
@@ -30,9 +24,7 @@ impl Parseable for Code {
         }
     }
 
-    fn flatten(&self) -> String {
+    fn flatten(&self) -> String { String::default() }
-        String::default()
-    }
 }
 
 impl std::fmt::Display for Code {
@@ -44,9 +36,8 @@ impl std::fmt::Display for Code {
 
 #[cfg(test)]
 mod tests {
-    use crate::syntax::content::parser::Token;
-
     use super::*;
+    use crate::syntax::content::parser::Token;
 
     #[test]
     fn render() {
@@ -61,9 +52,7 @@ mod tests {
     #[should_panic(
         expected = "Attempt to lex a code tag directly from a lexeme"
     )]
-    fn lex() {
+    fn lex() { Code::lex(&Lexeme::default()); }
-        Code::lex(&Lexeme::default());
-    }
 
     #[test]
     fn token_display() {

src/syntax/content/parser/token/header.rs

@@ -1,15 +1,14 @@
 use std::{
     collections::{HashMap, hash_map::Entry},
+    fmt::Display,
 };
 
 use crate::{
-    prelude::*,
     graph::Config,
-    syntax::content::{Parseable, Lexeme},
+    prelude::*,
+    syntax::content::{Lexeme, Parseable},
 };
 
-use std::fmt::Display;
-
 #[derive(Debug, Clone, Eq, PartialEq)]
 pub struct Header {
     open: Option<bool>,
@@ -113,9 +112,7 @@ impl Parseable for Header {
         }
     }
 
-    fn flatten(&self) -> String {
+    fn flatten(&self) -> String { String::default() }
-        String::default()
-    }
 }
 
 impl std::fmt::Display for Header {
@@ -195,9 +192,8 @@ impl Display for Level {
 
 #[cfg(test)]
 mod tests {
-    use crate::syntax::content::parser::Token;
-
     use super::*;
+    use crate::syntax::content::parser::Token;
 
     #[test]
     fn make_id() {

src/syntax/content/parser/token/item.rs

@@ -1,4 +1,4 @@
-use crate::syntax::content::{Parseable, Lexeme};
+use crate::syntax::content::{Lexeme, Parseable};
 
 #[derive(Default, Debug, Clone, Eq, PartialEq)]
 pub struct Item {
@@ -7,9 +7,7 @@ pub struct Item {
 }
 
 impl Parseable for Item {
-    fn probe(_: &Lexeme) -> bool {
+    fn probe(_: &Lexeme) -> bool { false }
-        false
-    }
 
     fn lex(_: &Lexeme) -> Item {
         panic!("Attempt to lex an item directly from a lexeme")
@@ -19,9 +17,7 @@ impl Parseable for Item {
         panic!("Items should only be rendered by a list's render method")
     }
 
-    fn flatten(&self) -> String {
+    fn flatten(&self) -> String { String::default() }
-        String::default()
-    }
 }
 
 impl Item {
@@ -50,9 +46,8 @@ impl std::fmt::Display for Item {
 
 #[cfg(test)]
 mod tests {
-    use crate::syntax::content::parser::Token;
-
     use super::*;
+    use crate::syntax::content::parser::Token;
 
     #[test]
     #[should_panic(

src/syntax/content/parser/token/linebreak.rs

@@ -1,6 +1,4 @@
-use crate::{
+use crate::syntax::content::{Parseable, parser::Lexeme};
-    syntax::content::{Parseable, parser::Lexeme},
-};
 
 #[derive(Default, Debug, Clone, Eq, PartialEq)]
 pub struct LineBreak {}
@@ -10,17 +8,11 @@ impl Parseable for LineBreak {
         lexeme.match_char('<') && lexeme.match_next_char('\n')
     }
 
-    fn lex(_lexeme: &Lexeme) -> LineBreak {
+    fn lex(_lexeme: &Lexeme) -> LineBreak { LineBreak {} }
-        LineBreak {}
-    }
 
-    fn render(&self) -> String {
+    fn render(&self) -> String { String::from("<br>") }
-        String::from("<br>")
-    }
 
-    fn flatten(&self) -> String {
+    fn flatten(&self) -> String { String::from('\n') }
-        String::from('\n')
-    }
 }
 
 impl std::fmt::Display for LineBreak {
@@ -31,9 +23,8 @@ impl std::fmt::Display for LineBreak {
 
 #[cfg(test)]
 mod tests {
-    use crate::syntax::content::parser::Token;
-
     use super::*;
+    use crate::syntax::content::parser::Token;
 
     #[test]
     fn token_display() {

src/syntax/content/parser/token/list.rs

@@ -27,8 +27,8 @@ impl Parseable for List {
     /// - Strict division is performed but related panics are unreachable given
     ///   the guarantees described in `List::scale_indent`
     /// - Saturates subtractions from indent levels at zero. This is not
-    ///   unreachable, but a difference of zero is a no-op considering it
+    ///   unreachable, but a difference of zero is a no-op considering it would
-    ///   would cause an iteration of zero times (over an empty range).
+    ///   cause an iteration of zero times (over an empty range).
     fn render(&self) -> String {
         let tag = if self.ordered { "ol" } else { "ul" };
         let mut output = String::new();
@@ -122,9 +122,8 @@ impl std::fmt::Display for List {
 
 #[cfg(test)]
 mod tests {
-    use crate::syntax::content::parser::Token;
-
     use super::*;
+    use crate::syntax::content::parser::Token;
 
     #[test]
     fn render_flat_list() {

src/syntax/content/parser/token/literal.rs

@@ -16,13 +16,9 @@ impl Parseable for Literal {
         }
     }
 
-    fn render(&self) -> String {
+    fn render(&self) -> String { self.text.clone() }
-        self.text.clone()
-    }
 
-    fn flatten(&self) -> String {
+    fn flatten(&self) -> String { self.text.clone() }
-        self.text.clone()
-    }
 }
 
 impl std::fmt::Display for Literal {
@@ -33,9 +29,8 @@ impl std::fmt::Display for Literal {
 
 #[cfg(test)]
 mod tests {
-    use crate::syntax::content::parser::Token;
-
     use super::*;
+    use crate::syntax::content::parser::Token;
 
     #[test]
     fn token_display() {

src/syntax/content/parser/token/oblique.rs

@@ -1,6 +1,4 @@
-use crate::{
+use crate::syntax::content::{Lexeme, Parseable};
-    syntax::content::{Parseable, Lexeme},
-};
 
 #[derive(Debug, Clone, Eq, PartialEq)]
 pub struct Oblique {
@@ -8,15 +6,11 @@ pub struct Oblique {
 }
 
 impl Oblique {
-    pub fn new(open: bool) -> Oblique {
+    pub fn new(open: bool) -> Oblique { Oblique { open } }
-        Oblique { open }
-    }
 }
 
 impl Parseable for Oblique {
-    fn probe(lexeme: &Lexeme) -> bool {
+    fn probe(lexeme: &Lexeme) -> bool { lexeme.text() == "_" }
-        lexeme.text() == "_"
-    }
 
     fn lex(_lexeme: &Lexeme) -> Oblique {
         panic!("Attempt to lex an oblique tag directly from a lexeme")
@@ -30,9 +24,7 @@ impl Parseable for Oblique {
         }
     }
 
-    fn flatten(&self) -> String {
+    fn flatten(&self) -> String { String::default() }
-        String::default()
-    }
 }
 
 impl std::fmt::Display for Oblique {
@@ -44,9 +36,8 @@ impl std::fmt::Display for Oblique {
 
 #[cfg(test)]
 mod tests {
-    use crate::syntax::content::parser::Token;
-
     use super::*;
+    use crate::syntax::content::parser::Token;
 
     #[test]
     fn render() {
@@ -61,9 +52,7 @@ mod tests {
     #[should_panic(
         expected = "Attempt to lex an oblique tag directly from a lexeme"
     )]
-    fn lex() {
+    fn lex() { Oblique::lex(&Lexeme::default()); }
-        Oblique::lex(&Lexeme::default());
-    }
 
     #[test]
     fn token_display() {

src/syntax/content/parser/token/paragraph.rs

@@ -6,9 +6,7 @@ pub struct Paragraph {
 }
 
 impl Paragraph {
-    pub fn new(open: bool) -> Paragraph {
+    pub fn new(open: bool) -> Paragraph { Paragraph { open: Some(open) } }
-        Paragraph { open: Some(open) }
-    }
 
     pub fn probe_end(lexeme: &Lexeme) -> bool {
         lexeme.match_char('\n') && lexeme.match_next_char('\n')
@@ -21,9 +19,7 @@ impl Parseable for Paragraph {
         !lexeme.is_whitespace()
     }
 
-    fn lex(_lexeme: &Lexeme) -> Paragraph {
+    fn lex(_lexeme: &Lexeme) -> Paragraph { Paragraph { open: None } }
-        Paragraph { open: None }
-    }
 
     fn render(&self) -> String {
         if let Some(open) = self.open {
@@ -39,9 +35,7 @@ impl Parseable for Paragraph {
         }
     }
 
-    fn flatten(&self) -> String {
+    fn flatten(&self) -> String { String::default() }
-        String::default()
-    }
 }
 
 impl std::fmt::Display for Paragraph {
@@ -62,9 +56,8 @@ impl std::fmt::Display for Paragraph {
 
 #[cfg(test)]
 mod tests {
-    use crate::syntax::content::parser::Token;
-
     use super::*;
+    use crate::syntax::content::parser::Token;
 
     #[test]
     fn lex() {
@@ -73,9 +66,8 @@ mod tests {
     }
 
     #[test]
-    #[should_panic(
+    #[should_panic(expected = "Attempt to render a paragraph tag while \
-        expected = "Attempt to render a paragraph tag while open state is unknown"
+            open state is unknown")]
-    )]
     fn render_state_unknown() {
         let p = Paragraph::lex(&Lexeme::default());
         drop(p.render());

src/syntax/content/parser/token/preformat.rs

@@ -1,6 +1,4 @@
-use crate::{
+use crate::syntax::content::{Lexeme, Parseable};
-    syntax::content::{Parseable, Lexeme},
-};
 
 #[derive(Debug, Clone, Eq, PartialEq)]
 pub struct PreFormat {
@@ -8,9 +6,7 @@ pub struct PreFormat {
 }
 
 impl PreFormat {
-    pub fn new(open: bool) -> PreFormat {
+    pub fn new(open: bool) -> PreFormat { PreFormat { open: Some(open) } }
-        PreFormat { open: Some(open) }
-    }
 }
 
 impl std::fmt::Display for PreFormat {
@@ -29,9 +25,7 @@ impl Parseable for PreFormat {
         lexeme.match_first_char('`') && (lexeme.next() == "\n" || lexeme.last())
     }
 
-    fn lex(_lexeme: &Lexeme) -> PreFormat {
+    fn lex(_lexeme: &Lexeme) -> PreFormat { PreFormat { open: None } }
-        PreFormat { open: None }
-    }
 
     fn render(&self) -> String {
         if let Some(o) = self.open {
@@ -47,16 +41,13 @@ impl Parseable for PreFormat {
         }
     }
 
-    fn flatten(&self) -> String {
+    fn flatten(&self) -> String { String::default() }
-        String::default()
-    }
 }
 
 #[cfg(test)]
 mod tests {
-    use crate::syntax::content::parser::Token;
-
     use super::*;
+    use crate::syntax::content::parser::Token;
 
     #[test]
     fn lex() {
@@ -68,9 +59,8 @@ mod tests {
     }
 
     #[test]
-    #[should_panic(
+    #[should_panic(expected = "Attempt to render a preformat tag while \
-        expected = "Attempt to render a preformat tag while open state is unknown"
+            open state is unknown")]
-    )]
     fn render() {
         let from_empty_lexeme = PreFormat::lex(&Lexeme::default());
         from_empty_lexeme.render();

src/syntax/content/parser/token/quote.rs

@@ -26,9 +26,7 @@ impl Parseable for Quote {
         lexeme.match_char('>') && lexeme.match_next_char(' ')
     }
 
-    fn lex(_lexeme: &Lexeme) -> Quote {
+    fn lex(_lexeme: &Lexeme) -> Quote { Quote::default() }
-        Quote::default()
-    }
 
     fn render(&self) -> String {
         let opening = if let Some(url) = &self.url {
@@ -49,9 +47,7 @@ impl Parseable for Quote {
         format!("\n{opening}\n{content}\n</blockquote>\n")
     }
 
-    fn flatten(&self) -> String {
+    fn flatten(&self) -> String { String::default() }
-        String::default()
-    }
 }
 
 impl std::fmt::Display for Quote {

src/syntax/content/parser/token/strike.rs

@@ -1,6 +1,4 @@
-use crate::{
+use crate::syntax::content::{Lexeme, Parseable};
-    syntax::content::{Parseable, Lexeme},
-};
 
 #[derive(Debug, Clone, Eq, PartialEq)]
 pub struct Strike {
@@ -8,9 +6,7 @@ pub struct Strike {
 }
 
 impl Strike {
-    pub fn new(open: bool) -> Strike {
+    pub fn new(open: bool) -> Strike { Strike { open } }
-        Strike { open }
-    }
 }
 
 impl Parseable for Strike {
@@ -27,9 +23,7 @@ impl Parseable for Strike {
         String::from(tag)
     }
 
-    fn flatten(&self) -> String {
+    fn flatten(&self) -> String { String::default() }
-        String::default()
-    }
 }
 
 impl std::fmt::Display for Strike {
@@ -41,9 +35,8 @@ impl std::fmt::Display for Strike {
 
 #[cfg(test)]
 mod tests {
-    use crate::syntax::content::parser::Token;
-
     use super::*;
+    use crate::syntax::content::parser::Token;
 
     #[test]
     fn render() {
@@ -58,9 +51,7 @@ mod tests {
     #[should_panic(
         expected = "Attempt to lex a strike tag directly from a lexeme"
     )]
-    fn lex() {
+    fn lex() { Strike::lex(&Lexeme::default()); }
-        Strike::lex(&Lexeme::default());
-    }
 
     #[test]
     fn token_display() {

src/syntax/content/parser/token/table.rs

@@ -15,9 +15,7 @@ impl Table {
         self.headers.push(header.trim().to_string());
     }
 
-    pub fn add_row(&mut self, row: Vec<String>) {
+    pub fn add_row(&mut self, row: Vec<String>) { self.contents.push(row); }
-        self.contents.push(row);
-    }
 
     pub fn add_cell(&mut self, content: &str) {
         if let Some(last) = self.contents.last_mut() {
@@ -37,13 +35,9 @@ impl Table {
 }
 
 impl Parseable for Table {
-    fn probe(lexeme: &Lexeme) -> bool {
+    fn probe(lexeme: &Lexeme) -> bool { lexeme.match_char_sequence('%', '\n') }
-        lexeme.match_char_sequence('%', '\n')
-    }
 
-    fn lex(_lexeme: &Lexeme) -> Table {
+    fn lex(_lexeme: &Lexeme) -> Table { Table::default() }
-        Table::default()
-    }
 
     fn render(&self) -> String {
         let mut xml = String::from("\n<table>\n");
@@ -73,9 +67,7 @@ impl Parseable for Table {
         xml
     }
 
-    fn flatten(&self) -> String {
+    fn flatten(&self) -> String { String::default() }
-        String::default()
-    }
 }
 
 impl std::fmt::Display for Table {

src/syntax/content/parser/token/underline.rs

@@ -1,6 +1,4 @@
-use crate::{
+use crate::syntax::content::{Lexeme, Parseable};
-    syntax::content::{Parseable, Lexeme},
-};
 
 #[derive(Debug, Clone, Eq, PartialEq)]
 pub struct Underline {
@@ -8,9 +6,7 @@ pub struct Underline {
 }
 
 impl Underline {
-    pub fn new(open: bool) -> Underline {
+    pub fn new(open: bool) -> Underline { Underline { open } }
-        Underline { open }
-    }
 }
 
 impl Parseable for Underline {
@@ -30,9 +26,7 @@ impl Parseable for Underline {
         }
     }
 
-    fn flatten(&self) -> String {
+    fn flatten(&self) -> String { String::default() }
-        String::default()
-    }
 }
 
 impl std::fmt::Display for Underline {
@@ -44,9 +38,8 @@ impl std::fmt::Display for Underline {
 
 #[cfg(test)]
 mod tests {
-    use crate::syntax::content::parser::Token;
-
     use super::*;
+    use crate::syntax::content::parser::Token;
 
     #[test]
     fn render() {
@@ -61,9 +54,7 @@ mod tests {
     #[should_panic(
         expected = "Attempt to lex an underline tag directly from a lexeme"
     )]
-    fn lex() {
+    fn lex() { Underline::lex(&Lexeme::default()); }
-        Underline::lex(&Lexeme::default());
-    }
 
     #[test]
     fn token_display() {

src/syntax/content/parser/token/verse.rs

@@ -43,9 +43,7 @@ impl Parseable for Verse {
         }
     }
 
-    fn flatten(&self) -> String {
+    fn flatten(&self) -> String { String::default() }
-        String::default()
-    }
 }
 
 impl std::fmt::Display for Verse {