replace panic to std::io::Error

anvie · May 1, 2023 · e0ca0e8 · e0ca0e8
1 parent ed8fc7b
commit e0ca0e8
Show file tree

Hide file tree

Showing 5 changed files with 50 additions and 21 deletions.
diff --git a/src/doc.rs b/src/doc.rs
@@ -71,11 +71,16 @@ pub(crate) fn open_doc_read_data<P: AsRef<Path>>(
                     }
                 }
                 Ok(Event::Eof) => break,
-                Err(e) => panic!(
-                    "Error at position {}: {:?}",
-                    xml_reader.buffer_position(),
-                    e
-                ),
+                Err(e) => {
+                    return Err(io::Error::new(
+                        io::ErrorKind::Other,
+                        format!(
+                            "Error at position {}: {:?}",
+                            xml_reader.buffer_position(),
+                            e
+                        ),
+                    ))
+                }
                 _ => (),
             }
         }

diff --git a/src/docx.rs b/src/docx.rs
@@ -67,11 +67,16 @@ impl MsDoc<Docx> for Docx {
                         }
                     }
                     Ok(Event::Eof) => break, // exits the loop when reaching end of file
-                    Err(e) => panic!(
-                        "Error at position {}: {:?}",
-                        xml_reader.buffer_position(),
-                        e
-                    ),
+                    Err(e) => {
+                        return Err(io::Error::new(
+                            io::ErrorKind::Other,
+                            format!(
+                                "Error at position {}: {:?}",
+                                xml_reader.buffer_position(),
+                                e
+                            ),
+                        ))
+                    }
                     _ => (),
                 }
             }

diff --git a/src/odp.rs b/src/odp.rs
@@ -74,7 +74,16 @@ impl OpenOfficeDoc<Odp> for Odp {
         //                 }
         //             },
         //             Ok(Event::Eof) => break,
-        //             Err(e) => panic!("Error at position {}: {:?}", xml_reader.buffer_position(), e),
+        //             Err(e) => {
+        //                 return Err(io::Error::new(
+        //                    io::ErrorKind::Other,
+        //                    format!(
+        //                        "Error at position {}: {:?}",
+        //                        xml_reader.buffer_position(),
+        //                        e
+        //                    ),
+        //                ))
+        //            }
         //             _ => (),
         //         }
         //     }

diff --git a/src/pptx.rs b/src/pptx.rs
@@ -70,11 +70,16 @@ impl MsDoc<Pptx> for Pptx {
                         }
                     }
                     Ok(Event::Eof) => break, // exits the loop when reaching end of file
-                    Err(e) => panic!(
-                        "Error at position {}: {:?}",
-                        xml_reader.buffer_position(),
-                        e
-                    ),
+                    Err(e) => {
+                        return Err(io::Error::new(
+                            io::ErrorKind::Other,
+                            format!(
+                                "Error at position {}: {:?}",
+                                xml_reader.buffer_position(),
+                                e
+                            ),
+                        ))
+                    }
                     _ => (),
                 }
             }

diff --git a/src/xlsx.rs b/src/xlsx.rs
@@ -75,11 +75,16 @@ impl MsDoc<Xlsx> for Xlsx {
                         }
                     }
                     Ok(Event::Eof) => break, // exits the loop when reaching end of file
-                    Err(e) => panic!(
-                        "Error at position {}: {:?}",
-                        xml_reader.buffer_position(),
-                        e
-                    ),
+                    Err(e) => {
+                        return Err(io::Error::new(
+                            io::ErrorKind::Other,
+                            format!(
+                                "Error at position {}: {:?}",
+                                xml_reader.buffer_position(),
+                                e
+                            ),
+                        ))
+                    }
                     _ => (),
                 }
             }