From 6f832ed434f4b691e47f32dd58851f0abad38332 Mon Sep 17 00:00:00 2001
From: Andrey Voronkov <andrey.voronkov@sbermarket.ru>
Date: Wed, 28 Feb 2024 21:26:13 +0300
Subject: [PATCH] Fix formatting

---
 src/book/mod.rs          |  3 ++-
 src/preprocess/drinks.rs | 28 ++++++++++++++++------------
 2 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/src/book/mod.rs b/src/book/mod.rs
index de5d9eab..de24e4c9 100644
--- a/src/book/mod.rs
+++ b/src/book/mod.rs
@@ -24,7 +24,8 @@ use topological_sort::TopologicalSort;
 
 use crate::errors::*;
 use crate::preprocess::{
-    CmdPreprocessor, DrinkPreprocessor, IndexPreprocessor, LinkPreprocessor, Preprocessor, PreprocessorContext,
+    CmdPreprocessor, DrinkPreprocessor, IndexPreprocessor, LinkPreprocessor, Preprocessor,
+    PreprocessorContext,
 };
 use crate::renderer::{CmdRenderer, HtmlHandlebars, MarkdownRenderer, RenderContext, Renderer};
 use crate::utils;
diff --git a/src/preprocess/drinks.rs b/src/preprocess/drinks.rs
index f2cd2c08..7e756738 100644
--- a/src/preprocess/drinks.rs
+++ b/src/preprocess/drinks.rs
@@ -2,15 +2,15 @@ use crate::errors::*;
 
 use super::{Preprocessor, PreprocessorContext};
 use crate::book::{Book, BookItem, Chapter};
-use regex::{Captures, Regex};
 use once_cell::sync::Lazy;
-use std::io::{BufRead, BufReader};
-use std::fs::File;
+use regex::{Captures, Regex};
 use std::collections::HashMap;
+use std::fs::File;
+use std::io::{BufRead, BufReader};
 
 const SPLITTER: char = ':';
 
-type Dict=HashMap<String, String>;
+type Dict = HashMap<String, String>;
 
 /// DRY Links - A preprocessor for using centralized links collection:
 ///
@@ -29,18 +29,17 @@ impl DrinkPreprocessor {
     fn replace_drinks(&self, chapter: &mut Chapter, dict: &Dict) -> Result<String, Error> {
         static RE: Lazy<Regex> = Lazy::new(|| {
             Regex::new(
-            r"(?x)                # insignificant whitespace mode
+                r"(?x)                # insignificant whitespace mode
             \{\{\s*               # link opening parens and whitespace
             \#(drink)             # drink marker
             \s+                   # separating whitespace
             (?<drink>[A-z0-9_-]+) # drink name
             \}\}                  # link closing parens",
-            ).unwrap()
+            )
+            .unwrap()
         });
 
-        static NODRINK: Lazy<String> = Lazy::new(|| {
-            "deadbeef".to_string()
-        });
+        static NODRINK: Lazy<String> = Lazy::new(|| "deadbeef".to_string());
 
         let res = RE.replace_all(&chapter.content, |caps: &Captures<'_>| {
             dict.get(&caps["drink"]).unwrap_or(&NODRINK)
@@ -59,9 +58,14 @@ impl Preprocessor for DrinkPreprocessor {
 
         let drinks: Dict = {
             let reader = BufReader::new(File::open(path).expect("Cannot open drinks dictionary"));
-            reader.lines().filter_map(|l| {
-                l.expect("Cannot read line in drinks dictionary").split_once(SPLITTER).map(|(name, value)| (name.trim().to_owned(), value.trim().to_owned()))
-            }).collect::<HashMap<_, _>>()
+            reader
+                .lines()
+                .filter_map(|l| {
+                    l.expect("Cannot read line in drinks dictionary")
+                        .split_once(SPLITTER)
+                        .map(|(name, value)| (name.trim().to_owned(), value.trim().to_owned()))
+                })
+                .collect::<HashMap<_, _>>()
         };
 
         book.for_each_mut(|section: &mut BookItem| {