RGBCube/uutils-coreutils
1
Fork 0
mirror of https://github.com/RGBCube/uutils-coreutils synced 2025-07-28 19:47:45 +00:00
Code Issues Activity

Merge pull request #6989 from cakebaker/echo_remove_obsolete_code

Browse source 
echo: remove code made obsolete by MSRV 1.79
This commit is contained in:
Sylvestre Ledru 2024-12-22 16:16:49 +01:00 • committed by GitHub
commit c22642b68c
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 3 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

25
src/uu/echo/src/echo.rs
View file

@ -208,13 +208,6 @@ fn print_escaped(input: &[u8], output: &mut StdoutLock) -> io::Result<ControlFlo
} }
if let Some(next) = iter.next() { if let Some(next) = iter.next() {
// For extending lifetime
// Unnecessary when using Rust >= 1.79.0
// https://github.com/rust-lang/rust/pull/121346
// TODO: when we have a MSRV >= 1.79.0, delete these "hold" bindings
let hold_one_byte_outside_of_match: [u8; 1_usize];
let hold_two_bytes_outside_of_match: [u8; 2_usize];
let unescaped: &[u8] = match *next { let unescaped: &[u8] = match *next {
b'\\' => br"\", b'\\' => br"\",
b'a' => b"\x07", b'a' => b"\x07",
@ -230,12 +223,7 @@ fn print_escaped(input: &[u8], output: &mut StdoutLock) -> io::Result<ControlFlo
if let Some(parsed_hexadecimal_number) = if let Some(parsed_hexadecimal_number) =
parse_backslash_number(&mut iter, BackslashNumberType::Hexadecimal) parse_backslash_number(&mut iter, BackslashNumberType::Hexadecimal)
{ {
// TODO: remove when we have a MSRV >= 1.79.0 &[parsed_hexadecimal_number]
hold_one_byte_outside_of_match = [parsed_hexadecimal_number];
// TODO: when we have a MSRV >= 1.79.0, return reference to a temporary array:
// &[parsed_hexadecimal_number]
&hold_one_byte_outside_of_match
} else { } else {
// "\x" with any non-hexadecimal digit after means "\x" is treated literally // "\x" with any non-hexadecimal digit after means "\x" is treated literally
br"\x" br"\x"
@ -246,12 +234,7 @@ fn print_escaped(input: &[u8], output: &mut StdoutLock) -> io::Result<ControlFlo
&mut iter, &mut iter,
BackslashNumberType::OctalStartingWithZero, BackslashNumberType::OctalStartingWithZero,
) { ) {
// TODO: remove when we have a MSRV >= 1.79.0 &[parsed_octal_number]
hold_one_byte_outside_of_match = [parsed_octal_number];
// TODO: when we have a MSRV >= 1.79.0, return reference to a temporary array:
// &[parsed_octal_number]
&hold_one_byte_outside_of_match
} else { } else {
// "\0" with any non-octal digit after it means "\0" is treated as ASCII '\0' (NUL), 0x00 // "\0" with any non-octal digit after it means "\0" is treated as ASCII '\0' (NUL), 0x00
b"\0" b"\0"
@ -259,9 +242,7 @@ fn print_escaped(input: &[u8], output: &mut StdoutLock) -> io::Result<ControlFlo
} }
other_byte => { other_byte => {
// Backslash and the following byte are treated literally // Backslash and the following byte are treated literally
hold_two_bytes_outside_of_match = [b'\\', other_byte]; &[b'\\', other_byte]
&hold_two_bytes_outside_of_match
} }
}; };