Skip to content

Don't apply custom Path prefix twice #153

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
lforchini wants to merge 1 commit into from
Draft

Don't apply custom Path prefix twice #153

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/backends/qemu/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ impl QemuConfig {
/// Read `<dir>/qemu.json` if present, otherwise return the
/// built-in defaults.
pub fn from_dir(dir: &Path) -> Result<Self, ConfigError> {
let path = Path::new(&dir.join("qemu.json"));
let path = dir.join("qemu.json");
config::load_config_or_default(&path)
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/engines/threshold.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -408,7 +408,7 @@ impl ThresholdEngine {

/// Load `threshold.json`, falling back to built-in defaults when absent.
pub fn from_config_dir(dir: &Path) -> Result<Self, EngineError> {
let path = Path::new(&dir.join(format!("{ENGINE_NAME}.json")));
let path = dir.join(format!("{ENGINE_NAME}.json"));
let cfg: ThresholdConfig = config::load_config_or_default(&path)?;
cfg.validate()?;
Ok(Self::new(cfg))
Expand Down
Loading