From e05e6b42fe71caa75ad7ddae70bbda0532c716dd Mon Sep 17 00:00:00 2001
From: Chris Gillespie <6572184+gillespiecd@users.noreply.github.com>
Date: Sun, 13 Sep 2020 18:15:44 -0700
Subject: [PATCH] Simplify a few boolean creations (#2543)

---
 crates/nu-cli/src/commands/str_/contains.rs    | 14 +++++---------
 crates/nu-cli/src/commands/str_/ends_with.rs   |  8 +++-----
 crates/nu-cli/src/commands/str_/starts_with.rs |  8 +++-----
 crates/nu-cli/src/commands/which_.rs           |  2 +-
 crates/nu-protocol/src/value.rs                |  4 ++--
 5 files changed, 14 insertions(+), 22 deletions(-)

diff --git a/crates/nu-cli/src/commands/str_/contains.rs b/crates/nu-cli/src/commands/str_/contains.rs
index ff1975ba2f..1975120362 100644
--- a/crates/nu-cli/src/commands/str_/contains.rs
+++ b/crates/nu-cli/src/commands/str_/contains.rs
@@ -130,7 +130,7 @@ fn action(
 mod tests {
     use super::{action, SubCommand};
     use nu_plugin::test_helpers::value::string;
-    use nu_protocol::{Primitive, UntaggedValue};
+    use nu_protocol::UntaggedValue;
     use nu_source::Tag;
 
     #[test]
@@ -145,8 +145,7 @@ mod tests {
         let word = string("Cargo.tomL");
         let pattern = ".tomL";
         let insensitive = false;
-        let expected =
-            UntaggedValue::Primitive(Primitive::Boolean(true.into())).into_untagged_value();
+        let expected = UntaggedValue::boolean(true).into_untagged_value();
 
         let actual = action(&word, &pattern, insensitive, Tag::unknown()).unwrap();
         assert_eq!(actual, expected);
@@ -157,8 +156,7 @@ mod tests {
         let word = string("Cargo.tomL");
         let pattern = "Lomt.";
         let insensitive = false;
-        let expected =
-            UntaggedValue::Primitive(Primitive::Boolean(false.into())).into_untagged_value();
+        let expected = UntaggedValue::boolean(false).into_untagged_value();
 
         let actual = action(&word, &pattern, insensitive, Tag::unknown()).unwrap();
         assert_eq!(actual, expected);
@@ -169,8 +167,7 @@ mod tests {
         let word = string("Cargo.ToMl");
         let pattern = ".TOML";
         let insensitive = true;
-        let expected =
-            UntaggedValue::Primitive(Primitive::Boolean(true.into())).into_untagged_value();
+        let expected = UntaggedValue::boolean(true).into_untagged_value();
 
         let actual = action(&word, &pattern, insensitive, Tag::unknown()).unwrap();
         assert_eq!(actual, expected);
@@ -181,8 +178,7 @@ mod tests {
         let word = string("Cargo.tOml");
         let pattern = "lomt.";
         let insensitive = true;
-        let expected =
-            UntaggedValue::Primitive(Primitive::Boolean(false.into())).into_untagged_value();
+        let expected = UntaggedValue::boolean(false).into_untagged_value();
 
         let actual = action(&word, &pattern, insensitive, Tag::unknown()).unwrap();
         assert_eq!(actual, expected);
diff --git a/crates/nu-cli/src/commands/str_/ends_with.rs b/crates/nu-cli/src/commands/str_/ends_with.rs
index 642ef38adc..02d0a1becf 100644
--- a/crates/nu-cli/src/commands/str_/ends_with.rs
+++ b/crates/nu-cli/src/commands/str_/ends_with.rs
@@ -104,7 +104,7 @@ fn action(input: &Value, pattern: &str, tag: impl Into<Tag>) -> Result<Value, Sh
 mod tests {
     use super::{action, SubCommand};
     use nu_plugin::test_helpers::value::string;
-    use nu_protocol::{Primitive, UntaggedValue};
+    use nu_protocol::UntaggedValue;
     use nu_source::Tag;
 
     #[test]
@@ -118,8 +118,7 @@ mod tests {
     fn str_ends_with_pattern() {
         let word = string("Cargo.toml");
         let pattern = ".toml";
-        let expected =
-            UntaggedValue::Primitive(Primitive::Boolean(true.into())).into_untagged_value();
+        let expected = UntaggedValue::boolean(true).into_untagged_value();
 
         let actual = action(&word, &pattern, Tag::unknown()).unwrap();
         assert_eq!(actual, expected);
@@ -129,8 +128,7 @@ mod tests {
     fn str_does_not_end_with_pattern() {
         let word = string("Cargo.toml");
         let pattern = "Car";
-        let expected =
-            UntaggedValue::Primitive(Primitive::Boolean(false.into())).into_untagged_value();
+        let expected = UntaggedValue::boolean(false).into_untagged_value();
 
         let actual = action(&word, &pattern, Tag::unknown()).unwrap();
         assert_eq!(actual, expected);
diff --git a/crates/nu-cli/src/commands/str_/starts_with.rs b/crates/nu-cli/src/commands/str_/starts_with.rs
index 13689dd8ac..4ab33444b8 100644
--- a/crates/nu-cli/src/commands/str_/starts_with.rs
+++ b/crates/nu-cli/src/commands/str_/starts_with.rs
@@ -104,7 +104,7 @@ fn action(input: &Value, pattern: &str, tag: impl Into<Tag>) -> Result<Value, Sh
 mod tests {
     use super::{action, SubCommand};
     use nu_plugin::test_helpers::value::string;
-    use nu_protocol::{Primitive, UntaggedValue};
+    use nu_protocol::UntaggedValue;
     use nu_source::Tag;
 
     #[test]
@@ -118,8 +118,7 @@ mod tests {
     fn str_starts_with_pattern() {
         let word = string("Cargo.toml");
         let pattern = "Car";
-        let expected =
-            UntaggedValue::Primitive(Primitive::Boolean(true.into())).into_untagged_value();
+        let expected = UntaggedValue::boolean(true).into_untagged_value();
 
         let actual = action(&word, &pattern, Tag::unknown()).unwrap();
         assert_eq!(actual, expected);
@@ -129,8 +128,7 @@ mod tests {
     fn str_does_not_start_with_pattern() {
         let word = string("Cargo.toml");
         let pattern = ".toml";
-        let expected =
-            UntaggedValue::Primitive(Primitive::Boolean(false.into())).into_untagged_value();
+        let expected = UntaggedValue::boolean(false).into_untagged_value();
 
         let actual = action(&word, &pattern, Tag::unknown()).unwrap();
         assert_eq!(actual, expected);
diff --git a/crates/nu-cli/src/commands/which_.rs b/crates/nu-cli/src/commands/which_.rs
index e9ee99ab0e..4c3eac2a74 100644
--- a/crates/nu-cli/src/commands/which_.rs
+++ b/crates/nu-cli/src/commands/which_.rs
@@ -42,7 +42,7 @@ fn entry(arg: impl Into<String>, path: Value, builtin: bool, tag: Tag) -> Value
     map.insert("path".to_string(), path);
     map.insert(
         "builtin".to_string(),
-        UntaggedValue::Primitive(Primitive::Boolean(builtin)).into_value(tag.clone()),
+        UntaggedValue::boolean(builtin).into_value(tag.clone()),
     );
 
     UntaggedValue::row(map).into_value(tag)
diff --git a/crates/nu-protocol/src/value.rs b/crates/nu-protocol/src/value.rs
index eeb22ac774..9945de4066 100644
--- a/crates/nu-protocol/src/value.rs
+++ b/crates/nu-protocol/src/value.rs
@@ -207,8 +207,8 @@ impl UntaggedValue {
     }
 
     /// Helper for creating boolean values
-    pub fn boolean(s: impl Into<bool>) -> UntaggedValue {
-        UntaggedValue::Primitive(Primitive::Boolean(s.into()))
+    pub fn boolean(b: impl Into<bool>) -> UntaggedValue {
+        UntaggedValue::Primitive(Primitive::Boolean(b.into()))
     }
 
     /// Helper for creating date duration values