Merge pull request #466 from Veetaha/main

Use `bon` for an infallible and compile-time-checked builder

Author: kivikakk

Cargo.lock

@@ -45,7 +45,7 @@ shell-words = { version = "1.0", optional = true }
 slug = "0.1.4"
 emojis = { version = "0.6.2", optional = true }
 arbitrary = { version = "1", optional = true, features = ["derive"] }
-derive_builder = "0.20.0"
+bon = "2.2.1"
 caseless = "0.2.1"
 
 [dev-dependencies]

Cargo.toml

@@ -14,7 +14,7 @@ const INDENT: usize = 4;
 const CLOSE_NEWLINE: bool = false;
 
 use comrak::nodes::{AstNode, NodeValue};
-use comrak::{parse_document, Arena, ExtensionOptionsBuilder, Options};
+use comrak::{parse_document, Arena, ExtensionOptions, Options};
 use std::env;
 use std::error::Error;
 use std::fs::File;
@@ -74,7 +74,7 @@ fn iter_nodes<'a, W: Write>(
 fn dump(source: &str) -> io::Result<()> {
     let arena = Arena::new();
 
-    let extension = ExtensionOptionsBuilder::default()
+    let extension = ExtensionOptions::builder()
         .strikethrough(true)
         .tagfilter(true)
         .table(true)
@@ -88,8 +88,7 @@ fn dump(source: &str) -> io::Result<()> {
         .math_code(true)
         .wikilinks_title_after_pipe(true)
         .wikilinks_title_before_pipe(true)
-        .build()
-        .unwrap();
+        .build();
 
     let opts = Options {
         extension,

examples/s-expr.rs

@@ -0,0 +1 @@
+nightly

rust-toolchain

@@ -1,9 +1,8 @@
 //! The `comrak` binary.
 
 use comrak::{
-    adapters::SyntaxHighlighterAdapter, plugins::syntect::SyntectAdapter, Arena,
-    ExtensionOptionsBuilder, ListStyleType, Options, ParseOptionsBuilder, Plugins,
-    RenderOptionsBuilder,
+    adapters::SyntaxHighlighterAdapter, plugins::syntect::SyntectAdapter, Arena, ListStyleType,
+    Options, Plugins,
 };
 use std::boxed::Box;
 use std::env;
@@ -14,6 +13,7 @@ use std::path::PathBuf;
 use std::process;
 
 use clap::{Parser, ValueEnum};
+use comrak::{ExtensionOptions, ParseOptions, RenderOptions};
 
 const EXIT_SUCCESS: i32 = 0;
 const EXIT_PARSE_CONFIG: i32 = 2;
@@ -251,15 +251,14 @@ fn main() -> Result<(), Box<dyn Error>> {
 
     let exts = &cli.extensions;
 
-    let mut extension = ExtensionOptionsBuilder::default();
-    extension
+    let extension = ExtensionOptions::builder()
         .strikethrough(exts.contains(&Extension::Strikethrough) || cli.gfm)
         .tagfilter(exts.contains(&Extension::Tagfilter) || cli.gfm)
         .table(exts.contains(&Extension::Table) || cli.gfm)
         .autolink(exts.contains(&Extension::Autolink) || cli.gfm)
         .tasklist(exts.contains(&Extension::Tasklist) || cli.gfm)
         .superscript(exts.contains(&Extension::Superscript))
-        .header_ids(cli.header_ids)
+        .maybe_header_ids(cli.header_ids)
         .footnotes(exts.contains(&Extension::Footnotes))
         .description_lists(exts.contains(&Extension::DescriptionLists))
         .multiline_block_quotes(exts.contains(&Extension::MultilineBlockQuotes))
@@ -270,23 +269,21 @@ fn main() -> Result<(), Box<dyn Error>> {
         .underline(exts.contains(&Extension::Underline))
         .spoiler(exts.contains(&Extension::Spoiler))
         .greentext(exts.contains(&Extension::Greentext))
-        .front_matter_delimiter(cli.front_matter_delimiter);
+        .maybe_front_matter_delimiter(cli.front_matter_delimiter);
 
     #[cfg(feature = "shortcodes")]
-    {
-        extension.shortcodes(cli.gemojis);
-    }
+    let extension = extension.shortcodes(cli.gemojis);
 
-    let extension = extension.build()?;
+    let extension = extension.build();
 
-    let parse = ParseOptionsBuilder::default()
+    let parse = ParseOptions::builder()
         .smart(cli.smart)
-        .default_info_string(cli.default_info_string)
+        .maybe_default_info_string(cli.default_info_string)
         .relaxed_tasklist_matching(cli.relaxed_tasklist_character)
         .relaxed_autolinks(cli.relaxed_autolinks)
-        .build()?;
+        .build();
 
-    let render = RenderOptionsBuilder::default()
+    let render = RenderOptions::builder()
         .hardbreaks(cli.hardbreaks)
         .github_pre_lang(cli.github_pre_lang || cli.gfm)
         .full_info_string(cli.full_info_string)
@@ -301,7 +298,7 @@ fn main() -> Result<(), Box<dyn Error>> {
         .ignore_empty_links(cli.ignore_empty_links)
         .gfm_quirks(cli.gfm_quirks || cli.gfm)
         .tasklist_classes(cli.tasklist_classes)
-        .build()?;
+        .build();
 
     let options = Options {
         extension,