diff --git a/Cargo.lock b/Cargo.lock index fe91f25..21f4c74 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -214,7 +214,6 @@ dependencies = [ "clap-verbosity-flag", "emacs", "env_logger", - "lazy_static", "log", "serde", "serde_json", @@ -326,12 +325,6 @@ version = "1.0.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b1a46d1a171d865aa5f83f92695765caa047a9b4cbae2cbf37dbd613a793fd4c" -[[package]] -name = "lazy_static" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" - [[package]] name = "libc" version = "0.2.153" diff --git a/Cargo.toml b/Cargo.toml index 131f442..86eea92 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -16,7 +16,6 @@ edition = "2021" serde = { version = "1.0", features = ["derive"]} serde_json = "1.0" anyhow = "1.0" -lazy_static = "1.4" smallvec = "1.11" env_logger = "0.10" log = "0.4.20" diff --git a/src/bytecode.rs b/src/bytecode.rs index 796a88e..9ce939e 100644 --- a/src/bytecode.rs +++ b/src/bytecode.rs @@ -182,7 +182,7 @@ impl Op { &Self::StackRef(v) if (1..=4).contains(&v) => Ok(smallvec![v as u8]), &Self::StackRef(_) => unimplemented!(), - &Self::List(v) if v == 0 => unreachable!(), + &Self::List(0) => unreachable!(), &Self::List(v) if (1..=4).contains(&v) => Ok(smallvec![66 + v]), &Self::List(v) => Ok(smallvec![175, v]), &Self::Discard => Ok(smallvec![136]), diff --git a/tests/app_test.rs b/tests/app_test.rs index fdb9be2..c1a5c57 100644 --- a/tests/app_test.rs +++ b/tests/app_test.rs @@ -1,6 +1,4 @@ use anyhow::Result; -use tempfile; -use env_logger; use emacs_lsp_booster::{app, rpcio}; @@ -23,7 +21,7 @@ fn test_app_with_echo_server() -> Result<()> { }); let mut cmd = std::process::Command::new("timeout"); - cmd.args(&["1", "cat"]); + cmd.args(["1", "cat"]); let exit_status = app::run_app_forever(input_pair_out, output_file, cmd, app::AppOptions { bytecode_options: Some(Default::default()), diff --git a/tests/bytecode_test.rs b/tests/bytecode_test.rs index dad11ac..ea34a72 100644 --- a/tests/bytecode_test.rs +++ b/tests/bytecode_test.rs @@ -1,6 +1,5 @@ use serde_json as json; use anyhow::Result; -use tempfile; use emacs_lsp_booster::bytecode; @@ -9,7 +8,7 @@ fn run_one_test(json_str: &str, object_type: bytecode::ObjectType) -> Result<()> let json_value: json::Value = json::from_str(json_str)?; let json_str_nowhitespaces = json_value.to_string(); let bytecode = bytecode::generate_bytecode_repl(&json_value, bytecode::BytecodeOptions { - object_type: object_type.clone(), + object_type, ..Default::default() })?; @@ -52,9 +51,9 @@ fn test_bytecode() { // unicode test run_one_test(r#"{"a":"ÀÁÂÃÄÅÆÇÈÉÊËÌ abcd \n 你好世界"}"#, bytecode::ObjectType::Plist).unwrap(); - for object_type in vec![bytecode::ObjectType::Plist, - bytecode::ObjectType::Alist, - bytecode::ObjectType::Hashtable] { + for object_type in [bytecode::ObjectType::Plist, + bytecode::ObjectType::Alist, + bytecode::ObjectType::Hashtable] { eprintln!("Testing completion.json (~100KB), object type = {:?}", object_type); run_one_test(include_str!("./data/completion.json"), object_type).unwrap();