Merged
Conversation
rustbot
added
S-waiting-on-review
Collaborator
|
Some changes occurred in src/librustdoc/clean/types.rs cc @camelid Some changes occurred in src/tools/clippy cc @rust-lang/clippy |
spastorino
approved these changes
Oct 27, 2022
Contributor
|
@bors r+ |
Collaborator
|
📌 Commit 1f4555e98b19ca40a1ced4c6c81812844837e441 has been approved by It is now in the queue for this repository. |
bors
added
S-waiting-on-bors
Contributor
|
@bors rollup |
Contributor
Author
|
@bors rollup=always Even though it touches many files, the changes are trivial. |
Collaborator
|
☔ The latest upstream changes (presumably #103629) made this pull request unmergeable. Please resolve the merge conflicts. |
bors
added
S-waiting-on-author
nnethercote
force-pushed
the
rename-OwnerId-fields
branch
from
1f4555e to
d7edda7
Compare
Member
|
@bors r=compiler-errors |
Collaborator
bors
added
S-waiting-on-bors
matthiaskrgr
added a commit
to matthiaskrgr/rust
that referenced
this pull request
Oct 29, 2022
… r=compiler-errors Rename some `OwnerId` fields. `@spastorino` noticed some silly expressions like `item_id.def_id.def_id`. This commit renames several `def_id: OwnerId` fields as `owner_id`, so those expressions become `item_id.owner_id.def_id`. `item_id.owner_id.local_def_id` would be even clearer, but the use of `def_id` for values of type `LocalDefId` is *very* widespread, so I left that alone. r? `@compiler-errors`
Collaborator
|
☔ The latest upstream changes (presumably #102233) made this pull request unmergeable. Please resolve the merge conflicts. |
bors
added
S-waiting-on-author
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Oct 29, 2022
…iaskrgr Rollup of 7 pull requests Successful merges: - rust-lang#102961 (Make `CStr::from_ptr` `const`.) - rust-lang#103342 (Add test for issue 98634) - rust-lang#103383 (Note scope of TAIT more accurately) - rust-lang#103656 (Specialize ToString for Symbol) - rust-lang#103663 (rustdoc: remove redundant CSS/DOM `div.search-container`) - rust-lang#103664 (rustdoc-json-types: Improve ItemSummary::path docs) - rust-lang#103704 (Add a test for TAIT used with impl/dyn Trait inside RPIT) Failed merges: - rust-lang#103618 (Rename some `OwnerId` fields.) r? `@ghost` `@rustbot` modify labels: rollup
spastorino noticed some silly expressions like `item_id.def_id.def_id`. This commit renames several `def_id: OwnerId` fields as `owner_id`, so those expressions become `item_id.owner_id.def_id`. `item_id.owner_id.local_def_id` would be even clearer, but the use of `def_id` for values of type `LocalDefId` is *very* widespread, so I left that alone.
nnethercote
force-pushed
the
rename-OwnerId-fields
branch
from
d7edda7 to
c8c25ce
Compare
Contributor
Author
|
I rebased. @bors r=compiler-errors |
Collaborator
bors
added
S-waiting-on-bors
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Oct 29, 2022
…llaumeGomez Rollup of 8 pull requests Successful merges: - rust-lang#102634 (compiletest: Refactor test rustcflags) - rust-lang#102721 (Prevent foreign Rust exceptions from being caught) - rust-lang#103415 (filter candidates in pick probe for diagnostics) - rust-lang#103618 (Rename some `OwnerId` fields.) - rust-lang#103625 (Accept `TyCtxt` instead of `TyCtxtAt` in `Ty::is_*` functions) - rust-lang#103653 (Add missing impl blocks for item reexported from private mod in JSON output) - rust-lang#103699 (Emit proper error when casting to `dyn*`) - rust-lang#103719 (fix typo in `try_reserve` method from `HashMap` and `HashSet`) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
Aaron1011
pushed a commit
to Aaron1011/rust
that referenced
this pull request
Jan 6, 2023
…llaumeGomez Rollup of 8 pull requests Successful merges: - rust-lang#102634 (compiletest: Refactor test rustcflags) - rust-lang#102721 (Prevent foreign Rust exceptions from being caught) - rust-lang#103415 (filter candidates in pick probe for diagnostics) - rust-lang#103618 (Rename some `OwnerId` fields.) - rust-lang#103625 (Accept `TyCtxt` instead of `TyCtxtAt` in `Ty::is_*` functions) - rust-lang#103653 (Add missing impl blocks for item reexported from private mod in JSON output) - rust-lang#103699 (Emit proper error when casting to `dyn*`) - rust-lang#103719 (fix typo in `try_reserve` method from `HashMap` and `HashSet`) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
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
5 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.
@spastorino noticed some silly expressions like
item_id.def_id.def_id.This commit renames several
def_id: OwnerIdfields asowner_id, so those expressions becomeitem_id.owner_id.def_id.item_id.owner_id.local_def_idwould be even clearer, but the use ofdef_idfor values of typeLocalDefIdis very widespread, so I left that alone.r? @compiler-errors