From a9d8eed217b463abf18c32570b621b09acec4286 Mon Sep 17 00:00:00 2001
From: Dorian Peron <dorianperon.i@gmail.com>
Date: Tue, 25 Feb 2025 01:23:28 +0100
Subject: [PATCH] expr: Remove useless arg in enum variant

---
 src/uu/expr/src/expr.rs        |  4 ++--
 src/uu/expr/src/syntax_tree.rs | 18 +++++++++---------
 tests/by-util/test_expr.rs     |  2 +-
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/uu/expr/src/expr.rs b/src/uu/expr/src/expr.rs
index 99ae27e4a..bfa647902 100644
--- a/src/uu/expr/src/expr.rs
+++ b/src/uu/expr/src/expr.rs
@@ -48,8 +48,8 @@ pub enum ExprError {
     UnmatchedOpeningBrace,
     #[error("Unmatched ) or \\}}")]
     UnmatchedClosingBrace,
-    #[error("Invalid content of {0}")]
-    InvalidContent(String),
+    #[error("Invalid content of \\{{\\}}")]
+    InvalidBracketContent,
 }
 
 impl UError for ExprError {
diff --git a/src/uu/expr/src/syntax_tree.rs b/src/uu/expr/src/syntax_tree.rs
index 149f24bb2..d7ac02ca3 100644
--- a/src/uu/expr/src/syntax_tree.rs
+++ b/src/uu/expr/src/syntax_tree.rs
@@ -264,7 +264,7 @@ fn check_posix_regex_errors(pattern: &str) -> ExprResult<()> {
         (true, true, false) => Ok(()),
         (_, false, _) => Err(ExprError::UnmatchedOpeningBrace),
         (false, _, _) => Err(ExprError::UnmatchedOpeningParenthesis),
-        (true, true, true) => Err(ExprError::InvalidContent(r"\{\}".to_string())),
+        (true, true, true) => Err(ExprError::InvalidBracketContent),
     }
 }
 
@@ -601,7 +601,7 @@ pub fn is_truthy(s: &NumOrStr) -> bool {
 #[cfg(test)]
 mod test {
     use crate::ExprError;
-    use crate::ExprError::InvalidContent;
+    use crate::ExprError::InvalidBracketContent;
 
     use super::{check_posix_regex_errors, AstNode, BinOp, NumericOp, RelationOp, StringOp};
 
@@ -795,7 +795,7 @@ mod test {
     fn check_regex_empty_repeating_pattern() {
         assert_eq!(
             check_posix_regex_errors("ab\\{\\}"),
-            Err(InvalidContent(r"\{\}".to_string()))
+            Err(InvalidBracketContent)
         )
     }
 
@@ -804,27 +804,27 @@ mod test {
         assert_eq!(
             // out of order
             check_posix_regex_errors("ab\\{1,0\\}"),
-            Err(InvalidContent(r"\{\}".to_string()))
+            Err(InvalidBracketContent)
         );
         assert_eq!(
             check_posix_regex_errors("ab\\{1,a\\}"),
-            Err(InvalidContent(r"\{\}".to_string()))
+            Err(InvalidBracketContent)
         );
         assert_eq!(
             check_posix_regex_errors("ab\\{a,3\\}"),
-            Err(InvalidContent(r"\{\}".to_string()))
+            Err(InvalidBracketContent)
         );
         assert_eq!(
             check_posix_regex_errors("ab\\{a,b\\}"),
-            Err(InvalidContent(r"\{\}".to_string()))
+            Err(InvalidBracketContent)
         );
         assert_eq!(
             check_posix_regex_errors("ab\\{a,\\}"),
-            Err(InvalidContent(r"\{\}".to_string()))
+            Err(InvalidBracketContent)
         );
         assert_eq!(
             check_posix_regex_errors("ab\\{,b\\}"),
-            Err(InvalidContent(r"\{\}".to_string()))
+            Err(InvalidBracketContent)
         );
     }
 }
diff --git a/tests/by-util/test_expr.rs b/tests/by-util/test_expr.rs
index aff5596da..ced4c3bbb 100644
--- a/tests/by-util/test_expr.rs
+++ b/tests/by-util/test_expr.rs
@@ -677,7 +677,7 @@ mod gnu_expr {
             .stdout_only("\n");
     }
 
-    #[ignore]
+    #[ignore = "rust-onig bug, see https://github.com/rust-onig/rust-onig/issues/188"]
     #[test]
     fn test_bre10() {
         new_ucmd!()