rustdoc: Remove AttributesExt trait magic that added needless complexity#135428
Merged
bors merged 3 commits intorust-lang:masterfrom Jan 15, 2025
Merged
rustdoc: Remove AttributesExt trait magic that added needless complexity#135428bors merged 3 commits intorust-lang:masterfrom
AttributesExt trait magic that added needless complexity#135428bors merged 3 commits intorust-lang:masterfrom
Conversation
It's never overridden, so it shouldn't be on the trait.
The two implementations were identical, so there's no need to use a trait method.
Collaborator
|
rustbot has assigned @GuillaumeGomez. Use |
The new code is more explicit and avoids trait magic that added needless complexity to this part of rustdoc.
| .flat_map(|attr| attr.meta_item_list().unwrap_or_default()) | ||
| let mut cfg = if doc_cfg_active || doc_auto_cfg_active { | ||
| let mut doc_cfg = attrs | ||
| .clone() |
Member
There was a problem hiding this comment.
Before it didn't need to clone, is there a reason it needs to now?
Member
Author
There was a problem hiding this comment.
It's not really cloning the attributes. Before attrs was the attributes themselves, and we used the extension trait to make an iterator from them. Now, the iterator is created by the caller of this function and attrs is the iterator. So this is just cloning the iterator, which is a very cheap operation and equivalent to creating a new one using .iter() like before.
Member
There was a problem hiding this comment.
Ah I see, thanks for the explanation!
GuillaumeGomez
approved these changes
Jan 15, 2025
Member
|
Thanks! @bors r+ rollup |
Collaborator
GuillaumeGomez
added a commit
to GuillaumeGomez/rust
that referenced
this pull request
Jan 15, 2025
…omez rustdoc: Remove `AttributesExt` trait magic that added needless complexity The new code is more explicit and avoids trait magic that added needless complexity to this part of rustdoc.
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Jan 15, 2025
…llaumeGomez Rollup of 6 pull requests Successful merges: - rust-lang#131806 (Treat other items as functions for the purpose of type-based search) - rust-lang#132654 (std: lazily allocate the main thread handle) - rust-lang#135003 (deprecate `std::intrinsics::transmute` etc, use `std::mem::*` instead) - rust-lang#135428 (rustdoc: Remove `AttributesExt` trait magic that added needless complexity) - rust-lang#135498 (Prefer lower `TraitUpcasting` candidates in selection) - rust-lang#135529 (remove outdated FIXME) r? `@ghost` `@rustbot` modify labels: rollup
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Jan 15, 2025
…llaumeGomez Rollup of 6 pull requests Successful merges: - rust-lang#132654 (std: lazily allocate the main thread handle) - rust-lang#135003 (deprecate `std::intrinsics::transmute` etc, use `std::mem::*` instead) - rust-lang#135428 (rustdoc: Remove `AttributesExt` trait magic that added needless complexity) - rust-lang#135498 (Prefer lower `TraitUpcasting` candidates in selection) - rust-lang#135507 (TRPL: incorporate all backward-compatible Edition changes) - rust-lang#135529 (remove outdated FIXME) r? `@ghost` `@rustbot` modify labels: rollup
rust-timer
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Jan 15, 2025
Rollup merge of rust-lang#135428 - camelid:attr-cleanup, r=GuillaumeGomez rustdoc: Remove `AttributesExt` trait magic that added needless complexity The new code is more explicit and avoids trait magic that added needless complexity to this part of rustdoc.
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
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.
The new code is more explicit and avoids trait magic that added needless
complexity to this part of rustdoc.