From a128075af9dd7286d444312ca3bbb9645c008f50 Mon Sep 17 00:00:00 2001
From: Aleksey Kladov <aleksey.kladov@gmail.com>
Date: Sat, 26 Jan 2019 23:25:18 +0300
Subject: remove Option<SourceFileItemId> hack

---
 crates/ra_hir/src/query_definitions.rs | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

(limited to 'crates/ra_hir/src/query_definitions.rs')

diff --git a/crates/ra_hir/src/query_definitions.rs b/crates/ra_hir/src/query_definitions.rs
index 380c06404..bf9ac0dfb 100644
--- a/crates/ra_hir/src/query_definitions.rs
+++ b/crates/ra_hir/src/query_definitions.rs
@@ -4,9 +4,7 @@ use std::{
 };
 
 use rustc_hash::FxHashMap;
-use ra_syntax::{
-    AstNode, SyntaxNode, TreeArc,
-};
+use ra_syntax::{SyntaxNode, TreeArc};
 use ra_db::{CrateId};
 
 use crate::{
@@ -33,12 +31,9 @@ pub(super) fn file_item(
     source_item_id: SourceItemId,
 ) -> TreeArc<SyntaxNode> {
     let source_file = db.hir_parse(source_item_id.file_id);
-    match source_item_id.item_id {
-        Some(id) => db.file_items(source_item_id.file_id)[id]
-            .to_node(&source_file)
-            .to_owned(),
-        None => source_file.syntax().to_owned(),
-    }
+    db.file_items(source_item_id.file_id)[source_item_id.item_id]
+        .to_node(&source_file)
+        .to_owned()
 }
 
 pub(super) fn item_map(db: &impl HirDatabase, crate_id: CrateId) -> Arc<ItemMap> {
-- 
cgit v1.2.3