Merge pull request #7 from turboladen/feature/gh-6

Rename crates to use underscores
turboladen · Dec 9, 2021 · 2c11411 · 2c11411
2 parents 6df7f5d + ce18550
commit 2c11411
Show file tree

Hide file tree

Showing 47 changed files with 23 additions and 8 deletions.
diff --git 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
@@ -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 → neovim_sys/Cargo.toml b/neovim-sys/Cargo.toml → neovim_sys/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "neovim-sys"
+name = "neovim_sys"
 version = "0.1.0"
 authors = ["Steve Loveless <[email protected]>"]
 edition = "2021"

diff --git a/neovim-sys/build.rs → neovim_sys/build.rs b/neovim-sys/build.rs → neovim_sys/build.rs
diff --git a/neovim-sys/src/api.rs → neovim_sys/src/api.rs b/neovim-sys/src/api.rs → neovim_sys/src/api.rs
diff --git a/neovim-sys/src/api/buffer.rs → neovim_sys/src/api/buffer.rs b/neovim-sys/src/api/buffer.rs → neovim_sys/src/api/buffer.rs
diff --git a/neovim-sys/src/api/nvim.rs → neovim_sys/src/api/nvim.rs b/neovim-sys/src/api/nvim.rs → neovim_sys/src/api/nvim.rs
diff --git a/neovim-sys/src/api/nvim/array.rs → neovim_sys/src/api/nvim/array.rs b/neovim-sys/src/api/nvim/array.rs → neovim_sys/src/api/nvim/array.rs
diff --git a/neovim-sys/src/api/nvim/collection.rs → neovim_sys/src/api/nvim/collection.rs b/neovim-sys/src/api/nvim/collection.rs → neovim_sys/src/api/nvim/collection.rs
diff --git a/neovim-sys/src/api/nvim/dictionary.rs → neovim_sys/src/api/nvim/dictionary.rs b/neovim-sys/src/api/nvim/dictionary.rs → neovim_sys/src/api/nvim/dictionary.rs
diff --git a/neovim-sys/src/api/nvim/error.rs → neovim_sys/src/api/nvim/error.rs b/neovim-sys/src/api/nvim/error.rs → neovim_sys/src/api/nvim/error.rs
diff --git a/neovim-sys/src/api/nvim/object.rs → neovim_sys/src/api/nvim/object.rs b/neovim-sys/src/api/nvim/object.rs → neovim_sys/src/api/nvim/object.rs
diff --git a/neovim-sys/src/api/nvim/string.rs → neovim_sys/src/api/nvim/string.rs b/neovim-sys/src/api/nvim/string.rs → neovim_sys/src/api/nvim/string.rs
diff --git a/neovim-sys/src/api/private.rs → neovim_sys/src/api/private.rs b/neovim-sys/src/api/private.rs → neovim_sys/src/api/private.rs
diff --git a/neovim-sys/src/globals.rs → neovim_sys/src/globals.rs b/neovim-sys/src/globals.rs → neovim_sys/src/globals.rs
diff --git a/neovim-sys/src/lib.rs → neovim_sys/src/lib.rs b/neovim-sys/src/lib.rs → neovim_sys/src/lib.rs
diff --git a/neovim-sys/src/option.rs → neovim_sys/src/option.rs b/neovim-sys/src/option.rs → neovim_sys/src/option.rs
diff --git a/neovim-sys/src/types.rs → neovim_sys/src/types.rs b/neovim-sys/src/types.rs → neovim_sys/src/types.rs
diff --git a/nvim-api/Cargo.toml → nvim_api/Cargo.toml b/nvim-api/Cargo.toml → nvim_api/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "nvim-api"
+name = "nvim_api"
 version = "0.1.0"
 authors = ["Steve Loveless <[email protected]>"]
 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 → nvim_api/src/api.rs b/nvim-api/src/api.rs → nvim_api/src/api.rs
