chore(git): merge main and resolve confilcts

anas-contribs · Sep 1, 2023 · 0fdc42e · 0fdc42e
2 parents 9fd106d + 8326fe0
commit 0fdc42e
Show file tree

Hide file tree

Showing 6 changed files with 35 additions and 37 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -10,7 +10,7 @@ repository = "https://github.com/orhun/halp"
 categories = ["command-line-utilities"]
 default-run = "halp"
 edition = "2021"
-rust-version = "1.64.0"
+rust-version = "1.70.0"
 
 [[bin]]
 name = "halp-completions"
@@ -25,14 +25,14 @@ name = "halp-test"
 path = "src/bin/test.rs"
 
 [dependencies]
-clap = { version = "4.3.21", features =["derive", "env", "wrap_help"] }
-clap_complete = "4.3.2"
-clap_mangen = "0.2.12"
+clap = { version = "4.4.2", features =["derive", "env", "wrap_help"] }
+clap_complete = "4.4.0"
+clap_mangen = "0.2.13"
 colored = "2.0.4"
 console = "0.15.7"
 dialoguer = { version = "0.10.4", default-features = false }
 dirs = "5.0.1"
-serde = { version = "1.0.183", features = ["derive"] }
+serde = { version = "1.0.188", features = ["derive"] }
 thiserror = "1.0.47"
 toml = "0.7.6"
 ureq = "2.7.1"

diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM lukemathwalker/cargo-chef:0.1.51-rust-1.67-buster AS chef
+FROM lukemathwalker/cargo-chef:0.1.62-rust-1.72-buster AS chef
 WORKDIR /app
 
 FROM chef AS planner

diff --git a/README.md b/README.md
@@ -134,7 +134,7 @@ Usage:
 cargo install halp
 ```
 
-The minimum supported Rust version is `1.64.0`.
+The minimum supported Rust version is `1.70.0`.
 
 ### Arch Linux
 

diff --git a/src/helper/args/mod.rs b/src/helper/args/mod.rs
@@ -144,13 +144,13 @@ mod tests {
         )?;
         println!("{}", String::from_utf8_lossy(&output));
         assert_eq!(
-            r#"(°ロ°)  checking 'test -v'
+            r"(°ロ°)  checking 'test -v'
 (×﹏×)      fail '-v' argument not found.
 (°ロ°)  checking 'test -V'
 \(^ヮ^)/ success '-V' argument found!
 ---
 halp 0.1.0
----"#,
+---",
             String::from_utf8_lossy(&output)
                 .replace('\r', "")
                 .replace(&get_test_bin(), "test")
@@ -171,7 +171,7 @@ halp 0.1.0
             &mut output,
         )?;
         assert_eq!(
-            r#"(°ロ°)  checking 'test -H'
+            r"(°ロ°)  checking 'test -H'
 (×﹏×)      fail '-H' argument not found.
 (o_O)      debug
 stdout:
@@ -201,7 +201,7 @@ Usage: test
 Options:
   -h, --help     Print help
   -V, --version  Print version
----"#,
+---",
             String::from_utf8_lossy(&output)
                 .replace('\r', "")
                 .replace(&get_test_bin(), "test")
@@ -218,7 +218,7 @@ Options:
         get_args_help(&get_test_bin(), config, false, &mut output)?;
         println!("{}", String::from_utf8_lossy(&output));
         assert_eq!(
-            r#"(°ロ°)  checking 'test -v'
+            r"(°ロ°)  checking 'test -v'
 (×﹏×)      fail '-v' argument not found.
 (°ロ°)  checking 'test -V'
 \(^ヮ^)/ success '-V' argument found!
@@ -233,7 +233,7 @@ Usage: test
 Options:
   -h, --help     Print help
   -V, --version  Print version
----"#,
+---",
             String::from_utf8_lossy(&output)
                 .replace('\r', "")
                 .replace(&get_test_bin(), "test")
@@ -253,13 +253,13 @@ Options:
         get_args_help(&get_test_bin(), config, false, &mut output)?;
         println!("{}", String::from_utf8_lossy(&output));
         assert_eq!(
-            r#"(°ロ°)  checking 'test -x'
+            r"(°ロ°)  checking 'test -x'
 (×﹏×)      fail '-x' argument not found.
 (°ロ°)  checking 'test -V'
 \(^ヮ^)/ success '-V' argument found!
 ---
 halp 0.1.0
----"#,
+---",
             String::from_utf8_lossy(&output)
                 .replace('\r', "")
                 .replace(&get_test_bin(), "test")

diff --git a/tests/integration.rs b/tests/integration.rs
@@ -21,7 +21,7 @@ fn get_argument_help() -> Result<()> {
     halp::run(args, &mut output)?;
     println!("{}", String::from_utf8_lossy(&output));
     assert_eq!(
-        r#"(°ロ°)  checking 'test -v'
+        r"(°ロ°)  checking 'test -v'
 (×﹏×)      fail '-v' argument not found.
 (°ロ°)  checking 'test -V'
 \(^ヮ^)/ success '-V' argument found!
@@ -36,7 +36,7 @@ Usage: test
 Options:
   -h, --help     Print help
   -V, --version  Print version
----"#,
+---",
         String::from_utf8_lossy(&output)
             .replace('\r', "")
             .replace(BIN, "test")