language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-09-27 12:29:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Ignore lifetime params in substitutions

Browse source
This commit is contained in:
Lukas Wirth 2020-12-13 11:34:44 +01:00
parent 10f6332831
commit ae8a802085
3 changed files with 17 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
crates/hir_def/src/item_tree.rs
View file

@ -246,7 +246,10 @@ struct GenericParamsStorage {
impl GenericParamsStorage { impl GenericParamsStorage {
fn alloc(&mut self, params: GenericParams) -> GenericParamsId { fn alloc(&mut self, params: GenericParams) -> GenericParamsId {
if params.types.is_empty() && params.where_predicates.is_empty() { if params.types.is_empty()
&& params.lifetimes.is_empty()
&& params.where_predicates.is_empty()
{
return GenericParamsId::EMPTY; return GenericParamsId::EMPTY;
} }

7
crates/hir_ty/src/infer/expr.rs
View file

@ -856,7 +856,12 @@ impl<'a> InferenceContext<'a> {
// handle provided type arguments // handle provided type arguments
if let Some(generic_args) = generic_args { if let Some(generic_args) = generic_args {
// if args are provided, it should be all of them, but we can't rely on that // if args are provided, it should be all of them, but we can't rely on that
for arg in generic_args.args.iter().take(type_params) { for arg in generic_args
.args
.iter()
.filter(|arg| matches!(arg, GenericArg::Type(_)))
.take(type_params)
{
match arg { match arg {
GenericArg::Type(type_ref) => { GenericArg::Type(type_ref) => {
let ty = self.make_ty(type_ref); let ty = self.make_ty(type_ref);

8
crates/hir_ty/src/lower.rs
View file

@ -565,7 +565,13 @@ fn substs_from_path_segment(
if generic_args.has_self_type { self_params + type_params } else { type_params }; if generic_args.has_self_type { self_params + type_params } else { type_params };
let skip = if generic_args.has_self_type && self_params == 0 { 1 } else { 0 }; let skip = if generic_args.has_self_type && self_params == 0 { 1 } else { 0 };
// if args are provided, it should be all of them, but we can't rely on that // if args are provided, it should be all of them, but we can't rely on that
for arg in generic_args.args.iter().skip(skip).take(expected_num) { for arg in generic_args
.args
.iter()
.filter(|arg| matches!(arg, GenericArg::Type(_)))
.skip(skip)
.take(expected_num)
{
match arg { match arg {
GenericArg::Type(type_ref) => { GenericArg::Type(type_ref) => {
had_explicit_type_args = true; had_explicit_type_args = true;