From 2a95c7b9d52e09aa82e54350fec514ceb69aab56 Mon Sep 17 00:00:00 2001
From: Melody Horn <melody@boringcactus.com>
Date: Sat, 27 Mar 2021 17:17:23 -0600
Subject: appease clippy in command_line

---
 src/main.rs                  | 2 +-
 src/makefile/command_line.rs | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/main.rs b/src/main.rs
index 0720ada..1c2faf5 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -8,7 +8,7 @@
     clippy::cargo,
     clippy::nursery
 )]
-#![allow(clippy::redundant_pub_crate)]
+#![allow(clippy::redundant_pub_crate, clippy::non_ascii_literal)]
 
 use std::fs::metadata;
 use std::io::stdin;
diff --git a/src/makefile/command_line.rs b/src/makefile/command_line.rs
index 6b42105..20b0d25 100644
--- a/src/makefile/command_line.rs
+++ b/src/makefile/command_line.rs
@@ -10,11 +10,11 @@ use crate::makefile::Makefile;
 // inspired by python's subprocess module
 fn execute_command_line(command_line: &str, ignore_errors: bool) -> Result<ExitStatus, io::Error> {
     let (program, args) = if cfg!(windows) {
-        let cmd = env::var("COMSPEC").unwrap_or("cmd.exe".into());
+        let cmd = env::var("COMSPEC").unwrap_or_else(|_| "cmd.exe".into());
         let args = vec!["/c", command_line];
         (cmd, args)
     } else {
-        let sh = env::var("SHELL").unwrap_or("/bin/sh".into());
+        let sh = env::var("SHELL").unwrap_or_else(|_| "/bin/sh".into());
         let args = if ignore_errors {
             vec!["-c", command_line]
         } else {
@@ -61,7 +61,7 @@ impl CommandLine {
             *text = text_chars.collect();
         }
 
-        CommandLine {
+        Self {
             ignore_errors,
             silent,
             always_execute,
-- 
cgit v1.2.3