From 6d468b88a31bd1384a79eab2a95f739b9bfa6aa7 Mon Sep 17 00:00:00 2001
From: Jonas Platte <jplatte+git@posteo.de>
Date: Sat, 2 Jan 2021 13:13:42 +0100
Subject: [PATCH] Release ruma-identifiers-validation 0.2.0 and
 ruma-identifiers 0.18.0-alpha.1

---
 ruma-api/Cargo.toml                      | 2 +-
 ruma-appservice-api/Cargo.toml           | 2 +-
 ruma-client-api/Cargo.toml               | 2 +-
 ruma-client/Cargo.toml                   | 2 +-
 ruma-common/Cargo.toml                   | 2 +-
 ruma-events-macros/Cargo.toml            | 2 +-
 ruma-events/Cargo.toml                   | 4 ++--
 ruma-federation-api/Cargo.toml           | 2 +-
 ruma-identifiers-macros/Cargo.toml       | 4 ++--
 ruma-identifiers-validation/CHANGELOG.md | 5 +++++
 ruma-identifiers-validation/Cargo.toml   | 4 ++--
 ruma-identifiers/CHANGELOG.md            | 6 ++++--
 ruma-identifiers/Cargo.toml              | 6 +++---
 ruma-identity-service-api/Cargo.toml     | 2 +-
 ruma-push-gateway-api/Cargo.toml         | 2 +-
 ruma-signatures/Cargo.toml               | 2 +-
 ruma/Cargo.toml                          | 2 +-
 17 files changed, 29 insertions(+), 22 deletions(-)
 create mode 100644 ruma-identifiers-validation/CHANGELOG.md

diff --git a/ruma-api/Cargo.toml b/ruma-api/Cargo.toml
index acf45ba2..e5359d71 100644
--- a/ruma-api/Cargo.toml
+++ b/ruma-api/Cargo.toml
@@ -19,7 +19,7 @@ edition = "2018"
 http = "0.2.2"
 percent-encoding = "2.1.0"
 ruma-api-macros = { version = "=0.17.0-alpha.1", path = "../ruma-api-macros" }
-ruma-identifiers = { version = "0.17.4", path = "../ruma-identifiers" }
+ruma-identifiers = { version = "=0.18.0-alpha.1", path = "../ruma-identifiers" }
 ruma-serde = { version = "0.3.0", path = "../ruma-serde" }
 serde = { version = "1.0.118", features = ["derive"] }
 serde_json = "1.0.60"
diff --git a/ruma-appservice-api/Cargo.toml b/ruma-appservice-api/Cargo.toml
index e5c8a51f..fe1b0e10 100644
--- a/ruma-appservice-api/Cargo.toml
+++ b/ruma-appservice-api/Cargo.toml
@@ -15,7 +15,7 @@ edition = "2018"
 ruma-api = { version = "=0.17.0-alpha.1", path = "../ruma-api" }
 ruma-common = { version = "0.2.0", path = "../ruma-common" }
 ruma-events = { version = "=0.22.0-alpha.1", path = "../ruma-events" }
-ruma-identifiers = { version = "0.17.4", path = "../ruma-identifiers" }
+ruma-identifiers = { version = "=0.18.0-alpha.1", path = "../ruma-identifiers" }
 ruma-serde = { version = "0.3.0", path = "../ruma-serde" }
 serde = { version = "1.0.118", features = ["derive"] }
 serde_json = "1.0.57"
diff --git a/ruma-client-api/Cargo.toml b/ruma-client-api/Cargo.toml
index 191157b8..1f286327 100644
--- a/ruma-client-api/Cargo.toml
+++ b/ruma-client-api/Cargo.toml
@@ -25,7 +25,7 @@ percent-encoding = "2.1.0"
 ruma-api = { version = "=0.17.0-alpha.1", path = "../ruma-api" }
 ruma-common = { version = "0.2.0", path = "../ruma-common" }
 ruma-events = { version = "=0.22.0-alpha.1", path = "../ruma-events" }
-ruma-identifiers = { version = "0.17.4", path = "../ruma-identifiers" }
+ruma-identifiers = { version = "=0.18.0-alpha.1", path = "../ruma-identifiers" }
 ruma-serde = { version = "0.3.0", path = "../ruma-serde" }
 serde = { version = "1.0.118", features = ["derive"] }
 serde_json = "1.0.60"
