Proxmox/proxmox
5
0
Fork 1
Code Issues Pull Requests Releases Activity

section-config: pass filesystem paths as AsRef<Path>

Browse Source 
Signed-off-by: Dietmar Maurer <dietmar@proxmox.com>
This commit is contained in:
Dietmar Maurer 2024-05-17 10:57:35 +02:00
parent cfc155a06b
commit a2693c7046
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
proxmox-section-config/src/lib.rs
View File

@ -18,6 +18,7 @@
//! ... //! ...
//! ``` //! ```
use std::path::Path;
use std::collections::HashMap; use std::collections::HashMap;
use std::collections::HashSet; use std::collections::HashSet;
@ -306,9 +307,9 @@ impl SectionConfig {
/// This verifies the whole data using the schemas defined in the /// This verifies the whole data using the schemas defined in the
/// plugins. Please note that `filename` is only used to improve /// plugins. Please note that `filename` is only used to improve
/// error messages. /// error messages.
pub fn write(&self, filename: &str, config: &SectionConfigData) -> Result<String, Error> { pub fn write<P: AsRef<Path>>(&self, filename: P, config: &SectionConfigData) -> Result<String, Error> {
self.write_do(config) self.write_do(config)
.map_err(|e: Error| format_err!("writing '{}' failed: {}", filename, e)) .map_err(|e: Error| format_err!("writing {:?} failed: {}", filename.as_ref(), e))
} }
fn write_do(&self, config: &SectionConfigData) -> Result<String, Error> { fn write_do(&self, config: &SectionConfigData) -> Result<String, Error> {
@ -393,7 +394,7 @@ impl SectionConfig {
/// This verifies the whole data using the schemas defined in the /// This verifies the whole data using the schemas defined in the
/// plugins. Please note that `filename` is only used to improve /// plugins. Please note that `filename` is only used to improve
/// error messages. /// error messages.
pub fn parse(&self, filename: &str, raw: &str) -> Result<SectionConfigData, Error> { pub fn parse<P: AsRef<Path>>(&self, filename: P, raw: &str) -> Result<SectionConfigData, Error> {
let mut state = ParseState::BeforeHeader; let mut state = ParseState::BeforeHeader;
let test_required_properties = |value: &Value, let test_required_properties = |value: &Value,
@ -572,7 +573,7 @@ impl SectionConfig {
Ok(result) Ok(result)
}) })
.map_err(|e: Error| format_err!("parsing '{}' failed: {}", filename, e)) .map_err(|e: Error| format_err!("parsing {:?} failed: {}", filename.as_ref(), e))
} }
fn default_format_section_header( fn default_format_section_header(