Do not take optional as argument

src/bin/bat/app.rs

@@ -260,18 +260,16 @@ impl App {
 
         let mut file_input = Vec::new();
         for (input, name) in files_or_none.zip(filenames_or_none) {
-            match input {
+            if let Some(input) = input {
-                Some(input) => {
                 if input.to_str().unwrap() == "-" {
                     file_input.push(InputFile::StdIn(name));
                 } else {
-                        file_input.push(InputFile::Ordinary(OrdinaryFile::from_path_with_name(
+                    let ofile = name.map_or(OrdinaryFile::from_path(input), |n| {
-                            input, name,
+                        OrdinaryFile::from_path_with_name(input, n)
-                        )))
+                    });
+                    file_input.push(InputFile::Ordinary(ofile))
                 }
             }
-                None => {}
-            }
         }
         return Ok(file_input);
     }

src/inputfile.rs

@@ -66,13 +66,10 @@ impl<'a> OrdinaryFile<'a> {
         }
     }
 
-    pub fn from_path_with_name(
+    pub fn from_path_with_name(path: &'a OsStr, user_provided_name: &'a OsStr) -> OrdinaryFile<'a> {
-        path: &'a OsStr,
-        user_provided_name: Option<&'a OsStr>,
-    ) -> OrdinaryFile<'a> {
         OrdinaryFile {
             path,
-            user_provided_name,
+            user_provided_name: Some(user_provided_name),
         }
     }