Uh oh!
There was an error while loading. Please reload this page.
Rollup of 7 pull requests - #83398
Merged
Merged
Conversation
Co-authored-by: Miguel Ojeda <ojeda@users.noreply.github.com>
Co-authored-by: bluss <bluss@users.noreply.github.com>
Co-authored-by: bluss <bluss@users.noreply.github.com>
Co-authored-by: Tyler Mandry <tmandry@gmail.com>
They are never both `None` or both `Some`, so it makes more sense to use an enum so that we "make impossible states impossible".
…dePro, r=GuillaumeGomez Update Source Code Pro and include italics Fixesrust-lang#65502. rust-lang#65665, a similar PR to this was merged but reverted because of rust-lang#65665 (comment). The issue in that comment is the upstream issue adobe-fonts/source-code-pro#217 which should now be fixed in the upstream since [2.032R-ro/1.052R-it/1.012R-VAR release](https://github.com/adobe-fonts/source-code-pro/releases/tag/2.032R-ro/1.052R-it/1.012R-VAR), so I think this can now be merged. A couple of notes from the original PR: * Since this PR changes the font set, I think docs.rs would have to be updated if this PR is merged. * The fonts have a double extension (.ttf.woff); this is to keep the names consistent with the upstream font release which does that to distinguish these from the .otf.woff files (Source Code Pro otf renders poorly on older Windows system apps).
…imulacrum Update RELEASES.md for 1.51.0 ### [Rendered](https://github.com/rust-lang/rust/blob/relnotes-1.51.0/RELEASES.md) r? `@Mark-Simulacrum` cc `@rust-lang/release`
…=Nemo157 Remove theme.js file Fixesrust-lang#82616. The first commit moves the `theme.js` file into `main.js`, which requires to also run a small `.replace` on the `main.js` content. The second commit is just a small cleanup to centralize DOM ids. Since it removes a file from rustdoc output: cc `@rust-lang/docs-rs` cc `@jsha` r? `@jyn514`
…uillaumeGomez rustdoc: Replace pair of `Option`s with an enum They are never both `None` or both `Some`, so it makes more sense to use an enum so that we "make impossible states impossible".
…lett rename :pat2018 -> :pat2015 as requested by T-lang on zulip: https://rust-lang.zulipchat.com/#narrow/stream/213817-t-lang/topic/or.20patterns/near/231133873 No functional changes here... just renaming. r? `@nikomatsakis`
…=jonas-schievink ⬆️ rust-analyzer
add rust-analyzer rustc_private option in librustdoc Cargo.toml This addition will allow to have code completion while hacking rustdoc with rust-analyzer. more info: https://rust-analyzer.github.io/manual.html#rust-analyzer.rustcSource r? `@jyn514`
JohnTitor
commented
Mar 23, 2021
MemberAuthor
@bors r+ p=7 rollup=never |
bors
commented
Mar 23, 2021
Collaborator
📌 Commit 263c858 has been approved by |
bors
commented
Mar 23, 2021
Collaborator
bors
commented
Mar 23, 2021
Collaborator
☀️ Test successful - checks-actions |
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 freeto join this conversation on GitHub.
Already have an account?
Sign in to comment
10 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.
Successful merges:
Options with an enum #83356 (rustdoc: Replace pair ofOptions with an enum)Failed merges:
r? @ghost
@rustbot modify labels: rollup
Create a similar rollup