Bump base64 to 0.22.1 (#12757)

# Description
Bumps `base64` to 0.22.1 which fixes the alphabet used for binhex
encoding and decoding. This required updating some test expected output.

Related to PR #12469 where `base64` was also bumped and ran into the
failing tests.

# User-Facing Changes
Bug fix, but still changes binhex encoding and decoding output.

# Tests + Formatting
Updated test expected output.
This commit is contained in:
Ian Manske 2024-05-04 12:56:16 +00:00 committed by GitHub
parent 0d6fbdde4a
commit 1e71cd4777
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 10 additions and 10 deletions

6
Cargo.lock generated
View File

@ -346,9 +346,9 @@ checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567"
[[package]] [[package]]
name = "base64" name = "base64"
version = "0.22.0" version = "0.22.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9475866fec1451be56a3c2400fd081ff546538961565ccb5b7142cbd22bc7a51" checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6"
[[package]] [[package]]
name = "bincode" name = "bincode"
@ -2919,7 +2919,7 @@ name = "nu-command"
version = "0.93.1" version = "0.93.1"
dependencies = [ dependencies = [
"alphanumeric-sort", "alphanumeric-sort",
"base64 0.22.0", "base64 0.22.1",
"bracoxide", "bracoxide",
"brotli 5.0.0", "brotli 5.0.0",
"byteorder", "byteorder",

View File

@ -281,7 +281,7 @@ mod tests {
#[test] #[test]
fn base64_decode_binhex() { fn base64_decode_binhex() {
let word = Value::test_string("A5\"KC9jRB@IIF'8bF!"); let word = Value::test_string(r#"B5"LD@jSCAJJG'9cG!"#);
let expected = Value::binary(b"a binhex test".as_slice(), Span::test_data()); let expected = Value::binary(b"a binhex test".as_slice(), Span::test_data());
let actual = action( let actual = action(
@ -304,7 +304,7 @@ mod tests {
#[test] #[test]
fn base64_decode_binhex_with_new_line_input() { fn base64_decode_binhex_with_new_line_input() {
let word = Value::test_string("A5\"KC9jRB\n@IIF'8bF!"); let word = Value::test_string("B5\"LD@jSC\nAJJG'9cG!");
let expected = Value::binary(b"a binhex test".as_slice(), Span::test_data()); let expected = Value::binary(b"a binhex test".as_slice(), Span::test_data());
let actual = action( let actual = action(

View File

@ -65,7 +65,7 @@ impl Command for EncodeBase64 {
Example { Example {
description: "Encode a string with the binhex character set", description: "Encode a string with the binhex character set",
example: "'Some Data' | encode base64 --character-set binhex", example: "'Some Data' | encode base64 --character-set binhex",
result: Some(Value::test_string(r#"7epXB5"%A@4J"#)), result: Some(Value::test_string(r#"8fpYC5"%BA4K"#)),
}, },
] ]
} }

View File

@ -15,7 +15,7 @@ fn base64_encode_characterset_binhex() {
echo 'username:password' | encode base64 --character-set binhex echo 'username:password' | encode base64 --character-set binhex
"#); "#);
assert_eq!(actual.out, "F@0NEPjJD97kE\'&bEhFZEP3"); assert_eq!(actual.out, "GA0PFQjKE@8kF'&cFhG[FQ3");
} }
#[test] #[test]
@ -31,9 +31,9 @@ fn error_when_invalid_character_set_given() {
#[test] #[test]
fn base64_decode_characterset_binhex() { fn base64_decode_characterset_binhex() {
let actual = nu!(r#" let actual = nu!(
echo "F@0NEPjJD97kE'&bEhFZEP3" | decode base64 --character-set binhex --binary | decode utf-8 r#""GA0PFQjKE@8kF'&cFhG[FQ3" | decode base64 --character-set binhex --binary | decode utf-8"#
"#); );
assert_eq!(actual.out, "username:password"); assert_eq!(actual.out, "username:password");
} }