From 000fd75af4a2af1d1d5cf71ef9a7d0293fc799ac Mon Sep 17 00:00:00 2001
From: Felipe Lema <1232306+FelipeLema@users.noreply.github.com>
Date: Fri, 18 Jun 2021 17:02:09 -0400
Subject: [PATCH] remove another unnecessary abstraction per gh review

---
 src/messages/textDocument_semanticToken.cc | 2 +-
 src/query.hh                               | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/messages/textDocument_semanticToken.cc b/src/messages/textDocument_semanticToken.cc
index 009c88f1..702d1be1 100644
--- a/src/messages/textDocument_semanticToken.cc
+++ b/src/messages/textDocument_semanticToken.cc
@@ -125,7 +125,7 @@ void MessageHandler::textDocument_semanticTokensRange(
     SymbolKind parent_kind = SymbolKind::Unknown;
     SymbolKind kind = SymbolKind::Unknown;
     uint8_t storage = SC_None;
-    DB::UsrIndex idx;
+    decltype(db->func_usr)::key_type idx;
     // This switch statement also filters out symbols that are not highlighted.
     switch (sym.kind) {
     case Kind::Func: {
diff --git a/src/query.hh b/src/query.hh
index f232ebd7..ac88dc78 100644
--- a/src/query.hh
+++ b/src/query.hh
@@ -162,10 +162,8 @@ using Lid2file_id = std::unordered_map<int, int>;
 struct DB {
   std::vector<QueryFile> files;
   llvm::StringMap<int> name2file_id;
-  //! Underlying type used for indexes-of-Usr
-  using UsrIndex=int;
   //! Usr → index
-  llvm::DenseMap<Usr, UsrIndex, DenseMapInfoForUsr> func_usr, type_usr, var_usr;
+  llvm::DenseMap<Usr, int, DenseMapInfoForUsr> func_usr, type_usr, var_usr;
   llvm::SmallVector<QueryFunc, 0> funcs;
   llvm::SmallVector<QueryType, 0> types;
   llvm::SmallVector<QueryVar, 0> vars;