From 833dc5a28ce77f3eb06b544d2d33a22cdc0d968f Mon Sep 17 00:00:00 2001 From: Riccardo Mazzarini Date: Sun, 22 Dec 2024 15:51:07 +0800 Subject: [PATCH] Fix Clippy on 0.10 --- crates/api/src/types/cmd_infos.rs | 10 ++++++- tests/src/api/extmark.rs | 27 ++++++++--------- tests/src/api/tabpage.rs | 25 +++++++++------- tests/src/api/vimscript.rs | 48 +++++++++++++++---------------- tests/src/libuv/async_handle.rs | 6 ++-- tests/src/libuv/timer_handle.rs | 4 +-- 6 files changed, 63 insertions(+), 57 deletions(-) diff --git a/crates/api/src/types/cmd_infos.rs b/crates/api/src/types/cmd_infos.rs index 0103d93d..ca7d0b99 100644 --- a/crates/api/src/types/cmd_infos.rs +++ b/crates/api/src/types/cmd_infos.rs @@ -206,7 +206,7 @@ pub(crate) struct ParseCmdOutput { #[cfg(feature = "neovim-nightly")] addr: NvimString, - // Only on Nightly. + // Only on 0.10. #[cfg(all(feature = "neovim-0-10", not(feature = "neovim-nightly")))] nextcmd: Object, @@ -331,6 +331,9 @@ impl TryFrom for CmdInfos { } Ok(Self { + #[cfg(all(feature = "neovim-0-10", not(feature = "neovim-nightly")))] // Only on 0.10. + addr: utils::none_literal_is_none(Deserializer::new(addr))?, + #[cfg(feature = "neovim-nightly")] // Only on Nightly. addr: utils::none_literal_is_none(Deserializer::new(addr.into()))?, args: deserialize(args)?, bang: deserialize(bang)?, @@ -339,6 +342,11 @@ impl TryFrom for CmdInfos { magic: deserialize(magic)?, mods: deserialize(mods)?, nargs: deserialize(nargs)?, + #[cfg(all(feature = "neovim-0-10", not(feature = "neovim-nightly")))] // Only on 0.10. + nextcmd: utils::empty_string_is_none(Deserializer::new( + nextcmd, + ))?, + #[cfg(feature = "neovim-nightly")] // Only on Nightly. nextcmd: utils::empty_string_is_none(Deserializer::new( nextcmd.into(), ))?, diff --git a/tests/src/api/extmark.rs b/tests/src/api/extmark.rs index f857e0bc..e1b8aac6 100644 --- a/tests/src/api/extmark.rs +++ b/tests/src/api/extmark.rs @@ -1,7 +1,6 @@ -use nvim_oxi as nvim; use nvim_oxi::api::{self, opts::*, types::*, Buffer}; -#[nvim::test] +#[nvim_oxi::test] fn add_highlight() { let mut buf = Buffer::current(); let id = api::create_namespace("Foo"); @@ -9,7 +8,7 @@ fn add_highlight() { assert!(res.is_ok(), "{res:?}"); } -#[nvim::test] +#[nvim_oxi::test] fn clear_namespace() { let mut buf = Buffer::current(); let id = api::create_namespace("Foo"); @@ -17,7 +16,7 @@ fn clear_namespace() { assert_eq!(Ok(()), res); } -#[nvim::test] +#[nvim_oxi::test] fn get_extmarks() { let mut buf = Buffer::current(); let ns_id = api::create_namespace("Foo"); @@ -85,7 +84,7 @@ fn get_extmarks() { assert_eq!(Some(ExtmarkVirtTextPosition::Overlay), infos.virt_text_pos); } -#[nvim::test] +#[nvim_oxi::test] fn get_namespaces() { let id = api::create_namespace("Foo"); @@ -96,29 +95,27 @@ fn get_namespaces() { assert_eq!(id, out); } -#[nvim::test] +#[nvim_oxi::test] fn set_decoration_provider() { - use nvim::print; - let id = api::create_namespace("Foo"); let opts = DecorationProviderOpts::builder() .on_start(|args| { - print!("{args:?}"); + nvim_oxi::print!("{args:?}"); true }) .on_buf(|args| { - print!("{args:?}"); + nvim_oxi::print!("{args:?}"); }) .on_win(|args| { - print!("{args:?}"); + nvim_oxi::print!("{args:?}"); true }) .on_line(|args| { - print!("{args:?}"); + nvim_oxi::print!("{args:?}"); }) .on_end(|args| { - print!("{args:?}"); + nvim_oxi::print!("{args:?}"); }) .build(); @@ -133,7 +130,7 @@ fn set_decoration_provider() { assert!(bytes_written.is_ok(), "{bytes_written:?}"); } -#[nvim::test] +#[nvim_oxi::test] fn set_get_del_extmark() { let mut buf = Buffer::current(); let ns_id = api::create_namespace("Foo"); @@ -207,7 +204,7 @@ fn set_get_del_extmark() { } #[cfg(feature = "neovim-0-10")] // On 0.10 and nightly. -#[nvim::test] +#[nvim_oxi::test] fn virt_text_pos_inline() { let mut buf = Buffer::current(); diff --git a/tests/src/api/tabpage.rs b/tests/src/api/tabpage.rs index cdb4f9bd..12e73815 100644 --- a/tests/src/api/tabpage.rs +++ b/tests/src/api/tabpage.rs @@ -1,6 +1,6 @@ -use nvim_oxi::{self as nvim, api::TabPage}; +use nvim_oxi::api::TabPage; -#[nvim::test] +#[nvim_oxi::test] fn get_list_wins() { let tab = TabPage::current(); @@ -16,17 +16,17 @@ fn get_list_wins() { assert_eq!(win, all_wins.into_iter().next().unwrap()); } -#[nvim::test] +#[nvim_oxi::test] fn tabpage_get_number() { assert_eq!(Ok(1), TabPage::current().get_number()) } -#[nvim::test] +#[nvim_oxi::test] fn is_valid() { assert!(TabPage::current().is_valid()); } -#[nvim::test] +#[nvim_oxi::test] fn tabpage_set_get_del_var() { let mut tab = TabPage::current(); tab.set_var("foo", 42).unwrap(); @@ -34,20 +34,23 @@ fn tabpage_set_get_del_var() { assert_eq!(Ok(()), tab.del_var("foo")); } -#[nvim::test] +#[nvim_oxi::test] #[cfg(feature = "neovim-0-10")] // On 0.10 and nightly. fn tabpage_set_get_win() { - let config = nvim::api::types::WindowConfig::builder() - .relative(nvim::api::types::WindowRelativeTo::Editor) + let config = nvim_oxi::api::types::WindowConfig::builder() + .relative(nvim_oxi::api::types::WindowRelativeTo::Editor) .height(10) .width(5) .row(1.5) .col(1.5) .build(); - let window = - nvim::api::open_win(&nvim::api::Buffer::current(), true, &config) - .unwrap(); + let window = nvim_oxi::api::open_win( + &nvim_oxi::api::Buffer::current(), + true, + &config, + ) + .unwrap(); let mut tab = TabPage::current(); diff --git a/tests/src/api/vimscript.rs b/tests/src/api/vimscript.rs index 491b36f4..60f5d0e4 100644 --- a/tests/src/api/vimscript.rs +++ b/tests/src/api/vimscript.rs @@ -1,14 +1,12 @@ -use nvim_oxi as oxi; -#[allow(unused_imports)] use nvim_oxi::api::{self, opts::*, types::*}; -#[oxi::test] +#[nvim_oxi::test] fn call_function() { let res = api::call_function::<_, usize>("strwidth", ("foo bar",)); assert_eq!(Ok(7), res); } -#[oxi::test(cmd = "set autoread")] // getting `W13` warnings otherwise +#[nvim_oxi::test(cmd = "set autoread")] // getting `W13` warnings otherwise fn cmd_basic() { let cmd = "checktime"; let infos = CmdInfos::builder().cmd(cmd).build(); @@ -16,7 +14,7 @@ fn cmd_basic() { assert_eq!(Ok(None), api::cmd(&infos, &opts)); } -#[oxi::test] +#[nvim_oxi::test] fn cmd_no_output() { let cmd = "checktime"; let infos = CmdInfos::builder().cmd(cmd).build(); @@ -24,7 +22,7 @@ fn cmd_no_output() { assert_eq!(Ok(None), api::cmd(&infos, &opts)); } -#[oxi::test] +#[nvim_oxi::test] fn command() { let res = api::command(":lua vim.api.nvim_buf_set_var(0, 'foo', 'bar')"); assert_eq!(Ok(()), res); @@ -35,7 +33,7 @@ fn command() { ); } -#[oxi::test] +#[nvim_oxi::test] fn eval() { let res = api::eval::("41 + 1"); assert_eq!(Ok(42), res); @@ -44,7 +42,7 @@ fn eval() { assert_eq!(Ok(69), res); // nice } -#[oxi::test] +#[nvim_oxi::test] fn exec() { let no_op = api::exec(":", true); assert_eq!(Ok(None), no_op); @@ -53,7 +51,7 @@ fn exec() { assert_eq!(Ok(Some("2".into())), add); } -#[oxi::test] +#[nvim_oxi::test] fn parse_cmd_basic() { let res = api::parse_cmd("echo 'foo'", &Default::default()); assert!(res.is_ok(), "{res:?}"); @@ -71,25 +69,25 @@ fn parse_cmd_basic() { assert_eq!(Some(0), infos.count); let magic = infos.magic.unwrap(); - assert_eq!(false, magic.file); - assert_eq!(false, magic.bar); + assert!(!magic.file); + assert!(!magic.bar); let mods = infos.mods.unwrap(); - assert_eq!(false, mods.browse); - assert_eq!(false, mods.confirm); - assert_eq!(false, mods.emsg_silent); - assert_eq!(false, mods.hide); - assert_eq!(false, mods.keepalt); - assert_eq!(false, mods.keepjumps); - assert_eq!(false, mods.keepmarks); - assert_eq!(false, mods.keeppatterns); - assert_eq!(false, mods.lockmarks); - assert_eq!(false, mods.noautocmd); - assert_eq!(false, mods.sandbox); - assert_eq!(false, mods.silent); + assert!(!mods.browse); + assert!(!mods.confirm); + assert!(!mods.emsg_silent); + assert!(!mods.hide); + assert!(!mods.keepalt); + assert!(!mods.keepjumps); + assert!(!mods.keepmarks); + assert!(!mods.keeppatterns); + assert!(!mods.lockmarks); + assert!(!mods.noautocmd); + assert!(!mods.sandbox); + assert!(!mods.silent); assert_eq!(None, mods.split); assert_eq!(-1, mods.tab); - assert_eq!(false, mods.vertical); + assert!(!mods.vertical); assert_eq!(Some(CommandNArgs::Any), infos.nargs); assert_eq!(None, infos.nextcmd); @@ -101,7 +99,7 @@ fn parse_cmd_basic() { assert_eq!(Some(CmdRange::None), infos.range); } -#[oxi::test] +#[nvim_oxi::test] fn parse_expression_basic() { let res = api::parse_expression("lua print('a')", "", true); assert!(res.is_ok(), "{res:?}"); diff --git a/tests/src/libuv/async_handle.rs b/tests/src/libuv/async_handle.rs index 7f2b05d9..613757b3 100644 --- a/tests/src/libuv/async_handle.rs +++ b/tests/src/libuv/async_handle.rs @@ -1,9 +1,9 @@ use std::cell::RefCell; use std::rc::Rc; -use nvim_oxi::{self as nvim, libuv::*}; +use nvim_oxi::libuv::*; -#[nvim::test] +#[nvim_oxi::test] #[ignore = "the callback is never called"] fn async_handle_0() { let num_called = Rc::new(RefCell::new(0)); @@ -24,7 +24,7 @@ fn async_handle_0() { // TODO: how do we wait for the callback to be executed without // blocking the main thread? - nvim::schedule(move |_| { + nvim_oxi::schedule(move |_| { assert_eq!(*also_num_called.borrow(), i); }); } diff --git a/tests/src/libuv/timer_handle.rs b/tests/src/libuv/timer_handle.rs index defe94b9..74d151c1 100644 --- a/tests/src/libuv/timer_handle.rs +++ b/tests/src/libuv/timer_handle.rs @@ -2,9 +2,9 @@ use std::sync::mpsc; use std::thread::sleep; use std::time::Duration; -use nvim_oxi::{self as nvim, libuv::*}; +use nvim_oxi::libuv::*; -#[nvim::test] +#[nvim_oxi::test] fn timer_handle_0() { let (tx, rx) = mpsc::channel();