Remove unused config.manifest_path field

Author: phil-opp

src/config.rs

@@ -1,27 +1,26 @@
 use crate::ErrorMessage;
-use std::path::PathBuf;
+use std::path::Path;
 use toml::Value;
 
 #[derive(Debug, Clone)]
 pub struct Config {
-    pub manifest_path: PathBuf,
     pub default_target: Option<String>,
     pub run_command: Vec<String>,
     pub run_args: Option<Vec<String>>,
     pub test_timeout: u32,
 }
 
-pub(crate) fn read_config(manifest_path: PathBuf) -> Result<Config, ErrorMessage> {
+pub(crate) fn read_config(manifest_path: &Path) -> Result<Config, ErrorMessage> {
     let config = read_config_inner(manifest_path)
         .map_err(|err| format!("Failed to read bootimage configuration: {:?}", err))?;
     Ok(config)
 }
 
-pub(crate) fn read_config_inner(manifest_path: PathBuf) -> Result<Config, ErrorMessage> {
+pub(crate) fn read_config_inner(manifest_path: &Path) -> Result<Config, ErrorMessage> {
     use std::{fs::File, io::Read};
     let cargo_toml: Value = {
         let mut content = String::new();
-        File::open(&manifest_path)
+        File::open(manifest_path)
             .map_err(|e| format!("Failed to open Cargo.toml: {}", e))?
             .read_to_string(&mut content)
             .map_err(|e| format!("Failed to read Cargo.toml: {}", e))?;
@@ -36,21 +35,14 @@ pub(crate) fn read_config_inner(manifest_path: PathBuf) -> Result<Config, ErrorM
         .and_then(|table| table.get("bootimage"));
     let metadata = match metadata {
         None => {
-            return Ok(ConfigBuilder {
-                manifest_path: Some(manifest_path),
-                ..Default::default()
-            }
-            .into());
+            return Ok(ConfigBuilder::default().into());
         }
         Some(metadata) => metadata
             .as_table()
             .ok_or(format!("Bootimage configuration invalid: {:?}", metadata))?,
     };
 
-    let mut config = ConfigBuilder {
-        manifest_path: Some(manifest_path),
-        ..Default::default()
-    };
+    let mut config = ConfigBuilder::default();
 
     for (key, value) in metadata {
         match (key.as_str(), value.clone()) {
@@ -93,7 +85,6 @@ pub(crate) fn read_config_inner(manifest_path: PathBuf) -> Result<Config, ErrorM
 
 #[derive(Default)]
 struct ConfigBuilder {
-    manifest_path: Option<PathBuf>,
     default_target: Option<String>,
     run_command: Option<Vec<String>>,
     run_args: Option<Vec<String>>,
@@ -103,7 +94,6 @@ struct ConfigBuilder {
 impl Into<Config> for ConfigBuilder {
     fn into(self) -> Config {
         Config {
-            manifest_path: self.manifest_path.expect("manifest path must be set"),
             default_target: self.default_target,
             run_command: self.run_command.unwrap_or(vec![
                 "qemu-system-x86_64".into(),

src/subcommand/build.rs

@@ -3,7 +3,7 @@ use std::{path::PathBuf, process};
 
 pub(crate) fn build(mut args: Args) -> Result<(), ErrorMessage> {
     let builder = Builder::new(args.manifest_path().clone())?;
-    let config = config::read_config(builder.kernel_manifest_path().to_owned())?;
+    let config = config::read_config(builder.kernel_manifest_path())?;
     args.apply_default_target(&config, builder.kernel_root());
 
     let quiet = args.quiet;

src/subcommand/run.rs

@@ -5,7 +5,7 @@ pub(crate) fn run(mut args: Args) -> Result<i32, ErrorMessage> {
     use crate::subcommand::build;
 
     let builder = Builder::new(args.manifest_path().clone())?;
-    let config = config::read_config(builder.kernel_manifest_path().to_owned())?;
+    let config = config::read_config(builder.kernel_manifest_path())?;
     args.apply_default_target(&config, builder.kernel_root());
 
     let quiet = args.quiet;

src/subcommand/runner.rs

@@ -3,7 +3,7 @@ use std::process;
 
 pub(crate) fn runner(args: RunnerArgs) -> Result<i32, ErrorMessage> {
     let builder = Builder::new(None)?;
-    let config = config::read_config(builder.kernel_manifest_path().to_owned())?;
+    let config = config::read_config(builder.kernel_manifest_path())?;
 
     let bootimage_bin = {
         let parent = args

src/subcommand/test.rs

@@ -5,7 +5,7 @@ use wait_timeout::ChildExt;
 
 pub(crate) fn test(mut args: Args) -> Result<(), ErrorMessage> {
     let builder = Builder::new(args.manifest_path().clone())?;
-    let config = config::read_config(builder.kernel_manifest_path().to_owned())?;
+    let config = config::read_config(builder.kernel_manifest_path())?;
     args.apply_default_target(&config, builder.kernel_root());
 
     let test_args = args.clone();