maybe_override_interpreter -> override_interpreter

Author: dschrempf

nix-script-directives/src/lib.rs

@@ -139,10 +139,8 @@ impl Directives {
         Ok(())
     }
 
-    pub fn maybe_override_interpreter(&mut self, maybe_new: &Option<String>) {
-        if maybe_new.is_some() {
-            maybe_new.clone_into(&mut self.interpreter)
-        }
+    pub fn override_interpreter(&mut self, interpreter: &str) {
+        self.interpreter = Some(interpreter.to_owned());
     }
 
     pub fn merge_runtime_inputs(&mut self, new: &[String]) -> Result<()> {

nix-script/src/main.rs

@@ -177,7 +177,9 @@ impl Opts {
         directives
             .merge_build_inputs(&self.build_inputs)
             .context("could not add build inputs provided on the command line")?;
-        directives.maybe_override_interpreter(&self.interpreter);
+        if let Some(interpreter) = &self.interpreter {
+            directives.override_interpreter(interpreter)
+        }
         directives
             .merge_runtime_inputs(&self.runtime_inputs)
             .context("could not add runtime inputs provided on the command line")?;