From 93f3d600050f458298a6e89b0ccd17804a5658b5 Mon Sep 17 00:00:00 2001
From: Andreas Longva <andreas.b.longva@gmail.com>
Date: Wed, 1 Dec 2021 11:33:03 +0100
Subject: [PATCH] Remove From<pest::Error> for MatrixMarketError

We want pest to remain an internal implementation detail, so it should
not leak into the public API.
---
 nalgebra-sparse/src/io/matrix_market.rs | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/nalgebra-sparse/src/io/matrix_market.rs b/nalgebra-sparse/src/io/matrix_market.rs
index 518675cd..dd823bc9 100644
--- a/nalgebra-sparse/src/io/matrix_market.rs
+++ b/nalgebra-sparse/src/io/matrix_market.rs
@@ -298,13 +298,14 @@ impl fmt::Display for MatrixMarketError {
 
 impl std::error::Error for MatrixMarketError {}
 
-impl<T: fmt::Debug + std::hash::Hash + std::marker::Copy + Ord> From<pest::error::Error<T>>
-    for MatrixMarketError
-{
-    fn from(err: pest::error::Error<T>) -> Self {
+impl MatrixMarketError {
+    fn from_pest_error<T>(error: pest::error::Error<T>) -> Self
+    where
+        T: fmt::Debug + std::hash::Hash + std::marker::Copy + Ord
+    {
         Self::from_kind_and_message(
             MatrixMarketErrorKind::ParsingError,
-            format!("Can't parse the data.\n Error: {}", err),
+            format!("Can't parse the data.\n Error: {}", error),
         )
     }
 }
@@ -756,7 +757,9 @@ where
     T: MatrixMarketScalar,
 {
     // unwrap() in this function are guaranteed by parsing the data
-    let file = MatrixMarketParser::parse(Rule::Document, data)?.next().unwrap();
+    let file = MatrixMarketParser::parse(Rule::Document, data)
+        .map_err(MatrixMarketError::from_pest_error)?
+        .next().unwrap();
 
     let mut rows: Vec<usize> = Vec::new();
     let mut cols: Vec<usize> = Vec::new();