FullUserId: implement Display

Author: reivilibre

crates/cli/src/commands/syn2mas.rs

@@ -200,6 +200,7 @@ impl Options {
                 Ok(ExitCode::SUCCESS)
             }
             Subcommand::Migrate => {
+                let provider_id_mappings: HashMap<String, Uuid> = HashMap::new();
                 // TODO how should we handle warnings at this stage?
 
                 let mut reader = SynapseReader::new(&mut syn_conn, true).await?;
@@ -215,8 +216,14 @@ impl Options {
 
                 // TODO progress reporting
                 let mas_matrix = MatrixConfig::extract(figment)?;
-                syn2mas::migrate(&mut reader, &mut writer, &mas_matrix.homeserver, &mut rng)
-                    .await?;
+                syn2mas::migrate(
+                    &mut reader,
+                    &mut writer,
+                    &mas_matrix.homeserver,
+                    &mut rng,
+                    &provider_id_mappings,
+                )
+                .await?;
 
                 reader.finish().await?;
                 writer.finish().await?;

crates/syn2mas/src/synapse_reader/mod.rs

@@ -8,6 +8,8 @@
 //! This module provides facilities for streaming relevant types of database
 //! records from a Synapse database.
 
+use std::fmt::Display;
+
 use chrono::{DateTime, Utc};
 use futures_util::{Stream, TryStreamExt};
 use sqlx::{query, Acquire, FromRow, PgConnection, Postgres, Row, Transaction, Type};
@@ -30,6 +32,12 @@ pub enum Error {
 #[derive(Clone, Debug, sqlx::Decode, PartialEq, Eq, PartialOrd, Ord)]
 pub struct FullUserId(pub String);
 
+impl Display for FullUserId {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        self.0.fmt(f)
+    }
+}
+
 impl Type<Postgres> for FullUserId {
     fn type_info() -> <sqlx::Postgres as sqlx::Database>::TypeInfo {
         <String as Type<Postgres>>::type_info()