Balance sidebar Deref cycle check with main content#81491
Merged
bors merged 1 commit intorust-lang:masterfrom Jan 31, 2021
Merged
Balance sidebar Deref cycle check with main content#81491bors merged 1 commit intorust-lang:masterfrom
Deref cycle check with main content#81491bors merged 1 commit intorust-lang:masterfrom
Conversation
ba6ca17 to
ed20f0e
Compare
GuillaumeGomez
approved these changes
Jan 28, 2021
Member
|
Looks all good, thanks a lot! r=me once CI pass |
Collaborator
|
The job Click to see the possible cause of the failure (guessed by this bot) |
ed20f0e to
a6fa92c
Compare
Member
|
Here we go! @bors: r+ |
Collaborator
|
📌 Commit a6fa92c has been approved by |
This was referenced Jan 29, 2021
Member
Collaborator
|
☔ The latest upstream changes (presumably #81398) made this pull request unmergeable. Please resolve the merge conflicts. |
a6fa92c to
9b3994e
Compare
Contributor
Author
|
@GuillaumeGomez, can you re-review the rebase? @rustbot label -S-waiting-on-author +S-waiting-on-review |
The `Deref` cycle checks added as part of rust-lang#80653 were "unbalanced" in the sense that the main content code path checks for cycles _before_ descending, while the sidebar checks _after_. Checking _before_ is correct, so this changes the sidebar path to match the main content path.
9b3994e to
7e32178
Compare
GuillaumeGomez
approved these changes
Jan 30, 2021
Member
|
Still looks good, thanks again! @bors: r+ |
Collaborator
|
📌 Commit 7e32178 has been approved by |
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Jan 31, 2021
…as-schievink Rollup of 18 pull requests Successful merges: - rust-lang#78044 (Implement io::Seek for io::Empty) - rust-lang#79285 (Stabilize Arc::{increment,decrement}_strong_count) - rust-lang#80053 (stabilise `cargo test -- --include-ignored`) - rust-lang#80279 (Implement missing `AsMut<str>` for `str`) - rust-lang#80470 (Stabilize by-value `[T; N]` iterator `core::array::IntoIter`) - rust-lang#80945 (Add Box::downcast() for dyn Any + Send + Sync) - rust-lang#81048 (Stabilize `core::slice::fill_with`) - rust-lang#81198 (Remove requirement that forces symmetric and transitive PartialEq impls to exist) - rust-lang#81422 (Account for existing `_` field pattern when suggesting `..`) - rust-lang#81472 (Clone entire `TokenCursor` when collecting tokens) - rust-lang#81484 (Optimize decimal formatting of 128-bit integers) - rust-lang#81491 (Balance sidebar `Deref` cycle check with main content) - rust-lang#81509 (Add a regression test for ICE of bad_placeholder_type) - rust-lang#81547 (Edit rustc_typeck top-level docs) - rust-lang#81550 (Replace predecessor with range in collections documentation) - rust-lang#81558 (Fix ascii art text wrapping in mobile) - rust-lang#81562 (Clarify that InPlaceIterable guarantees extend to all advancing iterator methods.) - rust-lang#81563 (Improve docblock readability on small screen) 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
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
Derefcycle checks added as part of #80653 were "unbalanced" in the sensethat the main content code path checks for cycles before descending, while the
sidebar checks after. Checking before is correct, so this changes the
sidebar path to match the main content path.
Fixes #81395
r? @GuillaumeGomez