diff --git a/ruma-client/Cargo.toml b/ruma-client/Cargo.toml
index 082c87e2..5c6d626d 100644
--- a/ruma-client/Cargo.toml
+++ b/ruma-client/Cargo.toml
@@ -27,7 +27,7 @@ ruma-api = { version = "=0.17.0-alpha.1", path = "../ruma-api" }
 ruma-client-api = { version = "0.10.0-alpha.1", path = "../ruma-client-api" }
 ruma-common = { version = "0.2.0", path = "../ruma-common" }
 ruma-events = { version = "=0.22.0-alpha.1", path = "../ruma-events" }
-ruma-identifiers = { version = "0.17.4", path = "../ruma-identifiers" }
+ruma-identifiers = { version = "=0.18.0-alpha.1", path = "../ruma-identifiers" }
 ruma-serde = { version = "0.3.0", path = "../ruma-serde" }
 serde = { version = "1.0.118", features = ["derive"] }
 serde_json = "1.0.61"
diff --git a/ruma-common/Cargo.toml b/ruma-common/Cargo.toml
index b084df89..5698d103 100644
--- a/ruma-common/Cargo.toml
+++ b/ruma-common/Cargo.toml
@@ -13,7 +13,7 @@ edition = "2018"
 [dependencies]
 js_int = { version = "0.2.0", features = ["serde"] }
 maplit = "1.0.2"
-ruma-identifiers = { version = "0.17.4", path = "../ruma-identifiers" }
+ruma-identifiers = { version = "=0.18.0-alpha.1", path = "../ruma-identifiers" }
 ruma-serde = { version = "0.3.0", path = "../ruma-serde" }
 serde = { version = "1.0.118", features = ["derive"] }
 serde_json = { version = "1.0.60", features = ["raw_value"] }
diff --git a/ruma-events-macros/Cargo.toml b/ruma-events-macros/Cargo.toml
index 10e40ccb..6bd0d5eb 100644
--- a/ruma-events-macros/Cargo.toml
+++ b/ruma-events-macros/Cargo.toml
@@ -26,7 +26,7 @@ proc-macro-crate = "0.1.5"
 proc-macro = true
 
 [dev-dependencies]
-ruma-identifiers = { version = "0.17.4", path = "../ruma-identifiers" }
+ruma-identifiers = { version = "=0.18.0-alpha.1", path = "../ruma-identifiers" }
 serde_json = "1.0.60"
 js_int = { version = "0.2.0", features = ["serde"] }
 serde = { version = "1.0.118", features = ["derive"] }
diff --git a/ruma-events/Cargo.toml b/ruma-events/Cargo.toml
index 231058cb..2a4ffec8 100644
--- a/ruma-events/Cargo.toml
+++ b/ruma-events/Cargo.toml
@@ -17,7 +17,7 @@ criterion = { version = "0.3.3", optional = true }
 js_int = { version = "0.2.0", features = ["serde"] }
 ruma-common = { version = "0.2.0", path = "../ruma-common" }
 ruma-events-macros = { version = "=0.22.0-alpha.1", path = "../ruma-events-macros" }
-ruma-identifiers = { version = "0.17.4", path = "../ruma-identifiers" }
+ruma-identifiers = { version = "=0.18.0-alpha.1", path = "../ruma-identifiers" }
 ruma-serde = { version = "0.3.0", path = "../ruma-serde" }
 serde = { version = "1.0.118", features = ["derive"] }
 serde_json = { version = "1.0.60", features = ["raw_value"] }
@@ -25,7 +25,7 @@ serde_json = { version = "1.0.60", features = ["raw_value"] }
 [dev-dependencies]
 maplit = "1.0.2"
 matches = "0.1.8"
-ruma-identifiers = { version = "0.17.4", path = "../ruma-identifiers", features = ["rand"] }
+ruma-identifiers = { version = "=0.18.0-alpha.1", path = "../ruma-identifiers", features = ["rand"] }
 trybuild = "1.0.38"
 
 [features]
diff --git a/ruma-federation-api/Cargo.toml b/ruma-federation-api/Cargo.toml
index 3cd4c684..52f20af3 100644
--- a/ruma-federation-api/Cargo.toml
+++ b/ruma-federation-api/Cargo.toml
@@ -20,7 +20,7 @@ js_int = { version = "0.2.0", features = ["serde"] }
 ruma-api = { version = "=0.17.0-alpha.1", path = "../ruma-api" }
 ruma-common = { version = "0.2.0", path = "../ruma-common" }
 ruma-events = { version = "=0.22.0-alpha.1", path = "../ruma-events" }
