Encapsulate migration state in a single structure (#3991)

Author: sandhose

Cargo.lock

@@ -91,6 +91,10 @@ features = ["cookie-private", "cookie-key-expansion", "typed-header"]
 [workspace.dependencies.base64ct]
 version = "1.6.0"
 
+# Packed bitfields
+[workspace.dependencies.bitflags]
+version = "2.6.0"
+
 # Bytes
 [workspace.dependencies.bytes]
 version = "1.10.0"

Cargo.toml

@@ -233,10 +233,10 @@ impl Options {
                 syn2mas::migrate(
                     &mut reader,
                     &mut writer,
-                    &mas_matrix.homeserver,
+                    mas_matrix.homeserver,
                     &clock,
                     &mut rng,
-                    &provider_id_mappings,
+                    provider_id_mappings,
                 )
                 .await?;
 

crates/cli/src/commands/syn2mas.rs

@@ -39,7 +39,7 @@ oauth2-types.workspace = true
 
 [dev-dependencies]
 assert_matches = "1.5.0"
-bitflags = "2.8.0"
+bitflags.workspace = true
 rand_chacha = "0.3.1"
 tokio.workspace = true
 wiremock.workspace = true

crates/oidc-client/Cargo.toml

@@ -11,6 +11,7 @@ repository.workspace = true
 
 [dependencies]
 anyhow.workspace = true
+bitflags.workspace = true
 camino.workspace = true
 figment.workspace = true
 serde.workspace = true