feat(nvim): switch rust-tools to rustaceanvim

completion.lua

@@ -22,8 +22,12 @@ autocmd CursorHold * lua vim.diagnostic.open_float(nil, { focusable = false })
 vim.opt.spell = true
 vim.opt.spelllang = {'en_us'}
 vim.lsp.handlers["textDocument/publishDiagnostics"] =
-    vim.lsp.with(vim.lsp.diagnostic.on_publish_diagnostics,
-                 {virtual_text = true})
+    vim.lsp.with(
+    vim.lsp.diagnostic.on_publish_diagnostics,
+    {
+        virtual_text = true,
+    }
+)
 -- Completion Plugin Setup
 local cmp = require 'cmp'
 cmp.setup({

default.nix

@@ -62,7 +62,7 @@ in
       (if config.programs.neovim.package.version == "0.10.0" then throw "lsp-inlayhints-nvim may be removed" else lsp-inlayhints-nvim) # https://github.com/mrcjkb/rustaceanvim/discussions/46#discussioncomment-7620822
       cmp-conventionalcommits
       cmp-calc
-      rust-tools-nvim
+      rustaceanvim
       plenary-nvim
       crates-nvim
       nvim-lspconfig

rust.lua

@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 local nvim_lsp = require 'lspconfig'
 local c = vim.lsp.protocol.make_client_capabilities()
 local deps = require("nvim-deps")
@@ -133,12 +132,15 @@ vim.g.rustaceanvim = {
 				   vim.cmd.RustLsp { 'hover', 'actions' }
 			   end, keymap_opts)
             vim.keymap.set('n', '<leader>cc', 
-                           function() vim.cmd.RustLsp('openCargo') end,
-                           keymap_opts)
-            vim.keymap.set('n', '<leader>cr', function()
+                           function() 
+				   vim.cmd.RustLsp('openCargo')
+			   end, keymap_opts)
+            vim.keymap.set('n', '<leader>cr', 
+                           function() 
 				   vim.cmd.RustLsp {'runnables', 'last' --[[ optional ]] }
 			   end, keymap_opts)
-            vim.keymap.set('n', '<leader>cd', function()
+            vim.keymap.set('n', '<leader>cd', 
+                           function() 
 				   vim.cmd.RustLsp {'debuggables', 'last' --[[ optional ]] }
 			   end, keymap_opts)
 --            vim.keymap.set("n", "g0", vim.lsp.buf.document_symbol, keymap_opts)
@@ -166,7 +168,6 @@ vim.g.rustaceanvim = {
         }
     }
 }
-=======
 local rt = require("rust-tools")
 local deps = require("nvim-deps")
 
@@ -347,4 +348,3 @@ rt.setup(
   },
 }
 )
->>>>>>> 5df3a02 (wip: feat(nvim/rust-tools): begin migration)