From 5af95c91afb4d69c5abfaf972c85aa8dc981ba42 Mon Sep 17 00:00:00 2001
From: Andrej Kolchin <KAAtheWise@protonmail.com>
Date: Tue, 23 Jul 2024 21:34:40 +0300
Subject: [PATCH] Lint

---
 crates/nu-command/src/strings/base/base32.rs | 42 +++++++++-----------
 crates/nu-command/src/strings/base/base64.rs |  3 +-
 2 files changed, 20 insertions(+), 25 deletions(-)

diff --git a/crates/nu-command/src/strings/base/base32.rs b/crates/nu-command/src/strings/base/base32.rs
index 854bcfd3a6..ad3fdd6cbc 100644
--- a/crates/nu-command/src/strings/base/base32.rs
+++ b/crates/nu-command/src/strings/base/base32.rs
@@ -20,30 +20,24 @@ impl Base32Config {
 
 pub fn base32_encoding(config: Base32Config) -> Result<Encoding, ShellError> {
     match (config.nopad, config.dnscurve, config.dnssec) {
-        (Some(nopad), Some(dnscurve), _) => {
-            return Err(ShellError::IncompatibleParameters {
-                left_message: "Inapplicable to DNSCURVE".to_string(),
-                left_span: nopad,
-                right_message: "Must be used standalone".to_string(),
-                right_span: dnscurve,
-            });
-        }
-        (_, Some(dnscurve), Some(dnssec)) => {
-            return Err(ShellError::IncompatibleParameters {
-                left_message: "Incompatible with DNSCURVE".to_string(),
-                left_span: dnssec,
-                right_message: "Must be used standalone".to_string(),
-                right_span: dnscurve,
-            });
-        }
-        (Some(nopad), _, Some(dnssec)) => {
-            return Err(ShellError::IncompatibleParameters {
-                left_message: "Inapplicable to DNSCURVE".to_string(),
-                left_span: nopad,
-                right_message: "DNSCURVE must be used standalone".to_string(),
-                right_span: dnssec,
-            });
-        }
+        (Some(nopad), Some(dnscurve), _) => Err(ShellError::IncompatibleParameters {
+            left_message: "Inapplicable to DNSCURVE".to_string(),
+            left_span: nopad,
+            right_message: "Must be used standalone".to_string(),
+            right_span: dnscurve,
+        }),
+        (_, Some(dnscurve), Some(dnssec)) => Err(ShellError::IncompatibleParameters {
+            left_message: "Incompatible with DNSCURVE".to_string(),
+            left_span: dnssec,
+            right_message: "Must be used standalone".to_string(),
+            right_span: dnscurve,
+        }),
+        (Some(nopad), _, Some(dnssec)) => Err(ShellError::IncompatibleParameters {
+            left_message: "Inapplicable to DNSCURVE".to_string(),
+            left_span: nopad,
+            right_message: "DNSCURVE must be used standalone".to_string(),
+            right_span: dnssec,
+        }),
 
         (None, None, None) => Ok(data_encoding::BASE32),
         (Some(_), None, None) => Ok(data_encoding::BASE32_NOPAD),
diff --git a/crates/nu-command/src/strings/base/base64.rs b/crates/nu-command/src/strings/base/base64.rs
index 53321fd48c..d0514f8f62 100644
--- a/crates/nu-command/src/strings/base/base64.rs
+++ b/crates/nu-command/src/strings/base/base64.rs
@@ -99,7 +99,8 @@ impl Command for EncodeBase64 {
                 (Type::Binary, Type::String),
             ])
             .allow_variants_without_examples(true)
-            .required("encoding", SyntaxShape::String, "encoding to use")
+            .switch("url", "Use the URL-safe Base64 version.", None)
+            .switch("nopad", "Don't pad the output.", None)
             .category(Category::Formats)
     }