From 3c2d430ba064f2159b2897eab7f5b1a6d7c3d008 Mon Sep 17 00:00:00 2001
From: John Bernard <38332081+loqusion@users.noreply.github.com>
Date: Fri, 30 Jun 2023 03:28:58 -0500
Subject: [PATCH] fix(rust): move lspconfig opts to correct location

lspconfig's `opts` goes in rust-tools's `opts.server`; see
https://github.com/simrat39/rust-tools.nvim#configuration
---
 lua/lazyvim/plugins/extras/lang/rust.lua | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lua/lazyvim/plugins/extras/lang/rust.lua b/lua/lazyvim/plugins/extras/lang/rust.lua
index 24c4f02b..073db353 100644
--- a/lua/lazyvim/plugins/extras/lang/rust.lua
+++ b/lua/lazyvim/plugins/extras/lang/rust.lua
@@ -66,7 +66,7 @@ return {
           local codelldb_path = extension_path .. "adapter/codelldb"
           local liblldb_path = vim.fn.has("mac") == 1 and extension_path .. "lldb/lib/liblldb.dylib"
             or extension_path .. "lldb/lib/liblldb.so"
-          local rust_tools_opts = vim.tbl_deep_extend("force", opts, {
+          local rust_tools_opts = {
             dap = {
               adapter = require("rust-tools.dap").get_codelldb_adapter(codelldb_path, liblldb_path),
             },
@@ -81,7 +81,7 @@ return {
                 ]])
               end,
             },
-            server = {
+            server = vim.tbl_deep_extend("force", opts, {
               settings = {
                 ["rust-analyzer"] = {
                   cargo = {
@@ -105,8 +105,8 @@ return {
                   },
                 },
               },
-            },
-          })
+            }),
+          }
           require("rust-tools").setup(rust_tools_opts)
           return true
         end,