From d20b4a410b9a72cf89336e653c655ba04382616f Mon Sep 17 00:00:00 2001
From: Tom Alexander <tom@fizz.buzz>
Date: Tue, 17 Oct 2023 11:56:36 -0400
Subject: [PATCH] Remove pointless map_err calls.

---
 src/error/error.rs     |  6 ++++++
 src/parser/document.rs | 15 ++-------------
 2 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/src/error/error.rs b/src/error/error.rs
index 9b7d4a06..65f52ef0 100644
--- a/src/error/error.rs
+++ b/src/error/error.rs
@@ -35,3 +35,9 @@ impl From<&'static str> for CustomError {
         CustomError::Static(value)
     }
 }
+
+impl From<String> for CustomError {
+    fn from(value: String) -> Self {
+        CustomError::Text(value)
+    }
+}
diff --git a/src/parser/document.rs b/src/parser/document.rs
index 898b42e5..2117b920 100644
--- a/src/parser/document.rs
+++ b/src/parser/document.rs
@@ -129,23 +129,12 @@ fn document_org_source<'b, 'g, 'r, 's>(
         })
         .collect::<Result<Vec<_>, _>>()?;
     for setup_file in setup_files.iter().map(String::as_str) {
-        let (_, setup_file_settings) =
-            scan_for_in_buffer_settings(setup_file.into()).map_err(|err| {
-                eprintln!("{}", err);
-                nom::Err::Error(CustomError::Static(
-                    "TODO: make this take an owned string so I can dump err.to_string() into it.",
-                ))
-            })?;
+        let (_, setup_file_settings) = scan_for_in_buffer_settings(setup_file.into())?;
         final_settings.extend(setup_file_settings);
     }
     final_settings.extend(document_settings);
     let new_settings = apply_in_buffer_settings(final_settings, context.get_global_settings())
-        .map_err(|err| {
-            eprintln!("{}", err);
-            nom::Err::Error(CustomError::Static(
-                "TODO: make this take an owned string so I can dump err.to_string() into it.",
-            ))
-        })?;
+        .map_err(|err| nom::Err::Error(CustomError::from(err)))?;
     let new_context = context.with_global_settings(&new_settings);
     let context = &new_context;