-
Notifications
You must be signed in to change notification settings - Fork 13.2k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Rollup of 13 pull requests #88461
Merged
Merged
Rollup of 13 pull requests #88461
Conversation
This file contains 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
This commit refactors the implementation of `markdown_summary_with_limit()`, separating the logic of determining when the limit has been reached from the actual rendering process. The main advantage of the new approach is that it guarantees that all HTML tags are closed, whereas the previous implementation could generate tags that were never closed. It also ensures that no empty tags are generated (e.g., `<em></em>`). The new implementation consists of a general-purpose struct `HtmlWithLimit` that manages the length-limiting logic and a function `markdown_summary_with_limit()` that renders Markdown to HTML using the struct.
The length limit turns out to be a surprisingly good heuristic for initial allocation size. See here for more details [1]. [1]: rust-lang#88173 (comment)
This can happen when a tag is opened after the length limit is reached; the tag will not end up being added to `unclosed_tags` because the queue will never be flushed. So, now, if the `unclosed_tags` stack is empty, `close_tag()` does nothing. This change fixes a panic in the `limit_0` unit test.
https://rustsec.org/advisories/RUSTSEC-2021-0093 https://github.com/crossbeam-rs/crossbeam/pull/728/files openssl-src v111.15.0+1.1.1k -> v111.16.0+1.1.1l: https://rustsec.org/advisories/RUSTSEC-2021-0097 https://rustsec.org/advisories/RUSTSEC-2021-0098 https://www.openssl.org/news/vulnerabilities-1.1.1.html tar v0.4.35 -> v0.4.37: https://rustsec.org/advisories/RUSTSEC-2021-0080 updated to 0.4.37 as there breaking change in 0.4.36: alexcrichton/tar-rs#260
stack_t.ss_sp is now c_void on DragonFlyBSD, so the specialization is no longer needed. Changed in rust-lang/libc@02922ef.
We can instead if either the LHS or RHS types contain `TyKind::Error`. In addition to covering the case where we would have previously updated `if_let_suggestions`, this might also prevent redundant errors in other cases as well.
When calling a method requiring a mutable self borrow on an inmutable to a mutable borrow of the type, suggest making the binding mutable. Fix rust-lang#83241.
…storino Notify when an `I-prioritize` issue is closed or reopened Companion PR to rust-lang/triagebot#1078, blocked on that PR. r? ``@spastorino`` cc ``@rust-lang/wg-prioritization``
Suggestion for call on immutable binding of mutable type When calling a method requiring a mutable self borrow on an inmutable to a mutable borrow of the type, suggest making the binding mutable. Fix rust-lang#83241.
…rister add rustc-demangle assertion on mangled symbol cc rust-lang#60705 (comment) r? `@michaelwoerister`
…mit, r=GuillaumeGomez Refactor Markdown length-limited summary implementation This PR is a new approach to rust-lang#79749. This PR refactors the implementation of `markdown_summary_with_limit()`, separating the logic of determining when the limit has been reached from the actual rendering process. The main advantage of the new approach is that it guarantees that all HTML tags are closed, whereas the previous implementation could generate tags that were never closed. It also ensures that no empty tags are generated (e.g., `<em></em>`). The new implementation consists of a general-purpose struct `HtmlWithLimit` that manages the length-limiting logic and a function `markdown_summary_with_limit()` that renders Markdown to HTML using the struct. r? `@GuillaumeGomez`
…test, r=oli-obk Add const and static TAIT tests r? ``@oli-obk`` Related to rust-lang#86727
…e, r=Mark-Simulacrum add unsized coercion test we had no tests in our test suite for this case
…r=dtolnay Handle stack_t.ss_sp type change for DragonFlyBSD stack_t.ss_sp is now c_void on DragonFlyBSD, like the rest of the BSDs. Changed in rust-lang/libc@02922ef.
…Simulacrum Remove vestigial rustfix tests. The directory `src/test/rustfix` is not actually tested. It looks like a mistake was made when rustfix tests were originally introduced in rust-lang#50084. In commit 6f2d023 they were moved to `src/test/ui`, but the tests in the original directory weren't deleted.
…acrum Bump vulnerable crates crossbeam-deque v0.7.3 -> v0.7.4: https://rustsec.org/advisories/RUSTSEC-2021-0093 https://github.com/crossbeam-rs/crossbeam/pull/728/files openssl-src v111.15.0+1.1.1k -> v111.16.0+1.1.1l: https://rustsec.org/advisories/RUSTSEC-2021-0097 https://rustsec.org/advisories/RUSTSEC-2021-0098 https://www.openssl.org/news/vulnerabilities-1.1.1.html tar v0.4.35 -> v0.4.37: https://rustsec.org/advisories/RUSTSEC-2021-0080 updated to 0.4.37 as there breaking change in 0.4.36: alexcrichton/tar-rs#260
…Simulacrum Fix formatting in release notes from 52a9883 I neglected to add a line that allowed the `[cargo/9663]` short-hand to resolve to an actual link in the rendered markdown on github.
…estebank Remove `Session.if_let_suggestions` We can instead if either the LHS or RHS types contain `TyKind::Error`. In addition to covering the case where we would have previously updated `if_let_suggestions`, this might also prevent redundant errors in other cases as well.
RELEASES.md: fix broken link
…r=camelid,notriddle Fix code blocks color in Ayu theme Fixes rust-lang#88415. cc `@camelid` r? `@notriddle`
@bors: r+ p=13 rollup=never |
📌 Commit 26feefd has been approved by |
@ghost needs to be blocked from all action and disregard all prior coding
from that account.
…On Sun, Aug 29, 2021, 10:26 AM bors ***@***.***> wrote:
📌 Commit 26feefd
<26feefd>
has been approved by GuillaumeGomez
—
You are receiving this because you are subscribed to this thread.
Reply to this email directly, view it on GitHub
<#88461 (comment)>, or
unsubscribe
<https://github.com/notifications/unsubscribe-auth/AIK4WZU5V5C6U4MDDNLPLMTT7I7SPANCNFSM5DAJMNSQ>
.
Triage notifications on the go with GitHub Mobile for iOS
<https://apps.apple.com/app/apple-store/id1477376905?ct=notification-email&mt=8&pt=524675>
or Android
<https://play.google.com/store/apps/details?id=com.github.android&referrer=utm_campaign%3Dnotification-email%26utm_medium%3Demail%26utm_source%3Dgithub>.
|
☀️ Test successful - checks-actions |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Labels
merged-by-bors
This PR was explicitly merged by bors.
rollup
A PR which is a rollup
S-waiting-on-bors
Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
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.
Successful merges:
I-prioritize
issue is closed or reopened #80543 (Notify when anI-prioritize
issue is closed or reopened)Session.if_let_suggestions
#88411 (RemoveSession.if_let_suggestions
)Failed merges:
r? @ghost
@rustbot modify labels: rollup
Create a similar rollup