bump rust-toolchain to 1.64 (#7005)

* bump rust-toolchain to 1.64

* 1.64 clippy

crates/nu-command/src/bytes/add.rs

@@ -63,7 +63,7 @@ impl Command for BytesAdd {
     ) -> Result<PipelineData, ShellError> {
         let added_data: Vec<u8> = call.req(engine_state, stack, 0)?;
         let cell_paths: Vec<CellPath> = call.rest(engine_state, stack, 1)?;
-        let cell_paths = (!cell_paths.is_empty()).then(|| cell_paths);
+        let cell_paths = (!cell_paths.is_empty()).then_some(cell_paths);
         let index: Option<usize> = call.get_flag(engine_state, stack, "index")?;
         let end = call.has_flag("end");
 

crates/nu-command/src/bytes/at.rs

@@ -142,7 +142,7 @@ impl Command for BytesAt {
         let range: Value = call.req(engine_state, stack, 0)?;
         let (start, end, arg_span) = parse_range(range, call.head)?;
         let cell_paths: Vec<CellPath> = call.rest(engine_state, stack, 1)?;
-        let cell_paths = (!cell_paths.is_empty()).then(|| cell_paths);
+        let cell_paths = (!cell_paths.is_empty()).then_some(cell_paths);
         let arg = Arguments {
             start,
             end,

crates/nu-command/src/bytes/ends_with.rs

@@ -54,7 +54,7 @@ impl Command for BytesEndsWith {
     ) -> Result<PipelineData, ShellError> {
         let pattern: Vec<u8> = call.req(engine_state, stack, 0)?;
         let cell_paths: Vec<CellPath> = call.rest(engine_state, stack, 1)?;
-        let cell_paths = (!cell_paths.is_empty()).then(|| cell_paths);
+        let cell_paths = (!cell_paths.is_empty()).then_some(cell_paths);
         let arg = Arguments {
             pattern,
             cell_paths,

crates/nu-command/src/bytes/index_of.rs

@@ -61,7 +61,7 @@ impl Command for BytesIndexOf {
     ) -> Result<PipelineData, ShellError> {
         let pattern: Vec<u8> = call.req(engine_state, stack, 0)?;
         let cell_paths: Vec<CellPath> = call.rest(engine_state, stack, 1)?;
-        let cell_paths = (!cell_paths.is_empty()).then(|| cell_paths);
+        let cell_paths = (!cell_paths.is_empty()).then_some(cell_paths);
         let arg = Arguments {
             pattern,
             end: call.has_flag("end"),

crates/nu-command/src/bytes/remove.rs

@@ -56,7 +56,7 @@ impl Command for BytesRemove {
         input: PipelineData,
     ) -> Result<PipelineData, ShellError> {
         let cell_paths: Vec<CellPath> = call.rest(engine_state, stack, 1)?;
-        let cell_paths = (!cell_paths.is_empty()).then(|| cell_paths);
+        let cell_paths = (!cell_paths.is_empty()).then_some(cell_paths);
         let pattern_to_remove = call.req::<Spanned<Vec<u8>>>(engine_state, stack, 0)?;
         if pattern_to_remove.item.is_empty() {
             return Err(ShellError::UnsupportedInput(

crates/nu-command/src/bytes/replace.rs

@@ -56,7 +56,7 @@ impl Command for BytesReplace {
         input: PipelineData,
     ) -> Result<PipelineData, ShellError> {
         let cell_paths: Vec<CellPath> = call.rest(engine_state, stack, 2)?;
-        let cell_paths = (!cell_paths.is_empty()).then(|| cell_paths);
+        let cell_paths = (!cell_paths.is_empty()).then_some(cell_paths);
         let find = call.req::<Spanned<Vec<u8>>>(engine_state, stack, 0)?;
         if find.item.is_empty() {
             return Err(ShellError::UnsupportedInput(

crates/nu-command/src/bytes/starts_with.rs

@@ -54,7 +54,7 @@ impl Command for BytesStartsWith {
     ) -> Result<PipelineData, ShellError> {
         let pattern: Vec<u8> = call.req(engine_state, stack, 0)?;
         let cell_paths: Vec<CellPath> = call.rest(engine_state, stack, 1)?;
-        let cell_paths = (!cell_paths.is_empty()).then(|| cell_paths);
+        let cell_paths = (!cell_paths.is_empty()).then_some(cell_paths);
         let arg = Arguments {
             pattern,
             cell_paths,

crates/nu-command/src/conversions/into/datetime.rs

@@ -106,7 +106,7 @@ impl Command for SubCommand {
             Ok(generate_strftime_list(call.head, true).into_pipeline_data())
         } else {
             let cell_paths = call.rest(engine_state, stack, 0)?;
-            let cell_paths = (!cell_paths.is_empty()).then(|| cell_paths);
+            let cell_paths = (!cell_paths.is_empty()).then_some(cell_paths);
 
             // if zone-offset is specified, then zone will be neglected
             let timezone = call.get_flag::<Spanned<String>>(engine_state, stack, "timezone")?;

crates/nu-command/src/conversions/into/int.rs

@@ -54,7 +54,7 @@ impl Command for SubCommand {
         input: PipelineData,
     ) -> Result<nu_protocol::PipelineData, nu_protocol::ShellError> {
         let cell_paths = call.rest(engine_state, stack, 0)?;
-        let cell_paths = (!cell_paths.is_empty()).then(|| cell_paths);
+        let cell_paths = (!cell_paths.is_empty()).then_some(cell_paths);
 
         let radix = call.get_flag::<Value>(engine_state, stack, "radix")?;
         let radix: u32 = match radix {

crates/nu-command/src/conversions/into/string.rs

@@ -172,7 +172,7 @@ fn string_helper(
         }
     }
     let cell_paths = call.rest(engine_state, stack, 0)?;
-    let cell_paths = (!cell_paths.is_empty()).then(|| cell_paths);
+    let cell_paths = (!cell_paths.is_empty()).then_some(cell_paths);
     let config = engine_state.get_config().clone();
     let args = Arguments {
         decimals_value,

crates/nu-command/src/hash/generic_digest.rs

@@ -79,7 +79,7 @@ where
     ) -> Result<nu_protocol::PipelineData, nu_protocol::ShellError> {
         let binary = call.has_flag("binary");
         let cell_paths: Vec<CellPath> = call.rest(engine_state, stack, 0)?;
-        let cell_paths = (!cell_paths.is_empty()).then(|| cell_paths);
+        let cell_paths = (!cell_paths.is_empty()).then_some(cell_paths);
         let args = Arguments { binary, cell_paths };
         operate(
             action::<D>,

crates/nu-command/src/input_handler.rs

@@ -24,7 +24,7 @@ impl CmdArgument for CellPathOnlyArgs {
 impl From<Vec<CellPath>> for CellPathOnlyArgs {
     fn from(cell_paths: Vec<CellPath>) -> Self {
         Self {
-            cell_paths: (!cell_paths.is_empty()).then(|| cell_paths),
+            cell_paths: (!cell_paths.is_empty()).then_some(cell_paths),
         }
     }
 }

crates/nu-command/src/strings/encode_decode/base64.rs

@@ -45,7 +45,7 @@ pub fn operate(
         call.get_flag(engine_state, stack, "character-set")?;
     let binary = call.has_flag("binary");
     let cell_paths: Vec<CellPath> = call.rest(engine_state, stack, 0)?;
-    let cell_paths = (!cell_paths.is_empty()).then(|| cell_paths);
+    let cell_paths = (!cell_paths.is_empty()).then_some(cell_paths);
 
     // Default the character set to standard if the argument is not specified.
     let character_set = match character_set {

crates/nu-command/src/strings/format/filesize.rs

@@ -61,7 +61,7 @@ impl Command for FileSize {
             .as_string()?
             .to_ascii_lowercase();
         let cell_paths: Vec<CellPath> = call.rest(engine_state, stack, 1)?;
-        let cell_paths = (!cell_paths.is_empty()).then(|| cell_paths);
+        let cell_paths = (!cell_paths.is_empty()).then_some(cell_paths);
         let arg = Arguments {
             format_value,
             cell_paths,

crates/nu-command/src/strings/str_/case/mod.rs

@@ -49,7 +49,7 @@ where
     F: Fn(&str) -> String + Send + Sync + 'static,
 {
     let cell_paths: Vec<CellPath> = call.rest(engine_state, stack, 0)?;
-    let cell_paths = (!cell_paths.is_empty()).then(|| cell_paths);
+    let cell_paths = (!cell_paths.is_empty()).then_some(cell_paths);
     let args = Arguments {
         case_operation,
         cell_paths,

crates/nu-command/src/strings/str_/contains.rs

@@ -56,7 +56,7 @@ impl Command for SubCommand {
         input: PipelineData,
     ) -> Result<PipelineData, ShellError> {
         let cell_paths: Vec<CellPath> = call.rest(engine_state, stack, 1)?;
-        let cell_paths = (!cell_paths.is_empty()).then(|| cell_paths);
+        let cell_paths = (!cell_paths.is_empty()).then_some(cell_paths);
         let args = Arguments {
             substring: call.req::<String>(engine_state, stack, 0)?,
             cell_paths,

crates/nu-command/src/strings/str_/distance.rs

@@ -58,7 +58,7 @@ impl Command for SubCommand {
     ) -> Result<PipelineData, ShellError> {
         let compare_string: String = call.req(engine_state, stack, 0)?;
         let cell_paths: Vec<CellPath> = call.rest(engine_state, stack, 1)?;
-        let cell_paths = (!cell_paths.is_empty()).then(|| cell_paths);
+        let cell_paths = (!cell_paths.is_empty()).then_some(cell_paths);
         let args = Arguments {
             compare_string,
             cell_paths,

crates/nu-command/src/strings/str_/ends_with.rs

@@ -52,7 +52,7 @@ impl Command for SubCommand {
         input: PipelineData,
     ) -> Result<PipelineData, ShellError> {
         let cell_paths: Vec<CellPath> = call.rest(engine_state, stack, 1)?;
-        let cell_paths = (!cell_paths.is_empty()).then(|| cell_paths);
+        let cell_paths = (!cell_paths.is_empty()).then_some(cell_paths);
         let args = Arguments {
             substring: call.req::<String>(engine_state, stack, 0)?,
             cell_paths,

crates/nu-command/src/strings/str_/index_of.rs

@@ -66,7 +66,7 @@ impl Command for SubCommand {
     ) -> Result<PipelineData, ShellError> {
         let substring: Spanned<String> = call.req(engine_state, stack, 0)?;
         let cell_paths: Vec<CellPath> = call.rest(engine_state, stack, 1)?;
-        let cell_paths = (!cell_paths.is_empty()).then(|| cell_paths);
+        let cell_paths = (!cell_paths.is_empty()).then_some(cell_paths);
         let args = Arguments {
             substring: substring.item,
             range: call.get_flag(engine_state, stack, "range")?,

crates/nu-command/src/strings/str_/lpad.rs

@@ -59,7 +59,7 @@ impl Command for SubCommand {
         input: PipelineData,
     ) -> Result<PipelineData, ShellError> {
         let cell_paths: Vec<CellPath> = call.rest(engine_state, stack, 0)?;
-        let cell_paths = (!cell_paths.is_empty()).then(|| cell_paths);
+        let cell_paths = (!cell_paths.is_empty()).then_some(cell_paths);
         let args = Arguments {
             length: call.get_flag(engine_state, stack, "length")?,
             character: call.get_flag(engine_state, stack, "character")?,

crates/nu-command/src/strings/str_/replace.rs

@@ -71,7 +71,7 @@ impl Command for SubCommand {
         let find: Spanned<String> = call.req(engine_state, stack, 0)?;
         let replace: Spanned<String> = call.req(engine_state, stack, 1)?;
         let cell_paths: Vec<CellPath> = call.rest(engine_state, stack, 2)?;
-        let cell_paths = (!cell_paths.is_empty()).then(|| cell_paths);
+        let cell_paths = (!cell_paths.is_empty()).then_some(cell_paths);
         let literal_replace = call.has_flag("no-expand");
         let no_regex = call.has_flag("string");
 

crates/nu-command/src/strings/str_/rpad.rs

@@ -59,7 +59,7 @@ impl Command for SubCommand {
         input: PipelineData,
     ) -> Result<PipelineData, ShellError> {
         let cell_paths: Vec<CellPath> = call.rest(engine_state, stack, 0)?;
-        let cell_paths = (!cell_paths.is_empty()).then(|| cell_paths);
+        let cell_paths = (!cell_paths.is_empty()).then_some(cell_paths);
         let args = Arguments {
             length: call.get_flag(engine_state, stack, "length")?,
             character: call.get_flag(engine_state, stack, "character")?,

crates/nu-command/src/strings/str_/starts_with.rs

@@ -55,7 +55,7 @@ impl Command for SubCommand {
     ) -> Result<PipelineData, ShellError> {
         let substring: Spanned<String> = call.req(engine_state, stack, 0)?;
         let cell_paths: Vec<CellPath> = call.rest(engine_state, stack, 1)?;
-        let cell_paths = (!cell_paths.is_empty()).then(|| cell_paths);
+        let cell_paths = (!cell_paths.is_empty()).then_some(cell_paths);
         let args = Arguments {
             substring: substring.item,
             cell_paths,

crates/nu-command/src/strings/str_/substring.rs

@@ -68,7 +68,7 @@ impl Command for SubCommand {
         let range = call.req(engine_state, stack, 0)?;
         let indexes: Substring = process_arguments(&range, call.head)?.into();
         let cell_paths: Vec<CellPath> = call.rest(engine_state, stack, 1)?;
-        let cell_paths = (!cell_paths.is_empty()).then(|| cell_paths);
+        let cell_paths = (!cell_paths.is_empty()).then_some(cell_paths);
         let args = Arguments {
             indexes,
             cell_paths,

crates/nu-command/src/strings/str_/trim/trim_.rs

@@ -100,7 +100,7 @@ impl Command for SubCommand {
             None => None,
         };
         let cell_paths: Vec<CellPath> = call.rest(engine_state, stack, 0)?;
-        let cell_paths = (!cell_paths.is_empty()).then(|| cell_paths);
+        let cell_paths = (!cell_paths.is_empty()).then_some(cell_paths);
         let mode = match cell_paths {
             None => ActionMode::Global,
             Some(_) => ActionMode::Local,

crates/nu-table/src/table.rs

@@ -155,7 +155,7 @@ fn draw_table(
     }
 
     let with_header = table.with_header;
-    let with_footer = with_header && need_footer(config, (&table.data).size().0 as u64);
+    let with_footer = with_header && need_footer(config, (table.data).size().0 as u64);
     let with_index = table.with_index;
 
     if with_footer {

rust-toolchain.toml

@@ -16,4 +16,4 @@ profile = "default"
 # use in nushell, we may opt to use the bleeding edge stable version of rust.
 # I believe rust is on a 6 week release cycle and nushell is on a 3 week release cycle.
 # So, every two nushell releases, this version number should be bumped by one.
-channel = "1.63.0"
+channel = "1.64.0"