Skip to content

tr: some small improvements #8126

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Jun 9, 2025
Merged

tr: some small improvements #8126

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
cd7a308
tr: remove "spell-checker:ignore" line
cakebaker Jun 9, 2025
ed70d7b
tr: set "after help" in uu_app instead of uumain
cakebaker Jun 9, 2025
4cb7490
tr: use "sets_len == 1" instead of "sets_len < 2"
cakebaker Jun 9, 2025
ded2034
tr: merge imports
cakebaker Jun 9, 2025
74d7cd1
tr: use logical AND instead of bitwise AND
cakebaker Jun 9, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 9 additions & 12 deletions src/uu/tr/src/tr.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,13 @@
// For the full copyright and license information, please view the LICENSE
// file that was distributed with this source code.

// spell-checker:ignore (ToDO) allocs bset dflag cflag sflag tflag

mod operation;
mod unicode_table;

use crate::operation::DeleteOperation;
use clap::{Arg, ArgAction, Command, value_parser};
use operation::{
Sequence, SqueezeOperation, SymbolTranslator, TranslateOperation, translate_input,
DeleteOperation, Sequence, SqueezeOperation, SymbolTranslator, TranslateOperation,
translate_input,
};
use std::collections::HashMap;
use std::ffi::OsString;
Expand All @@ -33,9 +31,7 @@ mod options {

#[uucore::main]
pub fn uumain(args: impl uucore::Args) -> UResult<()> {
let matches = uu_app()
.after_help(get_message("tr-after-help"))
.try_get_matches_from(args)?;
let matches = uu_app().try_get_matches_from(args)?;

let delete_flag = matches.get_flag(options::DELETE);
let complement_flag = matches.get_flag(options::COMPLEMENT);
Expand All @@ -51,13 +47,13 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> {
.map(ToOwned::to_owned)
.collect();

let sets_len = sets.len();

if sets.is_empty() {
return Err(UUsageError::new(1, get_message("tr-error-missing-operand")));
}

if !(delete_flag || squeeze_flag) && sets_len < 2 {
let sets_len = sets.len();

if !(delete_flag || squeeze_flag) && sets_len == 1 {
return Err(UUsageError::new(
1,
get_message_with_args(
Expand All @@ -67,7 +63,7 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> {
));
}

if delete_flag & squeeze_flag && sets_len < 2 {
if delete_flag && squeeze_flag && sets_len == 1 {
return Err(UUsageError::new(
1,
get_message_with_args(
Expand Down Expand Up @@ -147,7 +143,7 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> {
translate_input(&mut locked_stdin, &mut buffered_stdout, op)?;
}
} else if squeeze_flag {
if sets_len < 2 {
if sets_len == 1 {
let op = SqueezeOperation::new(set1);
translate_input(&mut locked_stdin, &mut buffered_stdout, op)?;
} else {
Expand All @@ -173,6 +169,7 @@ pub fn uu_app() -> Command {
.version(uucore::crate_version!())
.about(get_message("tr-about"))
.override_usage(format_usage(&get_message("tr-usage")))
.after_help(get_message("tr-after-help"))
.infer_long_args(true)
.trailing_var_arg(true)
.arg(
Expand Down
Loading