Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Correct typo in the Iterator adapters section #17511

Merged
merged 2 commits into from
Sep 27, 2014

Conversation

MatejLach
Copy link
Contributor

The sentence "The new iterator filter() produces returns only the elements that that closure returned true for:" can be structured as:

"The new iterator filter() produces only the elements that that closure returned true for:"

or as:

"The new iterator filter() returns only the elements that that closure returned true for:"

however, not both.

I went with "produces", since it then talks about returning true and having "return" so close together doesn't sound nice.
r @steveklabnik ?

@rust-highfive
Copy link
Collaborator

Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @alexcrichton (or someone else) soon.

@Gankra
Copy link
Contributor

Gankra commented Sep 25, 2014

Isn't this mixing tenses? Should it not be

The new iterator filter() produces only the elements that that closure returns true for

@alexcrichton
Copy link
Member

Hm yes good point, now that I re-read it that makes more sense @gankro! Removing r+ for now, @MatejLach could you update as well?

@MatejLach
Copy link
Contributor Author

@gankro Good catch 👍
@alexcrichton Fixed.

bors added a commit that referenced this pull request Sep 27, 2014
The sentence "The new iterator `filter()` produces returns only the elements that that closure returned `true` for:"  can be structured as:

"The new iterator `filter()` produces only the elements that that closure returned `true` for:"

or as:

"The new iterator `filter()` returns only the elements that that closure returned `true` for:"

however, not both. 

I went with "produces", since it then talks about returning true and having "return" so close together doesn't sound nice. 
r @steveklabnik ?
@bors bors closed this Sep 27, 2014
@bors bors merged commit 9ca399f into rust-lang:master Sep 27, 2014
lnicola pushed a commit to lnicola/rust that referenced this pull request Jul 28, 2024
…=flodiebold

rust-lang#17497 - Invalid RA diagnostic error: expected 2 arguments, found 1

Fix for rust-lang#17497

The issue occurs because in some configurations of traits where one of them has `Deref` as a supertrait, RA's type inference algorithm fails to resolve the `Deref::Target` type, and instead uses a `TyKind::BoundVar` (i.e. an unknown type). This "autoderefed" type then incorrectly acts as if it implements all traits in scope.

The fix is to re-apply the same sanity-check that is done in [`iterate_method_candidates_with_autoref()`](https://github.com/rust-lang/rust-analyzer/blob/9463d9eea4b87e651e7d8ed8425a9c92f23b1cdf/crates/hir-ty/src/method_resolution.rs#L1008), that is: don't try to resolve methods on unknown types. This same sanity-check is now done on each autoderefed type for which trait methods are about to be checked. If the autoderefed type is unknown, then the iterating of the trait methods for that type is skipped.

Includes a unit test that only passes after applying the fixes in this commit.

Includes a change to the assertion count in test `syntax_highlighting::tests::benchmark_syntax_highlighting_parser` as suggested by Lukas Wirth during review.

Includes a change to the sanity-check code as suggested by Florian Diebold during review.
RalfJung pushed a commit to RalfJung/rust that referenced this pull request Aug 1, 2024
…=flodiebold

rust-lang#17497 - Invalid RA diagnostic error: expected 2 arguments, found 1

Fix for rust-lang#17497

The issue occurs because in some configurations of traits where one of them has `Deref` as a supertrait, RA's type inference algorithm fails to resolve the `Deref::Target` type, and instead uses a `TyKind::BoundVar` (i.e. an unknown type). This "autoderefed" type then incorrectly acts as if it implements all traits in scope.

The fix is to re-apply the same sanity-check that is done in [`iterate_method_candidates_with_autoref()`](https://github.com/rust-lang/rust-analyzer/blob/9463d9eea4b87e651e7d8ed8425a9c92f23b1cdf/crates/hir-ty/src/method_resolution.rs#L1008), that is: don't try to resolve methods on unknown types. This same sanity-check is now done on each autoderefed type for which trait methods are about to be checked. If the autoderefed type is unknown, then the iterating of the trait methods for that type is skipped.

Includes a unit test that only passes after applying the fixes in this commit.

Includes a change to the assertion count in test `syntax_highlighting::tests::benchmark_syntax_highlighting_parser` as suggested by Lukas Wirth during review.

Includes a change to the sanity-check code as suggested by Florian Diebold during review.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants