From 2e515d0ac9549fa9ff39f5ab86e7856914ddc23f Mon Sep 17 00:00:00 2001
From: Adenine <adenine.dev@gmail.com>
Date: Fri, 7 Jul 2023 23:23:19 -0400
Subject: [PATCH] fix weird rebase error

---
 crates/rust-analyzer/src/handlers/request.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crates/rust-analyzer/src/handlers/request.rs b/crates/rust-analyzer/src/handlers/request.rs
index 2b901a6019..b191d8d368 100644
--- a/crates/rust-analyzer/src/handlers/request.rs
+++ b/crates/rust-analyzer/src/handlers/request.rs
@@ -1692,7 +1692,7 @@ pub(crate) fn handle_move_item(
 pub(crate) fn handle_view_recursive_memory_layout(
     snap: GlobalStateSnapshot,
     params: lsp_ext::ViewRecursiveMemoryLayoutParams,
-) -> Result<Option<lsp_ext::RecursiveMemoryLayout>> {
+) -> anyhow::Result<Option<lsp_ext::RecursiveMemoryLayout>> {
     let _p = profile::span("view_recursive_memory_layout");
     let file_id = from_proto::file_id(&snap, &params.text_document.uri)?;
     let line_index = snap.file_line_index(file_id)?;