From 9dc8005d39560ba4e9b0e83b21c48f2a934e5f70 Mon Sep 17 00:00:00 2001
From: 132nd-Professor <132nd-Professor>
Date: Fri, 2 Jul 2021 18:46:25 +0200
Subject: [PATCH] Descriptors: constructor is now generic

---
 src/lib.rs  | 4 ++--
 src/main.rs | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/lib.rs b/src/lib.rs
index 489f4c0..2aee6b0 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -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);
diff --git a/src/main.rs b/src/main.rs
index 8f13fa0..3b1e974 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -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);
     }
 }