remove ::new()

Author: juleswritescode

crates/pg_completions/src/context.rs

@@ -266,7 +266,7 @@ mod tests {
                 position: (position as u32).into(),
                 text,
                 tree: Some(&tree),
-                schema: &pg_schema_cache::SchemaCache::new(),
+                schema: &pg_schema_cache::SchemaCache::default(),
             };
 
             let ctx = CompletionContext::new(&params);
@@ -298,7 +298,7 @@ mod tests {
                 position: (position as u32).into(),
                 text,
                 tree: Some(&tree),
-                schema: &pg_schema_cache::SchemaCache::new(),
+                schema: &pg_schema_cache::SchemaCache::default(),
             };
 
             let ctx = CompletionContext::new(&params);
@@ -332,7 +332,7 @@ mod tests {
                 position: (position as u32).into(),
                 text,
                 tree: Some(&tree),
-                schema: &pg_schema_cache::SchemaCache::new(),
+                schema: &pg_schema_cache::SchemaCache::default(),
             };
 
             let ctx = CompletionContext::new(&params);
@@ -357,7 +357,7 @@ mod tests {
                 position: (position as u32).into(),
                 text,
                 tree: Some(&tree),
-                schema: &pg_schema_cache::SchemaCache::new(),
+                schema: &pg_schema_cache::SchemaCache::default(),
             };
 
             let ctx = CompletionContext::new(&params);
@@ -385,7 +385,7 @@ mod tests {
             position: (position as u32).into(),
             text,
             tree: Some(&tree),
-            schema: &pg_schema_cache::SchemaCache::new(),
+            schema: &pg_schema_cache::SchemaCache::default(),
         };
 
         let ctx = CompletionContext::new(&params);
@@ -411,7 +411,7 @@ mod tests {
             position: (position as u32).into(),
             text,
             tree: Some(&tree),
-            schema: &pg_schema_cache::SchemaCache::new(),
+            schema: &pg_schema_cache::SchemaCache::default(),
         };
 
         let ctx = CompletionContext::new(&params);
@@ -436,7 +436,7 @@ mod tests {
             position: (position as u32).into(),
             text,
             tree: Some(&tree),
-            schema: &pg_schema_cache::SchemaCache::new(),
+            schema: &pg_schema_cache::SchemaCache::default(),
         };
 
         let ctx = CompletionContext::new(&params);

crates/pg_configuration/src/lib.rs

@@ -104,6 +104,7 @@ impl PartialConfiguration {
                 username: Some("postgres".to_string()),
                 password: Some("postgres".to_string()),
                 database: Some("postgres".to_string()),
+                conn_timeout_secs: Some(10),
             }),
         }
     }

crates/pg_schema_cache/src/schema_cache.rs

@@ -18,10 +18,6 @@ pub struct SchemaCache {
 }
 
 impl SchemaCache {
-    pub fn new() -> SchemaCache {
-        SchemaCache::default()
-    }
-
     pub async fn load(pool: &PgPool) -> Result<SchemaCache, sqlx::Error> {
         let (schemas, tables, functions, types, versions, columns) = futures_util::try_join!(
             Schema::load(pool),

crates/pg_workspace/src/settings.rs

@@ -267,7 +267,7 @@ pub struct DatabaseSettings {
     pub username: String,
     pub password: String,
     pub database: String,
-    pub conn_timeout: Duration,
+    pub conn_timeout_secs: Duration,
 }
 
 impl Default for DatabaseSettings {
@@ -278,7 +278,7 @@ impl Default for DatabaseSettings {
             username: "postgres".to_string(),
             password: "postgres".to_string(),
             database: "postgres".to_string(),
-            conn_timeout: Duration::from_secs(10),
+            conn_timeout_secs: Duration::from_secs(10),
         }
     }
 }
@@ -292,7 +292,10 @@ impl From<PartialDatabaseConfiguration> for DatabaseSettings {
             username: value.username.unwrap_or(d.username),
             password: value.password.unwrap_or(d.password),
             database: value.database.unwrap_or(d.database),
-            conn_timeout: value.conn_timeout.unwrap_or(d.conn_timeout),
+            conn_timeout_secs: value
+                .conn_timeout_secs
+                .map(|s| Duration::from_secs(s.into()))
+                .unwrap_or(d.conn_timeout_secs),
         }
     }
 }

crates/pg_workspace/src/workspace/server.rs

@@ -64,7 +64,7 @@ impl DbConnection {
             .password(&settings.password)
             .database(&settings.database);
 
-        let timeout = settings.conn_timeout.clone();
+        let timeout = settings.conn_timeout_secs.clone();
 
         let maybe_pool = run_async(async move {
             PoolOptions::<Postgres>::new()