From 6372c96722b5415e379515302040a624af6ae553 Mon Sep 17 00:00:00 2001
From: Tomasz Boguszewski <tomekboguszewski1@gmail.com>
Date: Sat, 1 Apr 2023 04:09:35 +0200
Subject: [PATCH 1/2] Simplify gen_name function
Signed-off-by: Tomasz Boguszewski <tomekboguszewski1@gmail.com>
---
src/naming.rs | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/src/naming.rs b/src/naming.rs
index 53e675d92..d805ee462 100644
--- a/src/naming.rs
+++ b/src/naming.rs
@@ -4,10 +4,8 @@ use hbb_common::ResultType;
use license::*;
fn gen_name(lic: &License) -> ResultType<String> {
- let tmp = serde_json::to_vec::<License>(lic)?;
- let tmp = URL_SAFE_NO_PAD.encode(&tmp);
- let tmp: String = tmp.chars().rev().collect();
- Ok(tmp)
+ let tmp = URL_SAFE_NO_PAD.encode(&serde_json::to_vec(lic)?);
+ Ok(tmp.chars().rev().collect())
}
fn main() {
From afa00df941fb4eb333138649ac2c56e99bb8ab57 Mon Sep 17 00:00:00 2001
From: Tomasz Boguszewski <tomekboguszewski1@gmail.com>
Date: Sat, 1 Apr 2023 04:23:25 +0200
Subject: [PATCH 2/2] Improve argument parsing
Signed-off-by: Tomasz Boguszewski <tomekboguszewski1@gmail.com>
---
src/naming.rs | 15 ++-------------
1 file changed, 2 insertions(+), 13 deletions(-)
diff --git a/src/naming.rs b/src/naming.rs
index d805ee462..7a8d0cecc 100644
--- a/src/naming.rs
+++ b/src/naming.rs
@@ -9,19 +9,8 @@ fn gen_name(lic: &License) -> ResultType<String> {
}
fn main() {
- let mut args = Vec::new();
- let mut i = 0;
- for arg in std::env::args() {
- if i > 0 {
- args.push(arg);
- }
- i += 1;
- }
- let api = if args.len() < 3 {
- "".to_owned()
- } else {
- args[2].clone()
- };
+ let args: Vec<_> = std::env::args().skip(1).collect();
+ let api = args.get(2).cloned().unwrap_or_default();
if args.len() >= 2 {
println!(
"rustdesk-licensed-{}.exe",