From 52054e1140cc2af19825ebef2aea06c48cf79955 Mon Sep 17 00:00:00 2001 From: Ville Penttinen Date: Tue, 26 Feb 2019 11:47:13 +0200 Subject: Use TypeAscriptionOwner This replaces places where we would use node + node.type_ref() with things that have an ascribed type, with using the TypeAscriptionOwner as the trait bound so we can simply pass the node. --- crates/ra_hir/src/code_model_impl/konst.rs | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) (limited to 'crates/ra_hir/src/code_model_impl') diff --git a/crates/ra_hir/src/code_model_impl/konst.rs b/crates/ra_hir/src/code_model_impl/konst.rs index ecf4c8122..8b861a81f 100644 --- a/crates/ra_hir/src/code_model_impl/konst.rs +++ b/crates/ra_hir/src/code_model_impl/konst.rs @@ -1,6 +1,6 @@ use std::sync::Arc; -use ra_syntax::ast::{self, NameOwner}; +use ra_syntax::ast::{NameOwner, TypeAscriptionOwner}; use crate::{ Name, AsName, Const, ConstSignature, Static, @@ -8,12 +8,9 @@ use crate::{ PersistentHirDatabase, }; -fn const_signature_for( - node: &N, - type_ref: Option<&ast::TypeRef>, -) -> Arc { +fn const_signature_for(node: &N) -> Arc { let name = node.name().map(|n| n.as_name()).unwrap_or_else(Name::missing); - let type_ref = TypeRef::from_ast_opt(type_ref); + let type_ref = TypeRef::from_ast_opt(node.ascribed_type()); let sig = ConstSignature { name, type_ref }; Arc::new(sig) } @@ -24,7 +21,7 @@ impl ConstSignature { konst: Const, ) -> Arc { let (_, node) = konst.source(db); - const_signature_for(&*node, node.type_ref()) + const_signature_for(&*node) } pub(crate) fn static_signature_query( @@ -32,6 +29,6 @@ impl ConstSignature { konst: Static, ) -> Arc { let (_, node) = konst.source(db); - const_signature_for(&*node, node.type_ref()) + const_signature_for(&*node) } } -- cgit v1.2.3