Change `new_with_opt_and_conf` to accept `impl Into<Option<Opt>>` instead of explicit option

2 files changed, 6 insertions, 5 deletions

diff --git a/.bleep b/.bleep
index 6aa8cd3..6094ec7 100644
--- a/.bleep
+++ b/.bleep
@@ -1 +1 @@
-986270b9e07bce082ff02c86ca183b8c81d7abb8
\ No newline at end of file
+5575f7e332f3f097132e2281ce0e09cb0c11edfa
\ No newline at end of file
diff --git a/pingora-core/src/server/mod.rs b/pingora-core/src/server/mod.rs
index 3622354..c056ed2 100644
--- a/pingora-core/src/server/mod.rs
+++ b/pingora-core/src/server/mod.rs
@@ -194,12 +194,13 @@ impl Server {
     ///
     /// If a configuration file path is provided as part of `opt`, it will be ignored
     /// and a warning will be logged.
-    pub fn new_with_opt_and_conf(opt: Option<Opt>, mut conf: ServerConf) -> Server {
-        if let Some(opt) = &opt {
-            if let Some(c) = opt.conf.as_ref() {
+    pub fn new_with_opt_and_conf(raw_opt: impl Into<Option<Opt>>, mut conf: ServerConf) -> Server {
+        let opt = raw_opt.into();
+        if let Some(opts) = &opt {
+            if let Some(c) = opts.conf.as_ref() {
                 warn!("Ignoring command line argument using '{c}' as configuration, and using provided configuration instead.");
             }
-            conf.merge_with_opt(&opt);
+            conf.merge_with_opt(opts);
         }
 
         let (tx, rx) = watch::channel(false);