From fa9d61c280918e4b046a9a9a1ddcf77e812d40f2 Mon Sep 17 00:00:00 2001
From: Andrej Kolchin <KAAtheWise@protonmail.com>
Date: Wed, 24 Jul 2024 12:56:16 +0300
Subject: [PATCH] Format and lint

---
 crates/nu-command/src/default_context.rs        | 15 ++++++++-------
 crates/nu-command/src/strings/base/base32.rs    |  2 +-
 crates/nu-command/src/strings/base/base32hex.rs |  2 +-
 crates/nu-command/src/strings/base/base64.rs    |  2 +-
 crates/nu-command/src/strings/base/mod.rs       |  1 +
 crates/nu-command/src/strings/mod.rs            |  3 ++-
 6 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/crates/nu-command/src/default_context.rs b/crates/nu-command/src/default_context.rs
index 93b7a79527..ee2b5f735b 100644
--- a/crates/nu-command/src/default_context.rs
+++ b/crates/nu-command/src/default_context.rs
@@ -176,18 +176,19 @@ pub fn add_shell_command_context(mut engine_state: EngineState) -> EngineState {
 
         // Strings
         bind_command! {
-            DecodeBase32,
-            EncodeBase32,
-        DecodeBase32Hex,
-        EncodeBase32Hex,
-        DecodeHex,
-        EncodeHex,
-
             Char,
             Decode,
             Encode,
             DecodeBase64Old,
             EncodeBase64Old,
+        DecodeBase32,
+            EncodeBase32,
+            DecodeBase32Hex,
+            EncodeBase32Hex,
+            DecodeBase64,
+            EncodeBase64,
+            DecodeHex,
+            EncodeHex,
             DetectColumns,
             Parse,
             Split,
diff --git a/crates/nu-command/src/strings/base/base32.rs b/crates/nu-command/src/strings/base/base32.rs
index 98c650bcbf..21cd0a6d02 100644
--- a/crates/nu-command/src/strings/base/base32.rs
+++ b/crates/nu-command/src/strings/base/base32.rs
@@ -2,7 +2,7 @@ use data_encoding::Encoding;
 
 use nu_engine::command_prelude::*;
 
-const EXTRA_USAGE: &'static str = r"The default alphabet is taken from RFC 4648, section 6.
+const EXTRA_USAGE: &str = r"The default alphabet is taken from RFC 4648, section 6.
 
 Note this command will collect stream input.";
 
diff --git a/crates/nu-command/src/strings/base/base32hex.rs b/crates/nu-command/src/strings/base/base32hex.rs
index 4c71a9fbaf..0ec77f8c4a 100644
--- a/crates/nu-command/src/strings/base/base32hex.rs
+++ b/crates/nu-command/src/strings/base/base32hex.rs
@@ -1,6 +1,6 @@
 use nu_engine::command_prelude::*;
 
-const EXTRA_USAGE: &'static str = r"This command uses an alternative Base32 alphabet, defined in RFC 4648, section 7.
+const EXTRA_USAGE: &str = r"This command uses an alternative Base32 alphabet, defined in RFC 4648, section 7.
 
 Note this command will collect stream input.";
 
diff --git a/crates/nu-command/src/strings/base/base64.rs b/crates/nu-command/src/strings/base/base64.rs
index 39f2407bc6..1b6f55580e 100644
--- a/crates/nu-command/src/strings/base/base64.rs
+++ b/crates/nu-command/src/strings/base/base64.rs
@@ -2,7 +2,7 @@ use data_encoding::Encoding;
 
 use nu_engine::command_prelude::*;
 
-const EXTRA_USAGE: &'static str = r"The default alphabet is taken from RFC 4648, section 4.  A URL-safe version is available.
+const EXTRA_USAGE: &str = r"The default alphabet is taken from RFC 4648, section 4.  A URL-safe version is available.
 
 Note this command will collect stream input.";
 
diff --git a/crates/nu-command/src/strings/base/mod.rs b/crates/nu-command/src/strings/base/mod.rs
index 73b177f2b9..d7e248a032 100644
--- a/crates/nu-command/src/strings/base/mod.rs
+++ b/crates/nu-command/src/strings/base/mod.rs
@@ -11,6 +11,7 @@ mod hex;
 
 pub use base32::{DecodeBase32, EncodeBase32};
 pub use base32hex::{DecodeBase32Hex, EncodeBase32Hex};
+pub use base64::{DecodeBase64, EncodeBase64};
 pub use hex::{DecodeHex, EncodeHex};
 
 pub fn decode(
diff --git a/crates/nu-command/src/strings/mod.rs b/crates/nu-command/src/strings/mod.rs
index deaea34146..08f50e537d 100644
--- a/crates/nu-command/src/strings/mod.rs
+++ b/crates/nu-command/src/strings/mod.rs
@@ -9,7 +9,8 @@ mod split;
 mod str_;
 
 pub use base::{
-    DecodeBase32, DecodeBase32Hex, DecodeHex, EncodeBase32, EncodeBase32Hex, EncodeHex,
+    DecodeBase32, DecodeBase32Hex, DecodeBase64, DecodeHex, EncodeBase32, EncodeBase32Hex,
+    EncodeBase64, EncodeHex,
 };
 pub use char_::Char;
 pub use detect_columns::*;