Remove unnecessary is_empty checks
#141377
Merged
+2
−7
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
It was added in rust-lang#140052, but the subsequent changes in rust-lang#140252 means it is no longer necessary. (Indeed, `Ident`s cannot be empty any more.)
`Ident`s can no longer be empty, so the test always succeeds.
rustbot
added
S-waiting-on-review
| Box::new([].iter()) | ||
| }; | ||
| iter.filter(move |item| { | ||
| tcx.associated_items(assoc_items_of).filter_by_name_unhygienic(ident.name).filter(move |item| { |
There was a problem hiding this comment.
Unless I missed something, https://github.com/rust-lang/rust/blame/master/compiler/rustc_middle/src/ty/assoc.rs#L255 is still failing if the provided Symbol is empty. How come it's not triggering the assert anymore?
There was a problem hiding this comment.
Should this assert be removed as well then?
There was a problem hiding this comment.
(Can be done in a follow-up though)
There was a problem hiding this comment.
The assertion in filter_by_name_unhygienic? The function takes a Symbol, which can be empty (unlike Ident) so I figure it was reasonable to leave it there.
There was a problem hiding this comment.
Oh I see. A bit confusing. 😄
GuillaumeGomez
approved these changes
May 22, 2025
|
Thanks for the detailed explanations and the update! @bors r+ rollup |
bors
added
S-waiting-on-bors
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
May 22, 2025
…iaskrgr Rollup of 8 pull requests Successful merges: - rust-lang#141355 (ci: improve citool job db errors) - rust-lang#141359 (Fix `FnOnce` impl for `AsyncFn`/`AsyncFnMut` self-borrowing closures in new solver) - rust-lang#141362 (Normalize aliases to correct kind of error term) - rust-lang#141377 (Remove unnecessary `is_empty` checks) - rust-lang#141381 (try_cast_aligned: avoid bare int-to-ptr casts) - rust-lang#141382 (ci: convert distcheck to free runner) - rust-lang#141389 (ci: prepare aws access keys for migration) - rust-lang#141390 (Don't allow `poly_select` in new solver) r? `@ghost` `@rustbot` modify labels: rollup
rust-timer
added a commit
to rust-lang-ci/rust
that referenced
this pull request
May 22, 2025
Rollup merge of rust-lang#141377 - nnethercote:rm-unnecessary-is_empty-checks, r=GuillaumeGomez Remove unnecessary `is_empty` checks Part of rust-lang#137978. r? `@GuillaumeGomez`
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Part of #137978.
r? @GuillaumeGomez