-ruma-identifiers = { version = "0.17.4", path = "../ruma-identifiers" }
+ruma-identifiers = { version = "=0.18.0-alpha.1", path = "../ruma-identifiers" }
 ruma-serde = { version = "0.3.0", path = "../ruma-serde" }
 serde = { version = "1.0.118", features = ["derive"] }
 serde_json = "1.0.60"
diff --git a/ruma-identifiers-macros/Cargo.toml b/ruma-identifiers-macros/Cargo.toml
index 4b363c47..cb57c977 100644
--- a/ruma-identifiers-macros/Cargo.toml
+++ b/ruma-identifiers-macros/Cargo.toml
@@ -6,11 +6,11 @@ keywords = ["matrix", "chat", "messaging", "ruma"]
 license = "MIT"
 name = "ruma-identifiers-macros"
 repository = "https://github.com/ruma/ruma"
-version = "0.17.4"
+version = "0.18.0-alpha.1"
 edition = "2018"
 
 [dependencies]
-ruma-identifiers-validation = { version = "0.1.1", path = "../ruma-identifiers-validation", default-features = false }
+ruma-identifiers-validation = { version = "0.2.0", path = "../ruma-identifiers-validation", default-features = false }
 quote = "1.0.8"
 proc-macro2 = "1.0.24"
 syn = "1.0.55"
diff --git a/ruma-identifiers-validation/CHANGELOG.md b/ruma-identifiers-validation/CHANGELOG.md
new file mode 100644
index 00000000..ecc99e95
--- /dev/null
+++ b/ruma-identifiers-validation/CHANGELOG.md
@@ -0,0 +1,5 @@
+# 0.2.0
+
+Breaking changes:
+
+* Remove `key_algorithms` module (moved to ruma-identifers as `crypto_algorithms`)
diff --git a/ruma-identifiers-validation/Cargo.toml b/ruma-identifiers-validation/Cargo.toml
index d44c5a22..8e072349 100644
--- a/ruma-identifiers-validation/Cargo.toml
+++ b/ruma-identifiers-validation/Cargo.toml
@@ -9,7 +9,7 @@ authors = [
     "Jonas Platte <jplatte@posteo.de>",
 ]
 license = "MIT"
-version = "0.1.1"
+version = "0.2.0"
 edition = "2018"
 
 [features]
@@ -20,4 +20,4 @@ serde = { version = "1.0.118", optional = true, features = ["derive"] }
 
 [dev-dependencies]
 ruma-serde = { version = "0.3.0", path = "../ruma-serde" }
-serde_json = "1.0.60"
+serde_json = "1.0.61"
diff --git a/ruma-identifiers/CHANGELOG.md b/ruma-identifiers/CHANGELOG.md
index 5e357928..0dae3005 100644
--- a/ruma-identifiers/CHANGELOG.md
+++ b/ruma-identifiers/CHANGELOG.md
@@ -1,20 +1,22 @@
-# [unreleased]
+# 0.18.0 (unreleased)
 
 Breaking changes:
 
-* Update strum dependency to 0.19
 * Remove deprecated constructors
 * Remove deprecated `is_` methods
 * Rename `ServerKeyAlgorithm` to `SigningKeyAlgorithm`
 * Rename `ServerKeyId` to `ServerSigningKeyId`
 * Rename `Error::MissingSigil` to `Error::MissingLeadingSigil`
 * Merge all missing delimiter error variants
+* Update the set of conversion trait implementations for crypto algorithms
 
 Improvements:
 
 * Add `DeviceKeyId::from_parts` and `SigningKeyId::from_parts`
 * Add `DeviceIdBox` and `ServerNameBox` type aliases
 * Clean up debug logs for identifiers
+* Allow crypto algorithm enums to contain any string, for forwards compatibility
+  and to allow experimentation with non-specified ones
 
 # 0.17.4
 
diff --git a/ruma-identifiers/Cargo.toml b/ruma-identifiers/Cargo.toml
index c1f22e25..47a1e099 100644
--- a/ruma-identifiers/Cargo.toml
+++ b/ruma-identifiers/Cargo.toml
@@ -12,7 +12,7 @@ license = "MIT"
 name = "ruma-identifiers"
 readme = "README.md"
 repository = "https://github.com/ruma/ruma"
-version = "0.17.4"
+version = "0.18.0-alpha.1"
 edition = "2018"
 
 [package.metadata.docs.rs]
