Replace license-exprs crate with spdx

Author: Turbo87

Cargo.lock

@@ -63,7 +63,7 @@ hyper = { version = "0.14", features = ["client", "http1"] }
 indexmap = { version = "1.7.0", features = ["serde-1"] }
 tikv-jemallocator = { version = "0.4.1", features = ['unprefixed_malloc_on_supported_platforms', 'profiling'] }
 lettre = { version = "0.10.0-rc.4", default-features = false, features = ["file-transport", "smtp-transport", "native-tls", "hostname", "builder"] }
-license-exprs = "1.6"
+spdx = "=0.7.0"
 minijinja = "0.8.2"
 moka = "0.6.1"
 oauth2 = { version = "4.1.0", default-features = false, features = ["reqwest"] }

Cargo.toml

@@ -190,8 +190,8 @@ impl NewVersion {
 
 fn validate_license_expr(s: &str) -> AppResult<()> {
     for part in s.split('/') {
-        license_exprs::validate_license_expr(part).map_err(|e| {
-            cargo_err(&format_args!("{}; see http://opensource.org/licenses for options, and http://spdx.org/licenses/ for their identifiers", e))
+        spdx::Expression::parse(part).map_err(|_| {
+            cargo_err("unknown or invalid license expression; see http://opensource.org/licenses for options, and http://spdx.org/licenses/ for their identifiers")
         })?;
     }
 
@@ -277,13 +277,10 @@ mod tests {
         assert_ok!(validate_license_expr("MIT OR Apache-2.0"));
         assert_ok!(validate_license_expr("MIT/Apache-2.0"));
         assert_ok!(validate_license_expr("MIT AND Apache-2.0"));
+        assert_ok!(validate_license_expr("MIT OR (Apache-2.0 AND MIT)"));
 
         let error = assert_err!(validate_license_expr("apache 2.0"));
         let error = format!("{}", error);
-        assert!(error.starts_with("unknown license or other term: apache; see http"));
-
-        let error = assert_err!(validate_license_expr("MIT OR (Apache-2.0 AND MIT)"));
-        let error = format!("{}", error);
-        assert!(error.starts_with("unknown license or other term: (Apache-2.0; see http"));
+        assert!(error.starts_with("unknown or invalid license expression; see http"));
     }
 }