mirror of
https://github.com/rust-lang/rust-analyzer.git
synced 2025-12-23 08:48:08 +00:00
Fix skipiter not applicable in autoderef
Example
---
**std example**:
```rust
fn foo(nums: std::rc::Rc<[i32]>) {
nums.$0
}
```
---
**minicore example**:
```rust
struct Foo;
impl Foo { fn iter(&self) -> Iter { Iter } }
impl IntoIterator for &Foo {
type Item = ();
type IntoIter = Iter;
fn into_iter(self) -> Self::IntoIter { Iter }
}
struct Ref;
impl core::ops::Deref for Ref {
type Target = Foo;
fn deref(&self) -> &Self::Target { &Foo }
}
struct Iter;
impl Iterator for Iter {
type Item = ();
fn next(&mut self) -> Option<Self::Item> { None }
}
fn foo() {
Ref.$0
}
```
**Before this PR**
```text
me deref() (use core::ops::Deref) fn(&self) -> &<Self as Deref>::Target
me into_iter() (as IntoIterator) fn(self) -> <Self as IntoIterator>::IntoIter
me iter() fn(&self) -> Iter
```
**After this PR**
```text
me deref() (use core::ops::Deref) fn(&self) -> &<Self as Deref>::Target
me into_iter() (as IntoIterator) fn(self) -> <Self as IntoIterator>::IntoIter
me iter() fn(&self) -> Iter
me iter().by_ref() (as Iterator) fn(&mut self) -> &mut Self
me iter().into_iter() (as IntoIterator) fn(self) -> <Self as IntoIterator>::IntoIter
me iter().next() (as Iterator) fn(&mut self) -> Option<<Self as Iterator>::Item>
me iter().nth(…) (as Iterator) fn(&mut self, usize) -> Option<<Self as Iterator>::Item>
```
This commit is contained in:
parent
509b181c31
commit
28751286a8
1 changed files with 37 additions and 3 deletions
|
|
@ -91,9 +91,9 @@ pub(crate) fn complete_dot(
|
|||
// its return type, so we instead check for `<&Self as IntoIterator>::IntoIter`.
|
||||
// Does <&receiver_ty as IntoIterator>::IntoIter` exist? Assume `iter` is valid
|
||||
let iter = receiver_ty
|
||||
.strip_references()
|
||||
.add_reference(hir::Mutability::Shared)
|
||||
.into_iterator_iter(ctx.db)
|
||||
.autoderef(ctx.db)
|
||||
.map(|ty| ty.strip_references().add_reference(hir::Mutability::Shared))
|
||||
.find_map(|ty| ty.into_iterator_iter(ctx.db))
|
||||
.map(|ty| (ty, SmolStr::new_static("iter()")));
|
||||
// Does <receiver_ty as IntoIterator>::IntoIter` exist?
|
||||
let into_iter = || {
|
||||
|
|
@ -1466,6 +1466,40 @@ fn foo() {
|
|||
me into_iter().nth(…) (as Iterator) fn(&mut self, usize) -> Option<<Self as Iterator>::Item>
|
||||
"#]],
|
||||
);
|
||||
check_no_kw(
|
||||
r#"
|
||||
//- minicore: iterator, deref
|
||||
struct Foo;
|
||||
impl Foo { fn iter(&self) -> Iter { Iter } }
|
||||
impl IntoIterator for &Foo {
|
||||
type Item = ();
|
||||
type IntoIter = Iter;
|
||||
fn into_iter(self) -> Self::IntoIter { Iter }
|
||||
}
|
||||
struct Ref;
|
||||
impl core::ops::Deref for Ref {
|
||||
type Target = Foo;
|
||||
fn deref(&self) -> &Self::Target { &Foo }
|
||||
}
|
||||
struct Iter;
|
||||
impl Iterator for Iter {
|
||||
type Item = ();
|
||||
fn next(&mut self) -> Option<Self::Item> { None }
|
||||
}
|
||||
fn foo() {
|
||||
Ref.$0
|
||||
}
|
||||
"#,
|
||||
expect![[r#"
|
||||
me deref() (use core::ops::Deref) fn(&self) -> &<Self as Deref>::Target
|
||||
me into_iter() (as IntoIterator) fn(self) -> <Self as IntoIterator>::IntoIter
|
||||
me iter() fn(&self) -> Iter
|
||||
me iter().by_ref() (as Iterator) fn(&mut self) -> &mut Self
|
||||
me iter().into_iter() (as IntoIterator) fn(self) -> <Self as IntoIterator>::IntoIter
|
||||
me iter().next() (as Iterator) fn(&mut self) -> Option<<Self as Iterator>::Item>
|
||||
me iter().nth(…) (as Iterator) fn(&mut self, usize) -> Option<<Self as Iterator>::Item>
|
||||
"#]],
|
||||
);
|
||||
}
|
||||
|
||||
#[test]
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue