From 090773dc8a2d6f99582fbda0b40f934a8089399e Mon Sep 17 00:00:00 2001 From: Manank Patel Date: Sat, 30 Jul 2022 10:48:56 +0530 Subject: [PATCH 1/4] fixed issue where it failed test command with "error: sequence, expected string" --- src/cache/mod.rs | 2 +- src/cache/models.rs | 6 +++--- src/cmds/edit.rs | 5 +---- src/plugins/leetcode.rs | 1 - 4 files changed, 5 insertions(+), 9 deletions(-) diff --git a/src/cache/mod.rs b/src/cache/mod.rs index 2eec037..1cc5967 100644 --- a/src/cache/mod.rs +++ b/src/cache/mod.rs @@ -81,7 +81,7 @@ impl Cache { if maybe_json.is_err() && self.is_session_bad().await { Err(Error::CookieError) } else { - Ok(maybe_json?) + Ok(maybe_json.unwrap()) } } diff --git a/src/cache/models.rs b/src/cache/models.rs index b338adf..c1d192d 100644 --- a/src/cache/models.rs +++ b/src/cache/models.rs @@ -255,8 +255,8 @@ pub struct VerifyResult { code_output: Vec, #[serde(default, deserialize_with = "ssr")] expected_output: Vec, - #[serde(default)] - std_output: String, + #[serde(default, deserialize_with = "ssr")] + std_output: Vec, // flatten // #[serde(flatten, default)] @@ -471,7 +471,7 @@ impl std::fmt::Display for VerifyResult { f, "{}{}", &"Stdout:".after_spaces(8).purple(), - &self.std_output.replace('\n', &"\n".after_spaces(15)) + &self.std_output[0].replace('\n', &"\n".after_spaces(15)) ) } else { write!(f, "") diff --git a/src/cmds/edit.rs b/src/cmds/edit.rs index 039ad2e..a082cf7 100644 --- a/src/cmds/edit.rs +++ b/src/cmds/edit.rs @@ -101,10 +101,7 @@ impl Command for EditCommand { file_code.write_all((CODE_START.to_string() + "\n").as_bytes())?; file_code.write_all((d.code.to_string() + "\n").as_bytes())?; file_code.write_all((CODE_END.to_string() + "\n").as_bytes())?; - - if test_flag { - file_tests.write_all(question.all_cases.as_bytes())?; - } + file_tests.write_all(question.all_cases.as_bytes())?; } } diff --git a/src/plugins/leetcode.rs b/src/plugins/leetcode.rs index e06627f..90304aa 100644 --- a/src/plugins/leetcode.rs +++ b/src/plugins/leetcode.rs @@ -30,7 +30,6 @@ impl LeetCode { headers.insert(name.unwrap(), value.unwrap()); } - Ok(headers) } From bb3be23b3d81201c2b41b8d5a202c61149f363f8 Mon Sep 17 00:00:00 2001 From: Manank Patel Date: Sat, 30 Jul 2022 23:33:38 +0530 Subject: [PATCH 2/4] add requested changes --- src/cache/mod.rs | 2 +- src/cmds/edit.rs | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/cache/mod.rs b/src/cache/mod.rs index 1cc5967..2eec037 100644 --- a/src/cache/mod.rs +++ b/src/cache/mod.rs @@ -81,7 +81,7 @@ impl Cache { if maybe_json.is_err() && self.is_session_bad().await { Err(Error::CookieError) } else { - Ok(maybe_json.unwrap()) + Ok(maybe_json?) } } diff --git a/src/cmds/edit.rs b/src/cmds/edit.rs index a082cf7..d70129b 100644 --- a/src/cmds/edit.rs +++ b/src/cmds/edit.rs @@ -101,6 +101,8 @@ impl Command for EditCommand { file_code.write_all((CODE_START.to_string() + "\n").as_bytes())?; file_code.write_all((d.code.to_string() + "\n").as_bytes())?; file_code.write_all((CODE_END.to_string() + "\n").as_bytes())?; + } + if test_flag { file_tests.write_all(question.all_cases.as_bytes())?; } } From 10c4e52056d78ca2ed25940ad9e0f8d47340223b Mon Sep 17 00:00:00 2001 From: Manank Patel Date: Sat, 30 Jul 2022 23:37:26 +0530 Subject: [PATCH 3/4] code cleanup --- src/cmds/edit.rs | 1 + src/plugins/leetcode.rs | 1 + 2 files changed, 2 insertions(+) diff --git a/src/cmds/edit.rs b/src/cmds/edit.rs index d70129b..51aa440 100644 --- a/src/cmds/edit.rs +++ b/src/cmds/edit.rs @@ -102,6 +102,7 @@ impl Command for EditCommand { file_code.write_all((d.code.to_string() + "\n").as_bytes())?; file_code.write_all((CODE_END.to_string() + "\n").as_bytes())?; } + if test_flag { file_tests.write_all(question.all_cases.as_bytes())?; } diff --git a/src/plugins/leetcode.rs b/src/plugins/leetcode.rs index 90304aa..e06627f 100644 --- a/src/plugins/leetcode.rs +++ b/src/plugins/leetcode.rs @@ -30,6 +30,7 @@ impl LeetCode { headers.insert(name.unwrap(), value.unwrap()); } + Ok(headers) } From 6b426c992e4e2dc13b407fa9e2542a1e53783e91 Mon Sep 17 00:00:00 2001 From: Manank Patel Date: Sat, 30 Jul 2022 23:41:01 +0530 Subject: [PATCH 4/4] fixed some more mistakes --- src/cmds/edit.rs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/cmds/edit.rs b/src/cmds/edit.rs index 51aa440..039ad2e 100644 --- a/src/cmds/edit.rs +++ b/src/cmds/edit.rs @@ -101,10 +101,10 @@ impl Command for EditCommand { file_code.write_all((CODE_START.to_string() + "\n").as_bytes())?; file_code.write_all((d.code.to_string() + "\n").as_bytes())?; file_code.write_all((CODE_END.to_string() + "\n").as_bytes())?; - } - if test_flag { - file_tests.write_all(question.all_cases.as_bytes())?; + if test_flag { + file_tests.write_all(question.all_cases.as_bytes())?; + } } }