diff options
author | Matthias Beyer <matthias.beyer@atos.net> | 2021-04-27 09:13:32 +0200 |
---|---|---|
committer | Matthias Beyer <mail@beyermatthias.de> | 2021-05-11 11:20:52 +0200 |
commit | da98e8507857c6cc1a94cdc909b7e5fdb993bf0f (patch) | |
tree | ae33fe3cdab0a92d810e9ad7de33d825e5161f18 /src/db | |
parent | 52bd280b4b95949cf130e4d7477c02ad2d2f81b3 (diff) |
Refactor: Simplify by removing Into<String> implementation
This is actually an antipattern, because one should rather implement `ToString`
(or rather `Display`).
But because our type is nothing that would be displayed anyways, remove it
entirely.
Signed-off-by: Matthias Beyer <matthias.beyer@atos.net>
Diffstat (limited to 'src/db')
-rw-r--r-- | src/db/connection.rs | 24 |
1 files changed, 9 insertions, 15 deletions
diff --git a/src/db/connection.rs b/src/db/connection.rs index 5e91e24..4b1e386 100644 --- a/src/db/connection.rs +++ b/src/db/connection.rs @@ -41,20 +41,6 @@ pub struct DbConnectionConfig<'a> { database_connection_timeout: u16, } -impl<'a> Into<String> for DbConnectionConfig<'a> { - fn into(self) -> String { - format!( - "postgres://{user}:{password}@{host}:{port}/{name}?connect_timeout={timeout}", - host = self.database_host, - port = self.database_port, - user = self.database_user, - password = self.database_password, - name = self.database_name, - timeout = self.database_connection_timeout, - ) - } -} - pub fn parse_db_connection_config<'a>(config: &'a Configuration, cli: &'a ArgMatches) -> Result<DbConnectionConfig<'a>> { Ok(DbConnectionConfig { database_host: { @@ -92,7 +78,15 @@ pub fn parse_db_connection_config<'a>(config: &'a Configuration, cli: &'a ArgMat } pub fn establish_connection<'a>(conn_config: DbConnectionConfig<'a>) -> Result<PgConnection> { - let database_uri: String = conn_config.into(); + let database_uri: String = format!( + "postgres://{user}:{password}@{host}:{port}/{name}?connect_timeout={timeout}", + host = conn_config.database_host, + port = conn_config.database_port, + user = conn_config.database_user, + password = conn_config.database_password, + name = conn_config.database_name, + timeout = conn_config.database_connection_timeout, + ); debug!("Trying to connect to database: {}", database_uri); PgConnection::establish(&database_uri).map_err(Error::from) } |