From 001dd6a2000ce4adada0ab6e4ed8fd67cb8eb569 Mon Sep 17 00:00:00 2001 From: Florian Diebold Date: Fri, 14 Feb 2020 19:16:42 +0100 Subject: Make Self implement the trait inside trait default methods --- crates/ra_hir_def/src/resolver.rs | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'crates/ra_hir_def') diff --git a/crates/ra_hir_def/src/resolver.rs b/crates/ra_hir_def/src/resolver.rs index 05cf4646a..e2b228e80 100644 --- a/crates/ra_hir_def/src/resolver.rs +++ b/crates/ra_hir_def/src/resolver.rs @@ -542,11 +542,7 @@ impl Resolver { fn push_generic_params_scope(self, db: &impl DefDatabase, def: GenericDefId) -> Resolver { let params = db.generic_params(def); - if params.types.is_empty() { - self - } else { - self.push_scope(Scope::GenericParams { def, params }) - } + self.push_scope(Scope::GenericParams { def, params }) } fn push_impl_block_scope(self, impl_block: ImplId) -> Resolver { -- cgit v1.2.3 From 843f03a3d2d242b765dc2b972d7d29ea85ec881e Mon Sep 17 00:00:00 2001 From: Benjamin Brittain Date: Fri, 14 Feb 2020 16:15:27 -0500 Subject: Bump crate resolution limit for large projects Change-Id: Ie0221e5bcfd1779cd5e241f96b4489e5bd3854c1 --- crates/ra_hir_def/src/nameres/collector.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'crates/ra_hir_def') diff --git a/crates/ra_hir_def/src/nameres/collector.rs b/crates/ra_hir_def/src/nameres/collector.rs index 6352c71ef..b1f3f525d 100644 --- a/crates/ra_hir_def/src/nameres/collector.rs +++ b/crates/ra_hir_def/src/nameres/collector.rs @@ -146,7 +146,7 @@ where ReachedFixedPoint::Yes => break, ReachedFixedPoint::No => i += 1, } - if i == 1000 { + if i == 10000 { log::error!("name resolution is stuck"); break; } -- cgit v1.2.3