aboutsummaryrefslogtreecommitdiff
path: root/crates/ra_hir_def/src/data.rs
diff options
context:
space:
mode:
authorbors[bot] <26634292+bors[bot]@users.noreply.github.com>2020-04-09 17:54:14 +0100
committerGitHub <[email protected]>2020-04-09 17:54:14 +0100
commitdde9488559514e7d039cec9407e1f8627f665cd0 (patch)
tree5ddc0361d4d3538b60cb63a645042cfdcd51f4c6 /crates/ra_hir_def/src/data.rs
parent4cea01fdf8dc0a647007bde3010f9fbe607f1e75 (diff)
parent2bfb65db93e48d8f9e8ecac0b2ea837c081a4db5 (diff)
Merge #3919
3919: Refactor tokena accessors r=matklad a=matklad bors r+ 🤖 Co-authored-by: Aleksey Kladov <[email protected]>
Diffstat (limited to 'crates/ra_hir_def/src/data.rs')
-rw-r--r--crates/ra_hir_def/src/data.rs6
1 files changed, 3 insertions, 3 deletions
diff --git a/crates/ra_hir_def/src/data.rs b/crates/ra_hir_def/src/data.rs
index 606ec48b0..689bb6c5c 100644
--- a/crates/ra_hir_def/src/data.rs
+++ b/crates/ra_hir_def/src/data.rs
@@ -75,7 +75,7 @@ impl FunctionData {
75 TypeRef::unit() 75 TypeRef::unit()
76 }; 76 };
77 77
78 let ret_type = if src.value.is_async() { 78 let ret_type = if src.value.async_kw_token().is_some() {
79 let future_impl = desugar_future_path(ret_type); 79 let future_impl = desugar_future_path(ret_type);
80 let ty_bound = TypeBound::Path(future_impl); 80 let ty_bound = TypeBound::Path(future_impl);
81 TypeRef::ImplTrait(vec![ty_bound]) 81 TypeRef::ImplTrait(vec![ty_bound])
@@ -136,7 +136,7 @@ impl TraitData {
136 pub(crate) fn trait_data_query(db: &dyn DefDatabase, tr: TraitId) -> Arc<TraitData> { 136 pub(crate) fn trait_data_query(db: &dyn DefDatabase, tr: TraitId) -> Arc<TraitData> {
137 let src = tr.lookup(db).source(db); 137 let src = tr.lookup(db).source(db);
138 let name = src.value.name().map_or_else(Name::missing, |n| n.as_name()); 138 let name = src.value.name().map_or_else(Name::missing, |n| n.as_name());
139 let auto = src.value.is_auto(); 139 let auto = src.value.auto_kw_token().is_some();
140 let ast_id_map = db.ast_id_map(src.file_id); 140 let ast_id_map = db.ast_id_map(src.file_id);
141 141
142 let container = AssocContainerId::TraitId(tr); 142 let container = AssocContainerId::TraitId(tr);
@@ -213,7 +213,7 @@ impl ImplData {
213 213
214 let target_trait = src.value.target_trait().map(TypeRef::from_ast); 214 let target_trait = src.value.target_trait().map(TypeRef::from_ast);
215 let target_type = TypeRef::from_ast_opt(src.value.target_type()); 215 let target_type = TypeRef::from_ast_opt(src.value.target_type());
216 let is_negative = src.value.is_negative(); 216 let is_negative = src.value.excl_token().is_some();
217 let module_id = impl_loc.container.module(db); 217 let module_id = impl_loc.container.module(db);
218 218
219 let mut items = Vec::new(); 219 let mut items = Vec::new();