SlinkyError

slinky-cli/src/main.rs

@@ -6,7 +6,8 @@ use std::path::Path;
 use slinky::{Document, LinkerWriter};
 
 fn main() {
-    let document = Document::read(Path::new("test_case.yaml"));
+    // TODO: don't use expect?
+    let document = Document::read_file(Path::new("test_case.yaml")).expect("Error while reading input file");
 
     let mut writer = LinkerWriter::new(&document.options);
     writer.begin_sections();

slinky/Cargo.toml

@@ -11,3 +11,4 @@ edition = "2021"
 [dependencies]
 serde = {version="1.0.197", features = ["derive"]}
 serde_yaml = "0.9.32"
+thiserror = "1.0.57"

slinky/src/document.rs

@@ -5,7 +5,7 @@ use std::{fs, path::Path};
 
 use serde::Deserialize;
 
-use crate::{Options, Segment};
+use crate::{Options, Segment, SlinkyError};
 
 #[derive(Deserialize, PartialEq, Debug)]
 pub struct Document {
@@ -16,9 +16,15 @@ pub struct Document {
 }
 
 impl Document {
-    pub fn read(path: &Path) -> Self {
-        let f = fs::File::open(path).expect("asdfasdf");
-        let mut document: Document = serde_yaml::from_reader(f).expect("");
+    pub fn read_file(path: &Path) -> Result<Self, SlinkyError> {
+        let f = match fs::File::open(path) {
+            Ok(f) => f,
+            Err(e) => return Err(SlinkyError::FailedFileOpen{description: e.to_string()}),
+        };
+        let mut document: Document = match serde_yaml::from_reader(f) {
+            Ok(d) => d,
+            Err(e) => return Err(SlinkyError::FailedYamlParsing{description: e.to_string()}),
+        };
 
         for segment in &mut document.segments {
             segment.use_subalign = Some(document.options.use_subalign);
@@ -27,6 +33,6 @@ impl Document {
             segment.wildcard_sections = Some(document.options.wildcard_sections);
         }
 
-        document
+        Ok(document)
     }
 }

slinky/src/error.rs

@@ -0,0 +1,11 @@
+/* SPDX-FileCopyrightText: © 2024 decompals */
+/* SPDX-License-Identifier: MIT */
+
+
+#[derive(Clone, Debug, PartialEq, Eq, Hash, thiserror::Error)]
+pub enum SlinkyError {
+    #[error("Unable to open file: {description}")]
+    FailedFileOpen {description: String},
+    #[error("Unable parse yaml: {description}")]
+    FailedYamlParsing { description: String },
+}

slinky/src/lib.rs

@@ -1,6 +1,8 @@
 /* SPDX-FileCopyrightText: © 2024 decompals */
 /* SPDX-License-Identifier: MIT */
 
+mod error;
+
 mod paths_configs;
 mod segment_symbols_style;
 mod options;
@@ -14,6 +16,8 @@ mod document;
 mod linker_writer;
 
 
+pub use error::SlinkyError;
+
 pub use paths_configs::PathsConfigs;
 pub use segment_symbols_style::SegmentSymbolsStyle;
 pub use options::Options;