diff --git a/nvim-api/src/api/buffer.rs → nvim_api/src/api/buffer.rs b/nvim-api/src/api/buffer.rs → nvim_api/src/api/buffer.rs
diff --git a/nvim-api/src/api/error.rs → nvim_api/src/api/error.rs b/nvim-api/src/api/error.rs → nvim_api/src/api/error.rs
diff --git a/nvim-api/src/api/mode.rs → nvim_api/src/api/mode.rs b/nvim-api/src/api/mode.rs → nvim_api/src/api/mode.rs
diff --git a/nvim-api/src/api/nvim.rs → nvim_api/src/api/nvim.rs b/nvim-api/src/api/nvim.rs → nvim_api/src/api/nvim.rs
diff --git a/nvim-api/src/api/rust_object.rs → nvim_api/src/api/rust_object.rs b/nvim-api/src/api/rust_object.rs → nvim_api/src/api/rust_object.rs
diff --git a/nvim-api/src/lib.rs → nvim_api/src/lib.rs b/nvim-api/src/lib.rs → nvim_api/src/lib.rs
diff --git a/nvim-api/src/lua_test.rs → nvim_api/src/lua_test.rs b/nvim-api/src/lua_test.rs → nvim_api/src/lua_test.rs
diff --git a/nvim_test-proc_macro/Cargo.toml 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
@@ -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 → overkill_nvim/Cargo.toml b/overkill-nvim/Cargo.toml → overkill_nvim/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "overkill-nvim"
+name = "overkill_nvim"
 version = "0.1.0"
 authors = ["Steve Loveless <[email protected]>"]
 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 → overkill_nvim/src/key_code.rs b/overkill-nvim/src/key_code.rs → overkill_nvim/src/key_code.rs
diff --git a/overkill-nvim/src/lib.rs → overkill_nvim/src/lib.rs b/overkill-nvim/src/lib.rs → overkill_nvim/src/lib.rs
diff --git a/overkill-nvim/src/lua_test.rs → overkill_nvim/src/lua_test.rs b/overkill-nvim/src/lua_test.rs → overkill_nvim/src/lua_test.rs
diff --git a/overkill-nvim/src/option.rs → overkill_nvim/src/option.rs b/overkill-nvim/src/option.rs → overkill_nvim/src/option.rs
diff --git a/...ill-nvim/src/option/clipboard_settings.rs → ...ill_nvim/src/option/clipboard_settings.rs b/...ill-nvim/src/option/clipboard_settings.rs → ...ill_nvim/src/option/clipboard_settings.rs
diff --git a/...ill-nvim/src/option/color_column_value.rs → ...ill_nvim/src/option/color_column_value.rs b/...ill-nvim/src/option/color_column_value.rs → ...ill_nvim/src/option/color_column_value.rs
diff --git a/...-nvim/src/option/complete_opt_settings.rs → ..._nvim/src/option/complete_opt_settings.rs b/...-nvim/src/option/complete_opt_settings.rs → ..._nvim/src/option/complete_opt_settings.rs
diff --git a/...ll-nvim/src/option/conceal_level_value.rs → ...ll_nvim/src/option/conceal_level_value.rs b/...ll-nvim/src/option/conceal_level_value.rs → ...ll_nvim/src/option/conceal_level_value.rs
diff --git a/overkill-nvim/src/option/flags.rs → overkill_nvim/src/option/flags.rs b/overkill-nvim/src/option/flags.rs → overkill_nvim/src/option/flags.rs
diff --git a/overkill-nvim/src/option/flags/char_flags.rs → overkill_nvim/src/option/flags/char_flags.rs b/overkill-nvim/src/option/flags/char_flags.rs → overkill_nvim/src/option/flags/char_flags.rs
diff --git a/...ill-nvim/src/option/flags/string_flags.rs → ...ill_nvim/src/option/flags/string_flags.rs b/...ill-nvim/src/option/flags/string_flags.rs → ...ill_nvim/src/option/flags/string_flags.rs
diff --git a/...kill-nvim/src/option/inc_command_value.rs → ...kill_nvim/src/option/inc_command_value.rs b/...kill-nvim/src/option/inc_command_value.rs → ...kill_nvim/src/option/inc_command_value.rs
diff --git a/...ill-nvim/src/option/list_char_settings.rs → ...ill_nvim/src/option/list_char_settings.rs b/...ill-nvim/src/option/list_char_settings.rs → ...ill_nvim/src/option/list_char_settings.rs
diff --git a/overkill-nvim/src/option/short_mess_item.rs → overkill_nvim/src/option/short_mess_item.rs b/overkill-nvim/src/option/short_mess_item.rs → overkill_nvim/src/option/short_mess_item.rs
diff --git a/...ill-nvim/src/option/show_tabline_value.rs → ...ill_nvim/src/option/show_tabline_value.rs b/...ill-nvim/src/option/show_tabline_value.rs → ...ill_nvim/src/option/show_tabline_value.rs
diff --git a/...kill-nvim/src/option/sign_column_value.rs → ...kill_nvim/src/option/sign_column_value.rs b/...kill-nvim/src/option/sign_column_value.rs → ...kill_nvim/src/option/sign_column_value.rs
diff --git a/overkill-nvim/src/option/spell_lang_value.rs → overkill_nvim/src/option/spell_lang_value.rs b/overkill-nvim/src/option/spell_lang_value.rs → overkill_nvim/src/option/spell_lang_value.rs