From fcf1e106d3402ee506e0c5419a83d5d25bd650c9 Mon Sep 17 00:00:00 2001
From: Henri Sivonen <hsivonen@hsivonen.fi>
Date: Thu, 9 Dec 2021 14:51:05 +0200
Subject: [PATCH] Use SPDX with parentheses in metadata.

---
 Cargo.toml |  2 +-
 README.md  | 22 +++++-----------------
 2 files changed, 6 insertions(+), 18 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 0960bfa2..fdc0cb23 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -4,7 +4,7 @@ description = "A Gecko-oriented implementation of the Encoding Standard"
 version = "0.8.30"
 edition = '2018'
 authors = ["Henri Sivonen <hsivonen@hsivonen.fi>"]
-license-file = "COPYRIGHT"
+license = "(Apache-2.0 OR MIT) AND BSD-3-Clause"
 readme = "README.md"
 documentation = "https://docs.rs/encoding_rs/"
 homepage = "https://docs.rs/encoding_rs/"
diff --git a/README.md b/README.md
index 5580911b..d75d77d9 100644
--- a/README.md
+++ b/README.md
@@ -117,10 +117,7 @@ characters. Vietnamese tone marks can be decomposed using the
 
 ## Licensing
 
-TL;DR: ((Apache-2.0 OR MIT) AND BSD-3-Clause) for the code and data combination,
-but [crates.io doesn't support
-parentheses](https://github.com/rust-lang/crates.io/issues/2595), so the crate
-metadata points to a custom file.
+TL;DR: `(Apache-2.0 OR MIT) AND BSD-3-Clause` for the code and data combination.
 
 Please see the file named
 [COPYRIGHT](https://github.com/hsivonen/encoding_rs/blob/master/COPYRIGHT).
@@ -134,19 +131,6 @@ from CC0 to BSD-3-Clause between the initial release of this crate and the prese
 version of this crate. The in-source licensing legends have been updated for the
 parts of the generated code that have changed since the upstream license change.
 
-To work around the lack of support for paretheses in crates.io metadata, the
-`cargo deny` clarification is:
-
-```toml
-[[licenses.clarify]]
-name = "encoding_rs"
-version = "*"
-expression = "(Apache-2.0 OR MIT) AND BSD-3-Clause"
-license-files = [
-    { path = "COPYRIGHT", hash = 0x39f8ad31 }
-]
-```
-
 ## Documentation
 
 Generated [API documentation](https://docs.rs/encoding_rs/) is available
@@ -466,6 +450,10 @@ To regenerate the generated code:
 
 ## Release Notes
 
+### 0.8.31
+
+* Use SPDX with parentheses now that crates.io supports parentheses.
+
 ### 0.8.30
 
 * Update the licensing information to take into account the WHATWG data license change.