Merge pull request #127 from portgasd666/master

Bump license from 0.7.1 to 0.8.1

Author: o2sh

Cargo.lock

@@ -12,7 +12,7 @@ exclude = ["assets/*.png"]
 colored= "1.8.0"
 git2 = {version = "0.7.5", default-features = false}
 tokei = "10.0"
-license = "0.7.1"
+license = "0.8.1"
 bytecount = "0.5.1"
 clap = "2.33.0"
 strum = "0.16.0"

Cargo.toml

@@ -2,11 +2,10 @@ use std::ffi::OsStr;
 use std::fmt::Write;
 use std::fs;
 use std::process::Command;
-use std::str::FromStr;
 
 use colored::{Color, Colorize, ColoredString};
 use git2::Repository;
-use license::License;
+use license;
 use image::DynamicImage;
 
 use crate::language::Language;
@@ -530,10 +529,9 @@ impl Info {
                             .is_empty())
                 }, // TODO: multiple prefixes, like COPYING?
             )
-            .map(|entry| {
-                license::Kind::from_str(&fs::read_to_string(entry).unwrap_or_else(|_| "".into()))
+            .filter_map(|entry| {
+                license::from_text_ext(&fs::read_to_string(entry).unwrap_or_else(|_| "".into()))
             })
-            .filter_map(std::result::Result::ok)
             .map(|license| license.name().to_string())
             .collect::<Vec<_>>()
             .join(", ");