@@ -454,9 +454,8 @@ fn run() -> Result<()> {
454454 .help("When to use the pager"),
455455 )
456456 .arg(
457− Arg::with_name("list languages")
457+ Arg::with_name("list-languages")
458458 .long("list-languages")
459− .takes_value(false)
460459 .help("Displays supported languages")
461460 )
462461 .subcommand(
@@ -565,26 +564,17 @@ fn run() -> Result<()> {
565564 )
566565 })?;
567566
568− if let Some(_) = app_matches.values_of("list languages") {
567+ if app_matches.is_present("list-languages") {
569568 let languages = assets.syntax_set.syntaxes();
570569
571− let longest = match languages.iter()
570+ let longest = languages.iter()
572571 .map(|s| s.name.len())
573− .max() {
574− Some(length) => length,
575− None => 32, // Fallback width if they have no language definitions.
576− };
572+ .max()
573+ .unwrap_or(32); // Fallback width if they have no language definitions.
577574
578575 for lang in languages {
579576 print!("{:width$} | ", lang.name, width = longest);
580− for i in 0..lang.file_extensions.len() {
581− print!("{}", lang.file_extensions[i]);
582−
583− if i < lang.file_extensions.len() - 1 {
584− print!(", ");
585− }
586− }
587− println!();
577+ println!("{}", lang.file_extensions.join(", "));
588578 }
589579
590580 return Ok(());