Fix merge conflict

This commit is contained in:
David Peter 2021-10-17 17:10:46 +02:00
parent f592155db7
commit 8a4e791025

View File

@ -42,19 +42,11 @@ struct ExporterWithFilename {
}
/// Handles the management of multiple file exporters.
#[derive(Default)]
pub struct ExportManager {
exporters: Vec<ExporterWithFilename>,
}
impl Default for ExportManager {
/// Create a new ExportManager
fn default() -> ExportManager {
ExportManager {
exporters: Vec::new(),
}
}
}
impl ExportManager {
/// Add an additional exporter to the ExportManager
pub fn add_exporter(&mut self, export_type: ExportType, filename: &str) -> Result<()> {
@ -84,13 +76,6 @@ impl ExportManager {
}
}
impl Default for ExportManager {
/// Create a new default ExportManager
fn default() -> Self {
ExportManager::new()
}
}
/// Write the given content to a file with the specified name
fn write_to_file(filename: &str, content: &[u8]) -> Result<()> {
let mut file = OpenOptions::new().write(true).open(filename)?;