From ce18550c4225e07fe823d80bc5be517bc360424d Mon Sep 17 00:00:00 2001 From: Steve Loveless Date: Wed, 8 Dec 2021 23:39:17 -0800 Subject: [PATCH] Rename crates to use underscores Update testing.yml Update testing.yml --- .github/workflows/testing.yml | 2 +- Cargo.toml | 3 +-- {neovim-sys => neovim_sys}/Cargo.toml | 2 +- {neovim-sys => neovim_sys}/build.rs | 0 {neovim-sys => neovim_sys}/src/api.rs | 0 {neovim-sys => neovim_sys}/src/api/buffer.rs | 0 {neovim-sys => neovim_sys}/src/api/nvim.rs | 0 {neovim-sys => neovim_sys}/src/api/nvim/array.rs | 0 {neovim-sys => neovim_sys}/src/api/nvim/collection.rs | 0 {neovim-sys => neovim_sys}/src/api/nvim/dictionary.rs | 0 {neovim-sys => neovim_sys}/src/api/nvim/error.rs | 0 {neovim-sys => neovim_sys}/src/api/nvim/object.rs | 0 {neovim-sys => neovim_sys}/src/api/nvim/string.rs | 0 {neovim-sys => neovim_sys}/src/api/private.rs | 0 {neovim-sys => neovim_sys}/src/globals.rs | 0 {neovim-sys => neovim_sys}/src/lib.rs | 0 {neovim-sys => neovim_sys}/src/option.rs | 0 {neovim-sys => neovim_sys}/src/types.rs | 0 {nvim-api => nvim_api}/Cargo.toml | 4 ++-- {nvim-api => nvim_api}/src/api.rs | 0 {nvim-api => nvim_api}/src/api/buffer.rs | 0 {nvim-api => nvim_api}/src/api/error.rs | 0 {nvim-api => nvim_api}/src/api/mode.rs | 0 {nvim-api => nvim_api}/src/api/nvim.rs | 0 {nvim-api => nvim_api}/src/api/rust_object.rs | 0 {nvim-api => nvim_api}/src/lib.rs | 0 {nvim-api => nvim_api}/src/lua_test.rs | 0 nvim_test-proc_macro/Cargo.toml | 8 ++++++++ nvim_test-proc_macro/src/lib.rs | 8 ++++++++ {overkill-nvim => overkill_nvim}/Cargo.toml | 4 ++-- {overkill-nvim => overkill_nvim}/src/key_code.rs | 0 {overkill-nvim => overkill_nvim}/src/lib.rs | 0 {overkill-nvim => overkill_nvim}/src/lua_test.rs | 0 {overkill-nvim => overkill_nvim}/src/option.rs | 0 .../src/option/clipboard_settings.rs | 0 .../src/option/color_column_value.rs | 0 .../src/option/complete_opt_settings.rs | 0 .../src/option/conceal_level_value.rs | 0 {overkill-nvim => overkill_nvim}/src/option/flags.rs | 0 .../src/option/flags/char_flags.rs | 0 .../src/option/flags/string_flags.rs | 0 .../src/option/inc_command_value.rs | 0 .../src/option/list_char_settings.rs | 0 .../src/option/short_mess_item.rs | 0 .../src/option/show_tabline_value.rs | 0 .../src/option/sign_column_value.rs | 0 .../src/option/spell_lang_value.rs | 0 47 files changed, 23 insertions(+), 8 deletions(-) rename {neovim-sys => neovim_sys}/Cargo.toml (92%) rename {neovim-sys => neovim_sys}/build.rs (100%) rename {neovim-sys => neovim_sys}/src/api.rs (100%) rename {neovim-sys => neovim_sys}/src/api/buffer.rs (100%) rename {neovim-sys => neovim_sys}/src/api/nvim.rs (100%) rename {neovim-sys => neovim_sys}/src/api/nvim/array.rs (100%) rename {neovim-sys => neovim_sys}/src/api/nvim/collection.rs (100%) rename {neovim-sys => neovim_sys}/src/api/nvim/dictionary.rs (100%) rename {neovim-sys => neovim_sys}/src/api/nvim/error.rs (100%) rename {neovim-sys => neovim_sys}/src/api/nvim/object.rs (100%) rename {neovim-sys => neovim_sys}/src/api/nvim/string.rs (100%) rename {neovim-sys => neovim_sys}/src/api/private.rs (100%) rename {neovim-sys => neovim_sys}/src/globals.rs (100%) rename {neovim-sys => neovim_sys}/src/lib.rs (100%) rename {neovim-sys => neovim_sys}/src/option.rs (100%) rename {neovim-sys => neovim_sys}/src/types.rs (100%) rename {nvim-api => nvim_api}/Cargo.toml (82%) rename {nvim-api => nvim_api}/src/api.rs (100%) rename {nvim-api => nvim_api}/src/api/buffer.rs (100%) rename {nvim-api => nvim_api}/src/api/error.rs (100%) rename {nvim-api => nvim_api}/src/api/mode.rs (100%) rename {nvim-api => nvim_api}/src/api/nvim.rs (100%) rename {nvim-api => nvim_api}/src/api/rust_object.rs (100%) rename {nvim-api => nvim_api}/src/lib.rs (100%) rename {nvim-api => nvim_api}/src/lua_test.rs (100%) create mode 100644 nvim_test-proc_macro/Cargo.toml create mode 100644 nvim_test-proc_macro/src/lib.rs rename {overkill-nvim => overkill_nvim}/Cargo.toml (83%) rename {overkill-nvim => overkill_nvim}/src/key_code.rs (100%) rename {overkill-nvim => overkill_nvim}/src/lib.rs (100%) rename {overkill-nvim => overkill_nvim}/src/lua_test.rs (100%) rename {overkill-nvim => overkill_nvim}/src/option.rs (100%) rename {overkill-nvim => overkill_nvim}/src/option/clipboard_settings.rs (100%) rename {overkill-nvim => overkill_nvim}/src/option/color_column_value.rs (100%) rename {overkill-nvim => overkill_nvim}/src/option/complete_opt_settings.rs (100%) rename {overkill-nvim => overkill_nvim}/src/option/conceal_level_value.rs (100%) rename {overkill-nvim => overkill_nvim}/src/option/flags.rs (100%) rename {overkill-nvim => overkill_nvim}/src/option/flags/char_flags.rs (100%) rename {overkill-nvim => overkill_nvim}/src/option/flags/string_flags.rs (100%) rename {overkill-nvim => overkill_nvim}/src/option/inc_command_value.rs (100%) rename {overkill-nvim => overkill_nvim}/src/option/list_char_settings.rs (100%) rename {overkill-nvim => overkill_nvim}/src/option/short_mess_item.rs (100%) rename {overkill-nvim => overkill_nvim}/src/option/show_tabline_value.rs (100%) rename {overkill-nvim => overkill_nvim}/src/option/sign_column_value.rs (100%) rename {overkill-nvim => overkill_nvim}/src/option/spell_lang_value.rs (100%) diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml index 1250351..7acdd68 100644 --- a/.github/workflows/testing.yml +++ b/.github/workflows/testing.yml @@ -86,7 +86,7 @@ jobs: uses: actions-rs/cargo@v1 with: command: build - args: --package nvim-api --package overkill-nvim --features lua_test + args: --package nvim_api --package overkill_nvim --features lua_test - name: View files in target/ run: ls -R target/ diff --git a/Cargo.toml b/Cargo.toml index e3939f0..2c84c0f 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,3 +1,2 @@ [workspace] -members = ["neovim-sys", "nvim-api", "overkill-nvim"] -resolver = "2" +members = ["neovim_sys", "nvim_api", "overkill_nvim"] diff --git a/neovim-sys/Cargo.toml b/neovim_sys/Cargo.toml similarity index 92% rename from neovim-sys/Cargo.toml rename to neovim_sys/Cargo.toml index 9dc7bdc..64ee4bd 100644 --- a/neovim-sys/Cargo.toml +++ b/neovim_sys/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "neovim-sys" +name = "neovim_sys" version = "0.1.0" authors = ["Steve Loveless "] edition = "2021" diff --git a/neovim-sys/build.rs b/neovim_sys/build.rs similarity index 100% rename from neovim-sys/build.rs rename to neovim_sys/build.rs diff --git a/neovim-sys/src/api.rs b/neovim_sys/src/api.rs similarity index 100% rename from neovim-sys/src/api.rs rename to neovim_sys/src/api.rs diff --git a/neovim-sys/src/api/buffer.rs b/neovim_sys/src/api/buffer.rs similarity index 100% rename from neovim-sys/src/api/buffer.rs rename to neovim_sys/src/api/buffer.rs diff --git a/neovim-sys/src/api/nvim.rs b/neovim_sys/src/api/nvim.rs similarity index 100% rename from neovim-sys/src/api/nvim.rs rename to neovim_sys/src/api/nvim.rs diff --git a/neovim-sys/src/api/nvim/array.rs b/neovim_sys/src/api/nvim/array.rs similarity index 100% rename from neovim-sys/src/api/nvim/array.rs rename to neovim_sys/src/api/nvim/array.rs diff --git a/neovim-sys/src/api/nvim/collection.rs b/neovim_sys/src/api/nvim/collection.rs similarity index 100% rename from neovim-sys/src/api/nvim/collection.rs rename to neovim_sys/src/api/nvim/collection.rs diff --git a/neovim-sys/src/api/nvim/dictionary.rs b/neovim_sys/src/api/nvim/dictionary.rs similarity index 100% rename from neovim-sys/src/api/nvim/dictionary.rs rename to neovim_sys/src/api/nvim/dictionary.rs diff --git a/neovim-sys/src/api/nvim/error.rs b/neovim_sys/src/api/nvim/error.rs similarity index 100% rename from neovim-sys/src/api/nvim/error.rs rename to neovim_sys/src/api/nvim/error.rs diff --git a/neovim-sys/src/api/nvim/object.rs b/neovim_sys/src/api/nvim/object.rs similarity index 100% rename from neovim-sys/src/api/nvim/object.rs rename to neovim_sys/src/api/nvim/object.rs diff --git a/neovim-sys/src/api/nvim/string.rs b/neovim_sys/src/api/nvim/string.rs similarity index 100% rename from neovim-sys/src/api/nvim/string.rs rename to neovim_sys/src/api/nvim/string.rs diff --git a/neovim-sys/src/api/private.rs b/neovim_sys/src/api/private.rs similarity index 100% rename from neovim-sys/src/api/private.rs rename to neovim_sys/src/api/private.rs diff --git a/neovim-sys/src/globals.rs b/neovim_sys/src/globals.rs similarity index 100% rename from neovim-sys/src/globals.rs rename to neovim_sys/src/globals.rs diff --git a/neovim-sys/src/lib.rs b/neovim_sys/src/lib.rs similarity index 100% rename from neovim-sys/src/lib.rs rename to neovim_sys/src/lib.rs diff --git a/neovim-sys/src/option.rs b/neovim_sys/src/option.rs similarity index 100% rename from neovim-sys/src/option.rs rename to neovim_sys/src/option.rs diff --git a/neovim-sys/src/types.rs b/neovim_sys/src/types.rs similarity index 100% rename from neovim-sys/src/types.rs rename to neovim_sys/src/types.rs diff --git a/nvim-api/Cargo.toml b/nvim_api/Cargo.toml similarity index 82% rename from nvim-api/Cargo.toml rename to nvim_api/Cargo.toml index 281ab99..d2bbb92 100644 --- a/nvim-api/Cargo.toml +++ b/nvim_api/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "nvim-api" +name = "nvim_api" version = "0.1.0" authors = ["Steve Loveless "] edition = "2021" @@ -9,7 +9,7 @@ crate-type = ["cdylib", "rlib"] [dependencies] approx = { version = "0.5", optional = true } -neovim-sys = { path = "../neovim-sys" } +neovim_sys = { path = "../neovim_sys" } thiserror = "1.0" [features] diff --git a/nvim-api/src/api.rs b/nvim_api/src/api.rs similarity index 100% rename from nvim-api/src/api.rs rename to nvim_api/src/api.rs diff --git a/nvim-api/src/api/buffer.rs b/nvim_api/src/api/buffer.rs similarity index 100% rename from nvim-api/src/api/buffer.rs rename to nvim_api/src/api/buffer.rs diff --git a/nvim-api/src/api/error.rs b/nvim_api/src/api/error.rs similarity index 100% rename from nvim-api/src/api/error.rs rename to nvim_api/src/api/error.rs diff --git a/nvim-api/src/api/mode.rs b/nvim_api/src/api/mode.rs similarity index 100% rename from nvim-api/src/api/mode.rs rename to nvim_api/src/api/mode.rs diff --git a/nvim-api/src/api/nvim.rs b/nvim_api/src/api/nvim.rs similarity index 100% rename from nvim-api/src/api/nvim.rs rename to nvim_api/src/api/nvim.rs diff --git a/nvim-api/src/api/rust_object.rs b/nvim_api/src/api/rust_object.rs similarity index 100% rename from nvim-api/src/api/rust_object.rs rename to nvim_api/src/api/rust_object.rs diff --git a/nvim-api/src/lib.rs b/nvim_api/src/lib.rs similarity index 100% rename from nvim-api/src/lib.rs rename to nvim_api/src/lib.rs diff --git a/nvim-api/src/lua_test.rs b/nvim_api/src/lua_test.rs similarity index 100% rename from nvim-api/src/lua_test.rs rename to nvim_api/src/lua_test.rs diff --git a/nvim_test-proc_macro/Cargo.toml b/nvim_test-proc_macro/Cargo.toml new file mode 100644 index 0000000..90bd583 --- /dev/null +++ b/nvim_test-proc_macro/Cargo.toml @@ -0,0 +1,8 @@ +[package] +name = "nvim_test-proc_macro" +version = "0.1.0" +edition = "2021" + +# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html + +[dependencies] diff --git a/nvim_test-proc_macro/src/lib.rs b/nvim_test-proc_macro/src/lib.rs new file mode 100644 index 0000000..1b4a90c --- /dev/null +++ b/nvim_test-proc_macro/src/lib.rs @@ -0,0 +1,8 @@ +#[cfg(test)] +mod tests { + #[test] + fn it_works() { + let result = 2 + 2; + assert_eq!(result, 4); + } +} diff --git a/overkill-nvim/Cargo.toml b/overkill_nvim/Cargo.toml similarity index 83% rename from overkill-nvim/Cargo.toml rename to overkill_nvim/Cargo.toml index aa6a20e..60dd6cc 100644 --- a/overkill-nvim/Cargo.toml +++ b/overkill_nvim/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "overkill-nvim" +name = "overkill_nvim" version = "0.1.0" authors = ["Steve Loveless "] edition = "2021" @@ -10,7 +10,7 @@ crate-type = ["cdylib", "rlib"] # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -nvim-api = { path = "../nvim-api/" } +nvim_api = { path = "../nvim_api/" } thiserror = "1.0" [features] diff --git a/overkill-nvim/src/key_code.rs b/overkill_nvim/src/key_code.rs similarity index 100% rename from overkill-nvim/src/key_code.rs rename to overkill_nvim/src/key_code.rs diff --git a/overkill-nvim/src/lib.rs b/overkill_nvim/src/lib.rs similarity index 100% rename from overkill-nvim/src/lib.rs rename to overkill_nvim/src/lib.rs diff --git a/overkill-nvim/src/lua_test.rs b/overkill_nvim/src/lua_test.rs similarity index 100% rename from overkill-nvim/src/lua_test.rs rename to overkill_nvim/src/lua_test.rs diff --git a/overkill-nvim/src/option.rs b/overkill_nvim/src/option.rs similarity index 100% rename from overkill-nvim/src/option.rs rename to overkill_nvim/src/option.rs diff --git a/overkill-nvim/src/option/clipboard_settings.rs b/overkill_nvim/src/option/clipboard_settings.rs similarity index 100% rename from overkill-nvim/src/option/clipboard_settings.rs rename to overkill_nvim/src/option/clipboard_settings.rs diff --git a/overkill-nvim/src/option/color_column_value.rs b/overkill_nvim/src/option/color_column_value.rs similarity index 100% rename from overkill-nvim/src/option/color_column_value.rs rename to overkill_nvim/src/option/color_column_value.rs diff --git a/overkill-nvim/src/option/complete_opt_settings.rs b/overkill_nvim/src/option/complete_opt_settings.rs similarity index 100% rename from overkill-nvim/src/option/complete_opt_settings.rs rename to overkill_nvim/src/option/complete_opt_settings.rs diff --git a/overkill-nvim/src/option/conceal_level_value.rs b/overkill_nvim/src/option/conceal_level_value.rs similarity index 100% rename from overkill-nvim/src/option/conceal_level_value.rs rename to overkill_nvim/src/option/conceal_level_value.rs diff --git a/overkill-nvim/src/option/flags.rs b/overkill_nvim/src/option/flags.rs similarity index 100% rename from overkill-nvim/src/option/flags.rs rename to overkill_nvim/src/option/flags.rs diff --git a/overkill-nvim/src/option/flags/char_flags.rs b/overkill_nvim/src/option/flags/char_flags.rs similarity index 100% rename from overkill-nvim/src/option/flags/char_flags.rs rename to overkill_nvim/src/option/flags/char_flags.rs diff --git a/overkill-nvim/src/option/flags/string_flags.rs b/overkill_nvim/src/option/flags/string_flags.rs similarity index 100% rename from overkill-nvim/src/option/flags/string_flags.rs rename to overkill_nvim/src/option/flags/string_flags.rs diff --git a/overkill-nvim/src/option/inc_command_value.rs b/overkill_nvim/src/option/inc_command_value.rs similarity index 100% rename from overkill-nvim/src/option/inc_command_value.rs rename to overkill_nvim/src/option/inc_command_value.rs diff --git a/overkill-nvim/src/option/list_char_settings.rs b/overkill_nvim/src/option/list_char_settings.rs similarity index 100% rename from overkill-nvim/src/option/list_char_settings.rs rename to overkill_nvim/src/option/list_char_settings.rs diff --git a/overkill-nvim/src/option/short_mess_item.rs b/overkill_nvim/src/option/short_mess_item.rs similarity index 100% rename from overkill-nvim/src/option/short_mess_item.rs rename to overkill_nvim/src/option/short_mess_item.rs diff --git a/overkill-nvim/src/option/show_tabline_value.rs b/overkill_nvim/src/option/show_tabline_value.rs similarity index 100% rename from overkill-nvim/src/option/show_tabline_value.rs rename to overkill_nvim/src/option/show_tabline_value.rs diff --git a/overkill-nvim/src/option/sign_column_value.rs b/overkill_nvim/src/option/sign_column_value.rs similarity index 100% rename from overkill-nvim/src/option/sign_column_value.rs rename to overkill_nvim/src/option/sign_column_value.rs diff --git a/overkill-nvim/src/option/spell_lang_value.rs b/overkill_nvim/src/option/spell_lang_value.rs similarity index 100% rename from overkill-nvim/src/option/spell_lang_value.rs rename to overkill_nvim/src/option/spell_lang_value.rs