Skip to content

Commit e3be131

Browse files
authored
tac: fix error message (#9942)
* tac: fix error message * tac: Remove obsolete error messages from locales
1 parent 0047915 commit e3be131

File tree

5 files changed

+8
-7
lines changed

5 files changed

+8
-7
lines changed

src/uu/tac/locales/en-US.ftl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ tac-help-separator = use STRING as the separator instead of newline
66
77
# Error messages
88
tac-error-invalid-regex = invalid regular expression: { $error }
9-
tac-error-invalid-argument = { $argument }: read error: Invalid argument
9+
tac-error-invalid-directory-argument = { $argument }: read error: Is a directory
1010
tac-error-file-not-found = failed to open { $filename } for reading: No such file or directory
1111
tac-error-read-error = failed to read from { $filename }: { $error }
1212
tac-error-write-error = failed to write to stdout: { $error }

src/uu/tac/locales/fr-FR.ftl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ tac-help-separator = utiliser CHAÎNE comme séparateur au lieu du saut de ligne
66
77
# Messages d'erreur
88
tac-error-invalid-regex = expression régulière invalide : { $error }
9-
tac-error-invalid-argument = { $argument } : erreur de lecture : Argument invalide
109
tac-error-file-not-found = échec de l'ouverture de { $filename } en lecture : Aucun fichier ou répertoire de ce type
1110
tac-error-read-error = échec de la lecture depuis { $filename } : { $error }
1211
tac-error-write-error = échec de l'écriture vers stdout : { $error }
12+
tac-error-invalid-directory-argument = { $argument } : erreur de lecture : Est un répertoire

src/uu/tac/src/error.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@ pub enum TacError {
1515
/// A regular expression given by the user is invalid.
1616
#[error("{}", translate!("tac-error-invalid-regex", "error" => .0))]
1717
InvalidRegex(regex::Error),
18-
/// An argument to tac is invalid.
19-
#[error("{}", translate!("tac-error-invalid-argument", "argument" => .0.maybe_quote()))]
20-
InvalidArgument(OsString),
18+
/// The argument to tac is a directory.
19+
#[error("{}", translate!("tac-error-invalid-directory-argument", "argument" => .0.maybe_quote()))]
20+
InvalidDirectoryArgument(OsString),
2121
/// The specified file is not found on the filesystem.
2222
#[error("{}", translate!("tac-error-file-not-found", "filename" => .0.quote()))]
2323
FileNotFound(OsString),

src/uu/tac/src/tac.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -253,7 +253,8 @@ fn tac(filenames: &[OsString], before: bool, regex: bool, separator: &str) -> UR
253253
} else {
254254
let path = Path::new(filename);
255255
if path.is_dir() {
256-
let e: Box<dyn UError> = TacError::InvalidArgument(filename.clone()).into();
256+
let e: Box<dyn UError> =
257+
TacError::InvalidDirectoryArgument(filename.clone()).into();
257258
show!(e);
258259
continue;
259260
}

tests/by-util/test_tac.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ fn test_invalid_input() {
100100
.ucmd()
101101
.arg("a")
102102
.fails()
103-
.stderr_contains("a: read error: Invalid argument");
103+
.stderr_contains("a: read error: Is a directory");
104104
}
105105

106106
#[test]

0 commit comments

Comments
 (0)