From f540f115a364a083700eb5f9e3968d308e3b5291 Mon Sep 17 00:00:00 2001
From: Egor Suvorov <egor@neon.tech>
Date: Thu, 7 Jul 2022 16:53:12 +0300
Subject: [PATCH] postgres_ffi/wal_craft: simplify API

---
 libs/postgres_ffi/src/xlog_utils.rs              | 2 +-
 libs/postgres_ffi/wal_craft/src/bin/wal_craft.rs | 2 +-
 libs/postgres_ffi/wal_craft/src/lib.rs           | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/libs/postgres_ffi/src/xlog_utils.rs b/libs/postgres_ffi/src/xlog_utils.rs
index b7464da887..17891fb94f 100644
--- a/libs/postgres_ffi/src/xlog_utils.rs
+++ b/libs/postgres_ffi/src/xlog_utils.rs
@@ -621,7 +621,7 @@ mod tests {
             fs::remove_dir_all(&cfg.datadir).unwrap();
         }
         cfg.initdb().unwrap();
-        let mut srv = cfg.start_server().unwrap();
+        let srv = cfg.start_server().unwrap();
         let expected_wal_end: Lsn =
             u64::from(C::craft(&mut srv.connect_with_timeout().unwrap()).unwrap()).into();
         srv.kill();
diff --git a/libs/postgres_ffi/wal_craft/src/bin/wal_craft.rs b/libs/postgres_ffi/wal_craft/src/bin/wal_craft.rs
index 2c50bebdd2..13892538d0 100644
--- a/libs/postgres_ffi/wal_craft/src/bin/wal_craft.rs
+++ b/libs/postgres_ffi/wal_craft/src/bin/wal_craft.rs
@@ -85,7 +85,7 @@ fn main() -> Result<()> {
                 datadir: arg_matches.value_of("datadir").unwrap().into(),
             };
             cfg.initdb()?;
-            let mut srv = cfg.start_server()?;
+            let srv = cfg.start_server()?;
             wal_craft(arg_matches, &mut srv.connect_with_timeout()?)?;
             srv.kill();
             Ok(())
diff --git a/libs/postgres_ffi/wal_craft/src/lib.rs b/libs/postgres_ffi/wal_craft/src/lib.rs
index 52ecae59ff..51482137c8 100644
--- a/libs/postgres_ffi/wal_craft/src/lib.rs
+++ b/libs/postgres_ffi/wal_craft/src/lib.rs
@@ -154,7 +154,7 @@ impl PostgresServer {
         bail!("Connection timed out");
     }
 
-    pub fn kill(&mut self) {
+    pub fn kill(mut self) {
         self.process.kill().unwrap();
         self.process.wait().unwrap();
     }