@@ -27,8 +27,8 @@ serde = ["ruma-serde", "serde1", "ruma-identifiers-validation/serde"]
 either = { version = "1.6.1", optional = true }
 paste = "1.0.4"
 rand = { version = "0.8.0", optional = true }
-ruma-identifiers-macros = { version = "=0.17.4", path = "../ruma-identifiers-macros" }
-ruma-identifiers-validation = { version = "0.1.1", path = "../ruma-identifiers-validation", default-features = false }
+ruma-identifiers-macros = { version = "=0.18.0-alpha.1", path = "../ruma-identifiers-macros" }
+ruma-identifiers-validation = { version = "0.2.0", path = "../ruma-identifiers-validation", default-features = false }
 ruma-serde = { version = "0.3.0", path = "../ruma-serde", optional = true }
 ruma-serde-macros = { version = "0.3.0", path = "../ruma-serde-macros" }
 # Renamed so we can have a serde feature.
diff --git a/ruma-identity-service-api/Cargo.toml b/ruma-identity-service-api/Cargo.toml
index 53456115..af1a2743 100644
--- a/ruma-identity-service-api/Cargo.toml
+++ b/ruma-identity-service-api/Cargo.toml
@@ -13,7 +13,7 @@ edition = "2018"
 [dependencies]
 ruma-api = { version = "=0.17.0-alpha.1", path = "../ruma-api" }
 ruma-common = { version = "0.2.0", path = "../ruma-common" }
-ruma-identifiers = { version = "0.17.4", path = "../ruma-identifiers" }
+ruma-identifiers = { version = "=0.18.0-alpha.1", path = "../ruma-identifiers" }
 ruma-serde = { version = "0.3.0", path = "../ruma-serde" }
 serde = { version = "1.0.114", features = ["derive"] }
 serde_json = "1.0.57"
diff --git a/ruma-push-gateway-api/Cargo.toml b/ruma-push-gateway-api/Cargo.toml
index 8e41281c..e893f567 100644
--- a/ruma-push-gateway-api/Cargo.toml
+++ b/ruma-push-gateway-api/Cargo.toml
@@ -15,7 +15,7 @@ js_int = { version = "0.2.0", features = ["serde"] }
 ruma-api = { version = "=0.17.0-alpha.1", path = "../ruma-api" }
 ruma-common = { version = "0.2.0", path = "../ruma-common" }
 ruma-events = { version = "0.22.0-alpha.1", path = "../ruma-events" }
-ruma-identifiers = { version = "0.17.4", path = "../ruma-identifiers" }
+ruma-identifiers = { version = "=0.18.0-alpha.1", path = "../ruma-identifiers" }
 ruma-serde = { version = "0.3.0", path = "../ruma-serde" }
 serde = { version = "1.0.118", features = ["derive"] }
 serde_json = "1.0.60"
diff --git a/ruma-signatures/Cargo.toml b/ruma-signatures/Cargo.toml
index a417475d..0513529d 100644
--- a/ruma-signatures/Cargo.toml
+++ b/ruma-signatures/Cargo.toml
@@ -15,7 +15,7 @@ version = "0.6.0-dev.1"
 [dependencies]
 base64 = "0.13.0"
 ring = "0.16.19"
-ruma-identifiers = { version = "0.17.4", path = "../ruma-identifiers" }
+ruma-identifiers = { version = "=0.18.0-alpha.1", path = "../ruma-identifiers" }
 ruma-serde = { version = "0.3.0", path = "../ruma-serde" }
 serde_json = "1.0.60"
 untrusted = "0.7.1"
diff --git a/ruma/Cargo.toml b/ruma/Cargo.toml
index f2035868..b01b9cfd 100644
--- a/ruma/Cargo.toml
+++ b/ruma/Cargo.toml
@@ -17,7 +17,7 @@ assign = "1.1.0"
 js_int = "0.2.0"
 
 ruma-common = { version = "0.2.0", path = "../ruma-common" }
-ruma-identifiers = { version = "0.17.4", path = "../ruma-identifiers", features = ["serde"] }
+ruma-identifiers = { version = "=0.18.0-alpha.1", path = "../ruma-identifiers", features = ["serde"] }
 ruma-serde = { version = "0.3.0", path = "../ruma-serde" }
 
 ruma-events = { version = "=0.22.0-alpha.1", path = "../ruma-events", optional = true }