progress

Author: psteinroe

crates/pgls_configuration/src/database.rs

@@ -73,9 +73,7 @@ impl PartialDatabaseConfiguration {
     pub fn from_env() -> Option<Self> {
         let database_url = std::env::var("DATABASE_URL").ok();
         let pghost = std::env::var("PGHOST").ok();
-        let pgport = std::env::var("PGPORT")
-            .ok()
-            .and_then(|p| p.parse().ok());
+        let pgport = std::env::var("PGPORT").ok().and_then(|p| p.parse().ok());
         let pguser = std::env::var("PGUSER").ok();
         let pgpassword = std::env::var("PGPASSWORD").ok();
         let pgdatabase = std::env::var("PGDATABASE").ok();

crates/pgls_env/src/lib.rs

@@ -76,18 +76,9 @@ impl PgLSEnv {
                 "DATABASE_URL",
                 "A connection string that encodes the full database connection setup.",
             ),
-            pghost: PgLSEnvVariable::new(
-                "PGHOST",
-                "The host of the database server.",
-            ),
-            pgport: PgLSEnvVariable::new(
-                "PGPORT",
-                "The port of the database server.",
-            ),
-            pguser: PgLSEnvVariable::new(
-                "PGUSER",
-                "The username to connect to the database.",
-            ),
+            pghost: PgLSEnvVariable::new("PGHOST", "The host of the database server."),
+            pgport: PgLSEnvVariable::new("PGPORT", "The port of the database server."),
+            pguser: PgLSEnvVariable::new("PGUSER", "The username to connect to the database."),
             pgpassword: PgLSEnvVariable::new(
                 "PGPASSWORD",
                 "The password to connect to the database.",