Merge pull request #620 from patochectp/minor_refactoring

[tech] minor refactoring

gtfs2ntfs/src/main.rs

@@ -27,19 +27,19 @@ use transit_model::Result;
 #[structopt(name = "gtfs2ntfs", about = "Convert a GTFS to an NTFS.")]
 struct Opt {
     /// input directory.
-    #[structopt(short = "i", long = "input", parse(from_os_str), default_value = ".")]
+    #[structopt(short, long, parse(from_os_str), default_value = ".")]
     input: PathBuf,
 
     /// output directory
-    #[structopt(short = "o", long = "output", parse(from_os_str))]
+    #[structopt(short, long, parse(from_os_str))]
     output: PathBuf,
 
     /// config file
-    #[structopt(short = "c", long = "config", parse(from_os_str))]
+    #[structopt(short, long, parse(from_os_str))]
     config: Option<PathBuf>,
 
     /// prefix
-    #[structopt(short = "p", long = "prefix")]
+    #[structopt(short, long)]
     prefix: Option<String>,
 
     /// OnDemandTransport GTFS source

src/gtfs/mod.rs

@@ -269,7 +269,7 @@ pub struct Configuration<P: AsRef<Path>> {
     pub on_demand_transport_comment: Option<String>,
 }
 
-fn read<H>(file_handler: &mut H, configuration: Configuration<impl AsRef<Path>>) -> Result<Model>
+fn read<H, P: AsRef<Path>>(file_handler: &mut H, configuration: Configuration<P>) -> Result<Model>
 where
     for<'a> &'a mut H: read_utils::FileHandler,
 {