mirror of
https://github.com/sharkdp/hyperfine.git
synced 2026-11-03 01:21:25 +00:00
Fix merge conflict
This commit is contained in:
1 parent
f592155db7
commit
8a4e791025
1 file changed
+1
-16
+1
-16
@@ -42,19 +42,11 @@ struct ExporterWithFilename {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/// Handles the management of multiple file exporters.
|
/// Handles the management of multiple file exporters.
|
||||||
|
#[derive(Default)]
|
||||||
pub struct ExportManager {
|
pub struct ExportManager {
|
||||||
exporters: Vec<ExporterWithFilename>,
|
exporters: Vec<ExporterWithFilename>,
|
||||||
}
|
}
|
||||||
|
|
||||||
impl Default for ExportManager {
|
|
||||||
/// Create a new ExportManager
|
|
||||||
fn default() -> ExportManager {
|
|
||||||
ExportManager {
|
|
||||||
exporters: Vec::new(),
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
impl ExportManager {
|
impl ExportManager {
|
||||||
/// Add an additional exporter to the ExportManager
|
/// Add an additional exporter to the ExportManager
|
||||||
pub fn add_exporter(&mut self, export_type: ExportType, filename: &str) -> Result<()> {
|
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
|
/// Write the given content to a file with the specified name
|
||||||
fn write_to_file(filename: &str, content: &[u8]) -> Result<()> {
|
fn write_to_file(filename: &str, content: &[u8]) -> Result<()> {
|
||||||
let mut file = OpenOptions::new().write(true).open(filename)?;
|
let mut file = OpenOptions::new().write(true).open(filename)?;
|
||||||
|
|||||||
Reference in new issue
Block a user