Descriptors: constructor is now generic

This commit is contained in:
132nd-Professor
2021-07-02 18:46:25 +02:00
parent e2ab2787e7
commit 9dc8005d39
2 changed files with 4 additions and 4 deletions
+2 -2
View File
@@ -66,7 +66,7 @@ pub mod lib {
}
impl Descriptors<fs::File> {
pub fn new_for_file(filenames: OutputFilenames) -> Descriptors<fs::File> {
pub fn new(filenames: OutputFilenames) -> Descriptors<fs::File> {
let blue = fs::File::create(&filenames.txt.blue).expect(ERR_CANNOT_OPEN_OUTPUT);
let red = fs::File::create(&filenames.txt.red).expect(ERR_CANNOT_OPEN_OUTPUT);
let violet = fs::File::create(&filenames.txt.violet).expect(ERR_CANNOT_OPEN_OUTPUT);
@@ -76,7 +76,7 @@ pub mod lib {
}
impl Descriptors<zip::ZipWriter<fs::File>> {
pub fn new_for_zip(filenames: OutputFilenames) -> Descriptors<zip::ZipWriter<fs::File>> {
pub fn new(filenames: OutputFilenames) -> Descriptors<zip::ZipWriter<fs::File>> {
let options = zip::write::FileOptions::default().compression_method(zip::CompressionMethod::Deflated);
let file = fs::File::create(&filenames.zip.blue).expect(ERR_CANNOT_OPEN_OUTPUT);
+2 -2
View File
@@ -24,10 +24,10 @@ fn main() {
let output_filenames = get_output_filenames(&input_filename);
if is_zip {
let mut descriptors = lib::Descriptors::new_for_zip(output_filenames);
let mut descriptors = lib::Descriptors::<zip::ZipWriter<fs::File>>::new(output_filenames);
descriptors.write(header, bodies_by_coalition);
} else {
let mut descriptors = lib::Descriptors::new_for_file(output_filenames);
let mut descriptors = lib::Descriptors::<fs::File>::new(output_filenames);
descriptors.write(header, bodies_by_coalition);
}
}