From f094ce41d9a374d99f8a81ff0cb5ca1874ca5017 Mon Sep 17 00:00:00 2001
From: Hanno Braun <hanno@braun-odw.eu>
Date: Wed, 16 Mar 2022 14:20:01 +0100
Subject: [PATCH] Simplify `Model::from_path`

---
 src/main.rs  | 9 +++++----
 src/model.rs | 5 +----
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/src/main.rs b/src/main.rs
index a9d7d82f9..a5765b5c0 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -53,10 +53,11 @@ fn main() -> anyhow::Result<()> {
 
     let args = Args::parse();
     let config = Config::load()?;
-    let model = Model::from_path(
-        config.default_path,
-        args.model.unwrap_or(config.default_model),
-    );
+
+    let mut path = config.default_path;
+    path.push(args.model.unwrap_or(config.default_model));
+
+    let model = Model::from_path(path);
 
     let mut parameters = HashMap::new();
     for parameter in args.parameters {
diff --git a/src/model.rs b/src/model.rs
index 375d4db46..c4bc4e97a 100644
--- a/src/model.rs
+++ b/src/model.rs
@@ -12,10 +12,7 @@ pub struct Model {
 }
 
 impl Model {
-    pub fn from_path(base_path: PathBuf, rel_path: PathBuf) -> Self {
-        let mut path = base_path;
-        path.push(rel_path);
-
+    pub fn from_path(path: PathBuf) -> Self {
         Self { path }
     }