Insert newlines between entries in string dump

Closes #19

Author: reknih

bench/src/bench.rs

@@ -12,14 +12,14 @@ fn benchmarks(c: &mut Criterion) {
         };
     }
 
-    let bib = Bibliography::parse(GRAL);
+    let bib = Bibliography::parse(GRAL).unwrap();
     let entry = bib.get("kim2009").unwrap();
 
-    bench!("parse-gral": Bibliography::parse(GRAL));
+    bench!("parse-gral": Bibliography::parse(GRAL).unwrap());
     bench!("get-last-gral": bib.get("adedeji2017"));
     bench!("get-author-gral": entry.author());
 
-    let bib = Bibliography::parse(CROSS);
+    let bib = Bibliography::parse(CROSS).unwrap();
     let entry = bib.get("issue201").unwrap();
     bench!("get-date-cross": entry.date());
 }

src/lib.rs

@@ -33,8 +33,7 @@ pub use types::*;
 use std::collections::{BTreeMap, HashMap};
 use std::error::Error;
 use std::fmt;
-use std::fmt::{Display, Formatter, Write as _};
-use std::io::{self, Write};
+use std::fmt::{Display, Formatter, Write};
 
 use mechanics::{AuthorMode, PagesChapterMode};
 
@@ -196,41 +195,45 @@ impl Bibliography {
         self.entries.iter_mut()
     }
 
+    /// Write the entry into a writer in the BibLaTeX format.
+    pub fn write_biblatex(&self, mut sink: impl Write) -> fmt::Result {
+        let mut first = true;
+        for entry in &self.entries {
+            if !first {
+                write!(sink, "\n")?;
+            }
+            writeln!(sink, "{}", entry.to_biblatex_string())?;
+            first = false;
+        }
+        Ok(())
+    }
+
     /// Serialize this bibliography into a BibLaTeX string.
     pub fn to_biblatex_string(&self) -> String {
         let mut biblatex = String::new();
-        for entry in &self.entries {
-            biblatex.push_str(&entry.to_biblatex_string());
-            biblatex.push('\n');
-        }
+        self.write_biblatex(&mut biblatex).unwrap();
         biblatex
     }
 
-    /// Write the entry into a writer in the BibLaTeX format.
-    pub fn write_biblatex(&self, mut sink: impl Write) -> io::Result<()> {
+    /// Write the entry into a writer in the BibTeX format.
+    pub fn write_bibtex(&self, mut sink: impl Write) -> fmt::Result {
+        let mut first = true;
         for entry in &self.entries {
-            writeln!(sink, "{}", entry.to_biblatex_string())?;
+            if !first {
+                write!(sink, "\n")?;
+            }
+            writeln!(sink, "{}", entry.to_bibtex_string())?;
+            first = false;
         }
         Ok(())
     }
 
     /// Serialize this bibliography into a BibTeX string.
     pub fn to_bibtex_string(&self) -> String {
         let mut bibtex = String::new();
-        for entry in &self.entries {
-            bibtex.push_str(&entry.to_bibtex_string());
-            bibtex.push('\n');
-        }
+        self.write_bibtex(&mut bibtex).unwrap();
         bibtex
     }
-
-    /// Write the entry into a writer in the BibTeX format.
-    pub fn write_bibtex(&self, mut sink: impl Write) -> io::Result<()> {
-        for entry in &self.entries {
-            writeln!(sink, "{}", entry.to_bibtex_string())?;
-        }
-        Ok(())
-    }
 }
 
 impl IntoIterator for Bibliography {

src/mechanics.rs

@@ -107,6 +107,7 @@ pub enum PagesChapterMode {
     /// `chapter` field.
     PagesOptional,
     /// The `pages` field must be present.
+    #[allow(dead_code)]
     PagesRequired,
 }