From 4ac338b608bb40c5126d019db63232e7834914c2 Mon Sep 17 00:00:00 2001
From: Pascal Hertleif <pascal@technocreatives.com>
Date: Sun, 26 May 2019 15:39:57 +0200
Subject: rename stray id field

---
 crates/ra_lsp_server/src/main_loop/handlers.rs | 2 +-
 crates/ra_lsp_server/src/req.rs                | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'crates')

diff --git a/crates/ra_lsp_server/src/main_loop/handlers.rs b/crates/ra_lsp_server/src/main_loop/handlers.rs
index 1df8224ba..e36db12b3 100644
--- a/crates/ra_lsp_server/src/main_loop/handlers.rs
+++ b/crates/ra_lsp_server/src/main_loop/handlers.rs
@@ -875,7 +875,7 @@ fn highlight(world: &ServerWorld, file_id: FileId) -> Result<Vec<Decoration>> {
         .map(|h| Decoration {
             range: h.range.conv_with(&line_index),
             tag: h.tag,
-            id: h.binding_hash.map(|x| x.to_string()),
+            binding_hash: h.binding_hash.map(|x| x.to_string()),
         })
         .collect();
     Ok(res)
diff --git a/crates/ra_lsp_server/src/req.rs b/crates/ra_lsp_server/src/req.rs
index cea0e6ce7..992c24eac 100644
--- a/crates/ra_lsp_server/src/req.rs
+++ b/crates/ra_lsp_server/src/req.rs
@@ -129,7 +129,7 @@ pub struct PublishDecorationsParams {
 pub struct Decoration {
     pub range: Range,
     pub tag: &'static str,
-    pub id: Option<String>,
+    pub binding_hash: Option<String>,
 }
 
 pub enum ParentModule {}
-- 
cgit v1.2.3