Rollup of 6 pull requests #103572
Merged
Rollup of 6 pull requests #103572
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
Before this commit, the step to generate the standalone docs (which included the index page and other HTML files at the root of the documentation) was bundled with the code copying files needed by multiple pieces of documentation. This means it wasn't possible to avoid generating the standalone docs. This commit splits the step into two, allowing the standalone docs generation to be excluded while still building the rest of the docs.
Before this commit, the path for the doc::Standalone step was "src/doc", which is accurate as the standalone docs source files live at the root of the "src/doc" directory tree. Unfortunately, that caused bad interactions when trying to exclude it with `--exclude src/doc`. When an exclusion is passed to bootstrap, it will exclude all steps whose path *ends with* the exclusion, which results in the Cargo book (src/tools/cargo/src/doc) to also be excluded. To work around this problem, this commit adds the "standalone" path as an alternate path for doc::Standalone, allowing `--exclude standalone` to work without side effects.
Co-authored-by: Joshua Nelson <[email protected]>
…n printing constants
The change in opacity is inconsistent with most of rustdoc, which uses default browser styles for the focus outline. Unfortunately, just using the default focus outline here won't work, because it gets applied to the summary itself instead of the pseudo-element "real button."
Co-authored-by: Jacob Hoffman-Andrews <[email protected]>
…ry_enum_discriminant, r=joshtriplett Stabilize arbitrary_enum_discriminant, take 2 Documentation has been updated in rust-lang/reference#1055. cc rust-lang#86860 for previous stabilization report. Not yet marks rust-lang#60553 as done: need documentation in the rust reference.
…yn514 Support excluding the generation of the standalone docs For Ferrocene we need to exclude the generation of the standalone docs (which include the index page, which we want to replace with our own), but with the way bootstrap is currently implemented that proved not possible. This PR aims to support that. The first problem is that the `doc::Standalone` step did two things: it generated the "standalone" documentation (which includes the index page and all the pages at the root of the documentation tree), but it also generated some files like `rust.css` and `version_info.html` that other step like `doc::TheBook` required. This meant generating the book required generating the index page, which made disabling the index page generation problematic. The approach I took to fix the first problem is to split the step into `doc::Standalone` and `doc::SharedAssets`, with `doc::TheBook` now depending on `doc::SharedAssets`. The second problem is that disabling the `doc::Standalone` proved to be tricky due to its path, `src/doc`. The path is accurate, as the source files for that step are `src/doc/*.md`. The problem is, bootstrap treats `--exclude` as a *suffix*, and so it also excluded the Cargo book whose source lives at `src/tools/cargo/src/doc`. The approach I took to fix the second problem is to add the `standalone` path in addition to `src/doc`, so that you can pass `--exclude standalone`. I'm not fully happy with the solution, and the other idea I had was to just move the standalone docs source code to `src/doc/standalone`. I feel that second approach is cleaner, but also requires more changes and might require more consensus. This PR is best reviewed commit-by-commit. r? `@jyn514`
…iler-errors Removed verbose printing from the `PrettyPrinter` when printing constants Partially solves rust-lang#94187 by completing the first step described in [this comment](rust-lang#94187 (comment)).
Update books ## reference 4 commits in f6ed74f582bddcec73f753eafaab3749c4f7df61..4ea7c5def38ac81df33a9e48e5637a82a5ac404d 2022-10-08 02:43:26 -0700 to 2022-10-25 15:14:36 -0700 - Document Half Open Range Patterns + Improve Range Patterns in General (rust-lang/reference#1274) - clarifying which row contains the example (rust-lang/reference#1287) - Add `sym` operands for inline assembly (rust-lang/reference#1270) - Add basic GATs reference information (rust-lang/reference#1265) ## book 141 commits in f1e5ad844d0c61738006cdef26227beeb136948e..aa5ee485bd6bd80d205da7c82fcdd776f92fdd51 2022-09-19 09:48:21 -0400 to 2022-10-20 16:49:55 -0400 - Remove Turkish translation - Update chapter 4 from latest print edits - Update chapter 3 from latest print edits - Clarify division truncates toward zero. Fixes rust-lang/book#2856. - Update chapter 2 from latest print edits - Fix a problem with literal style ending - Explain both kinds of format string arguments - Update chapter 1 from latest print edits - Snapshot consolidated appendices - Fix ListNumber0, newlines after lists - Don't match nodes without anything - Handle listing numbers in appendices too - Regenerate everything - Fix chapter numbers in word doc so they're in the XML - Number Table captions too - Handle figures too - Regenerate ch4 - Handle listing numbers - Regenerate ch13 - Regenerate ch12 - Regenerate ch11 - Regenerate chapter 10 - Fix ListBullet0 - Handle ending of BoxCode better - Regenerate chapter 9 - Regenerate ch8 - Make RunInHead consistent-ish - Fix extra newline before boxes - Fix Box RunIn Head/Para - Fix newline after RunInHead/Para - Regenerate ch7 - Fix QuotePara - Fix ListPlain - Regenerate ch6 - Fix BoxCode - Regenerate chapter 5 - Fix GraphicSlug and CaptionLine - Regenerate snapshot of chapter 4 - Fix boxes a bit - Add a shellcheck ignore - Handle BoxListBullet - Handle superscript - Regenerate ch3 from xml and fix tables - Fix italics and whitespace interactions - Fix italic preceding/following - Fix preceding/following xpaths again - Fix italics - Fix code blocks - Fix more last bullets in lists - Fix box newlines - Fix last bullet in a list - Fix BoxType - Fix notes - Fix literals - Add the no editing warning at the top when getting snapshots from docx - Make the snapshot of the frontmatter nicer - Updates to appendixes C, D, and E after copyedit checks - Snapshots after copyedit checks of appendices a and b + recheck of 20 - Snapshot of appendices from copyedit - Updated snapshot of the appendices - Re-checks of chapter 19 - Re-checks of chapter 18 - Messy snapshot of chapter 20 after copyedit checks - Snapshot of ch20 after copyedit - Updated snapshot of chapter 20 - Messy snapshot of chapter 19 after copyedit checks - Snapshot of ch19 after copyedit - Updated snapshot of ch19 - Messy snapshot of ch 18 after copyedit review - Snapshot of ch 18 after copyedit - Update snapshot of ch18 - Messy snapshot of ch 17 after copyedit review - Snapshot of ch17 copyedit - Updated snapshot of ch17 - Messy snapshot of ch16 after copyedit - Snapshot of ch16 copyedited - Updated snapshot of ch16 - Messy snapshot of ch 15 after copyedit checks - Re-review of earlier chapters - Snapshot of ch15 copyedit - Update snapshot of ch15 - Messy snapshots of other chapters with indentation fixed - Messy snapshot of ch2 with indentation fixed - Add unittests to the allowed words - Messy snapshot of chapter 14 after checking copyedit - Snapshot of chapter 14 after copyedit - Update snapshot of ch14 - Regenerate manual output for chapter 14 - Messy snapshot of chapter 13 after copyedit check - Updated snapshot of ch13 after copyedit - Updated snapshot of ch13 - Messy snapshot of chapter 12 after copyedit checks - Snapshot of chapter 12 copyedited - Update snapshot for chapter 12 - Messy snapshot of chapter 11 after copyedit check - Snapshot of chapter 11 copyedited - Updated snapshot of chapter 11 - Messy snapshot of chapter 10 after copyedit check - Snapshot of chapter 10 copyedit - Updated snapshot of chapter 10 - Messy snapshot of ch9 after copyedit checks - Snapshot of ch 9 copyedit - Update snapshot of chapter 9 - Messy snapshot of chapter 8 - Update println style in ch8 - Snapshot of chapter 8 from copyedit - Updated snapshot of chapter 8 - Rearrange my notes yet again - Messy snapshot of ch7 after copyedit checks - Snapshot of chapter 7 from copyedit, fix chapter 6 name - Update snapshot of chapter 7 - Messy snapshot of chapter 6 after copyedit check - Update snapshot of chapter 6 - Change my notes again - Messy snapshot of chapter 5 after checking copyedit - Snapshot of chapter 5 from copyedit - Messy snapshot of chapter 4 after copyedit check - Changing my notes again - Snapshot of ch4 from nostarch - Messy snapshot of chapter 3 after copyedit check, ch4 on start check - Snapshot of ch3 from nostarch - Updated snapshot of ch3 - reorder notes - Messy snapshot of chapter 1 after copyedit check - Snapshot of ch01 docx from nostarch - Updated snapshot of chapter 1 - Messy snapshot of frontmatter docx - Another snapshot to fix the crab pinchers description - Messy snapshot of chapter 2 docx - Get the latest snapshot of chapter 2 - Upgrade to rand 0.8.5 - Notes to self - Update xsl and take snapshots from docx, such as they are - Update instructions on docx -> md now that I've done it again - Propagate frontmatter edits to src - Updated snapshots extracted from frontmatter - Support different styles in the docx - Line wrap bio - Frontmatter from word doc - Edits to docx files for nostarch - docx files from nostarch ## rust-by-example 6 commits in 5e7b296d6c345addbd748f242aae28c42555c015..03491f33375c5a2a1661c7fa4be671fe95ce1249 2022-10-05 08:24:45 -0300 to 2022-10-21 07:30:08 -0300 - fix rust-lang/rust-by-example#1628: the box pointer is on stack not on heap (rust-lang/rust-by-example#1629) - fix rust-lang/rust-by-example#1608: out-of-bound indexing is a runtime error (not a compile-time error) (rust-lang/rust-by-example#1626 ) - Fix: Path internal representation and conversions (rust-lang/rust-by-example#1625) - fix crate name in example (rust-lang/rust-by-example#1620) - avoid reserved keyword try as crate name (rust-lang/rust-by-example#1619) - Fix typo in iter_result.md (rust-lang/rust-by-example#1614) ## rustc-dev-guide 7 commits in 7518c34..51a37ad 2022-10-08 12:29:47 +0200 to 2022-10-25 10:18:58 -0700 - Update `traits/resolution.md` (rust-lang/rustc-dev-guide#1494) - Update diagnostics to flat fluent message paths - Update rust-analyzer suggestions (rust-lang/rustc-dev-guide#1487) - miri is no longer a submodule but a subtree. (rust-lang/rustc-dev-guide#1488) - fix some links (rust-lang/rustc-dev-guide#1490) - typo and grammar (rust-lang/rustc-dev-guide#1484) - Add missing prerequisite for some Linux distros (rust-lang/rustc-dev-guide#1481)
interpret: a bit of cast cleanup r? `@oli-obk`
…visible, r=jsha rustdoc: add visible focus outline to rustdoc-toggle The change in opacity is inconsistent with most of rustdoc, which uses default browser styles for the focus outline. Unfortunately, just using the default focus outline here won't work, because it gets applied to the summary itself instead of the pseudo-element "real button." Preview: https://notriddle.com/notriddle-rustdoc-demos/focus-outline/test_dingus/fn.test.html ## Screenshots ### light  ### dark  ### ayu 
rustbot
added
T-bootstrap
|
@bors r+ rollup=never p=5 |
bors
added
the
S-waiting-on-bors
|
☀️ Test successful - checks-actions |
|
📌 Perf builds for each rolled up PR: previous master: 43dd3d514b In the case of a perf regression, run the following command for each PR you suspect might be the cause: |
|
Finished benchmarking commit (0a6b941): comparison URL. Overall result: ❌ regressions - ACTION NEEDEDNext Steps: If you can justify the regressions found in this perf run, please indicate this with @rustbot label: +perf-regression Instruction countThis is a highly reliable metric that was used to determine the overall result at the top of this comment.
Max RSS (memory usage)This benchmark run did not return any relevant results for this metric. CyclesThis benchmark run did not return any relevant results for this metric. Footnotes |
|
The regressions are miniscule, I don't think this is worth any follow-up. @rustbot label: +perf-regression-triaged |
rustbot
added
the
perf-regression-triaged
pietroalbini
added a commit
to ferrocene/sphinx-shared-resources
that referenced
this pull request
Mar 22, 2023
600: Pull changes from upstream `master` r=kirtchev-adacore a=pietroalbini * rust-lang/rust#103605 * rust-lang/rust#103604 * rust-lang/rust#103598 * rust-lang/rust#103596 * rust-lang/rust#103580 * rust-lang/rust#103579 * rust-lang/rust#103567 * rust-lang/rust#103558 * rust-lang/rust#103549 * rust-lang/rust#103537 * rust-lang/rust#103526 * rust-lang/rust#103432 * rust-lang/rust#103571 * rust-lang/rust#103492 * rust-lang/rust#103572 * rust-lang/rust#103554 * rust-lang/rust#103546 * rust-lang/rust#103543 * rust-lang/rust#103428 * rust-lang/rust#102706 * rust-lang/rust#95710 * rust-lang/rust#103284 * rust-lang/rust#103562 * rust-lang/rust#103542 * rust-lang/rust#103536 * rust-lang/rust#103533 * rust-lang/rust#103520 * rust-lang/rust#103444 * rust-lang/rust#103430 * rust-lang/rust#103416 * rust-lang/rust#103287 * rust-lang/rust#103209 * rust-lang/rust#102951 * rust-lang/rust#103279 * rust-lang/rust#103158 Co-authored-by: Lukas Wirth <[email protected]> Co-authored-by: Pietro Albini <[email protected]> Co-authored-by: DropDemBits <[email protected]> Co-authored-by: bors <[email protected]> Co-authored-by: Pietro Albini <[email protected]>
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.
Successful merges:
PrettyPrinterwhen printing constants #103428 (Removed verbose printing from thePrettyPrinterwhen printing constants)Failed merges:
r? @ghost
@rustbot modify labels: rollup
Create a similar rollup