Skip to content

rustdoc: Clean up NestedAttributesExt trait/implementation#92188

Merged
bors merged 1 commit intorust-lang:masterfrom
vacuus:nested-attributes-ext
Jan 5, 2022
Merged

rustdoc: Clean up NestedAttributesExt trait/implementation#92188
bors merged 1 commit intorust-lang:masterfrom
vacuus:nested-attributes-ext

Conversation

@vacuus
Copy link
Contributor

@vacuus vacuus commented Dec 22, 2021

No description provided.

@rust-highfive
Copy link
Contributor

rust-highfive commented Dec 22, 2021

Some changes occurred in clean/types.rs.

cc @camelid

@rustbot rustbot added the T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. label Dec 22, 2021
@rust-highfive
Copy link
Contributor

rust-highfive commented Dec 22, 2021

r? @ollie27

(rust-highfive has picked a reviewer for you, use r? to override)

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Dec 22, 2021
@vacuus vacuus changed the title Clean up NestedAttributesExt trait/implementation rustdoc: Clean up NestedAttributesExt trait/implementation Dec 22, 2021
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@jyn514
Copy link
Member

jyn514 commented Dec 22, 2021

r=me with the compile failure fixed

@jyn514 jyn514 assigned jyn514 and unassigned ollie27 Dec 22, 2021
@jyn514 jyn514 added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. C-cleanup Category: PRs that clean code up or issues documenting cleanup. A-allocators Area: Custom and system allocators and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. A-allocators Area: Custom and system allocators labels Dec 22, 2021
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@camelid
Copy link
Member

camelid commented Dec 23, 2021

rust-lang/rust follows a "No-Merge Policy". Could you please rebase over upstream changes instead of merging? Thanks!

@vacuus
Copy link
Contributor Author

vacuus commented Dec 23, 2021 •
edited
Loading

I'm still severely confused by how to do rebasing and all and it always seems like I followed the steps but clearly I didn't, since I only got it to work just now.
(more for my own reference, since I'll undoubtedly run into this problem later on)
the steps I did when I was successful (some may be extraneous):

  1. git pull upstream master
  2. git fetch upstream
  3. git rebase upstream/master
  4. git rebase -i $(git merge-base upstream/master HEAD)
  5. git push --force-with-lease origin

Questions I have: should PRs rebase over upstream changes whenever upstream changes occur or only when there's a merge conflict? If there is no merge conflict, does it matter if the PR doesn't rebase over upstream changes?

@camelid
Copy link
Member

camelid commented Dec 24, 2021 •
edited
Loading

Questions I have: should PRs rebase over upstream changes whenever upstream changes occur or only when there's a merge conflict? If there is no merge conflict, does it matter if the PR doesn't rebase over upstream changes?

You only need to rebase when there are conflicts. Sometimes it's useful to rebase even when there aren't conflicts if the PR has been sitting for a while and may run into conflicts into the future (to reduce the future rebase burden).

@camelid
Copy link
Member

camelid commented Dec 24, 2021

@rustbot ready

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Dec 24, 2021
@jyn514
Copy link
Member

jyn514 commented Jan 4, 2022

@bors r+ rollup

@bors
Copy link
Collaborator

bors commented Jan 4, 2022

📌 Commit 91fe2d0 has been approved by jyn514

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jan 4, 2022
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Jan 4, 2022
@matthiaskrgr
Rollup merge of rust-lang#92188 - vacuus:nested-attributes-ext, r=jyn514
8bbc99e 
rustdoc: Clean up NestedAttributesExt trait/implementation
@matthiaskrgr matthiaskrgr mentioned this pull request Jan 4, 2022
Closed
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Jan 5, 2022
@matthiaskrgr
Rollup merge of rust-lang#92188 - vacuus:nested-attributes-ext, r=jyn514
edf5d1a 
rustdoc: Clean up NestedAttributesExt trait/implementation
@matthiaskrgr matthiaskrgr mentioned this pull request Jan 5, 2022
Closed
@Kobzol
Copy link
Member

Kobzol commented Jan 5, 2022

Just FYI, I'm not sure whether the into_iter calls weren't causing some of the slowdowns when using has_word. We should re-perf test #92353 on top of this to see if it hasn't regressed.

@matthiaskrgr matthiaskrgr mentioned this pull request Jan 5, 2022
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Jan 5, 2022
@bors
Auto merge of rust-lang#92580 - matthiaskrgr:rollup-nzyn65y, r=matthi…
181e915 
…askrgr

Rollup of 7 pull requests

Successful merges:

 - rust-lang#92182 (Label more build steps)
 - rust-lang#92188 (rustdoc: Clean up NestedAttributesExt trait/implementation)
 - rust-lang#92322 (Add another implementation example to Debug trait)
 - rust-lang#92448 (Set font size proportional to user's font size)
 - rust-lang#92517 (Explicitly pass `PATH` to the Windows exe resolver)
 - rust-lang#92545 (Extract init_env_logger to crate)
 - rust-lang#92579 (update Miri)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit cc01433 into rust-lang:master Jan 5, 2022
@rustbot rustbot added this to the 1.59.0 milestone Jan 5, 2022
@vacuus vacuus deleted the nested-attributes-ext branch April 8, 2022 21:00
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

@jyn514 jyn514

Labels

C-cleanup Category: PRs that clean code up or issues documenting cleanup. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue.

Projects

None yet

Milestone

1.59.0

Development

Successfully merging this pull request may close these issues.

9 participants

@vacuus @rust-highfive @rust-log-analyzer @jyn514 @camelid @bors @Kobzol @ollie27 @rustbot