Skip to content

Commit 9177359

Browse files
Auto merge of #125907 - fmease:rustdoc-synth-blanket-ocx-next, r=<try>
rustdoc: use the next solver for blanket impl synthesis Presumably due to better caching behavior, switching from the old to the next solver *drastically* improves the compile time on certain inputs. See #114891. Fixes #114891. Furthermore use an `ObligationCtxt` instead of operating on an `InferCtxt` directly and don't drop the obligations generated by the type relating. For context, originally I just wanted to submit the infcx→ocx change. However, that regressed `tests/rustdoc-ui/ice-blanket-impl-52873.rs` (pass→overflow error) because with `ocx.select_where_possible` we would no longer suppress / defatalize (canonical) overflow errors. CC #54199 which introduced that special case. Obviously in the next solver overflows are non-fatal incl. `ice-blanket-impl-52873.rs`. Hence the switch now. https://github.com/rust-lang/rust/labels/S-blocked on perf improvements for the next solver.
2 parents c683403 + 4f53115 commit 9177359

File tree

2,868 files changed

+783483
-25284
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

2,868 files changed

+783483
-25284
lines changed

.github/ISSUE_TEMPLATE/rustdoc.md

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
---
2+
name: Problem with rustdoc
3+
about: Report an issue with how docs get generated.
4+
labels: C-bug, T-rustdoc
5+
---
6+
<!--
7+
Thank you for filing a rustdoc issue! Rustdoc is the tool that handles the generation of docs. It is usually invoked via `cargo doc`, but can also be used directly.
8+
9+
If you have an issue with the actual content of the docs, use the "Documentation problem" template instead.
10+
-->
11+
12+
# Code
13+
<!-- problematic snippet and/or link to repo and/or full path of standard library function -->
14+
15+
```rust
16+
<code>
17+
```
18+
19+
# Reproduction Steps
20+
<!--
21+
* command(s) to run, if any
22+
* permalink to hosted documentation, if any
23+
* search query, if any
24+
-->
25+
26+
# Expected Outcome
27+
<!--
28+
What did you want to happen?
29+
30+
For GUI issues, feel free to provide a mockup image of what you want it to look like.
31+
32+
For diagnostics, please provide a mockup of the desired output in a code block.
33+
-->
34+
35+
# Actual Output
36+
<!--
37+
* rustdoc console output
38+
* browser screenshot of generated html
39+
* rustdoc json (prettify by running through `jq` or running thorugh an online formatter)
40+
-->
41+
```console
42+
<code>
43+
```
44+
45+
46+
# Version
47+
<!--
48+
Available via `rustdoc --version` or under the "Help" menu.
49+
50+
If the issue involves opening the documentation in a browser, please also provide the name and version of the browser used.
51+
-->
52+
53+
# Additional Details
54+
<!-- Anything else you think is relevant -->

.github/workflows/ci.yml

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,6 @@ name: CI
1111
on:
1212
push:
1313
branches:
14-
# CI on master only serves for caching citool builds for the `calculate_matrix` job.
15-
# In order to use GHA cache on PR CI (and auto/try) jobs, we need to write to it
16-
# from the default branch.
17-
- master
1814
- auto
1915
- try
2016
- try-perf
@@ -57,13 +53,6 @@ jobs:
5753
steps:
5854
- name: Checkout the source code
5955
uses: actions/checkout@v4
60-
# Cache citool to make its build faster, as it's in the critical path.
61-
# The rust-cache doesn't bleed into the main `job`, so it should not affect any other
62-
# Rust compilation.
63-
- name: Cache citool
64-
uses: Swatinem/rust-cache@9d47c6ad4b02e050fd481d890b2ea34778fd09d6 # v2.7.8
65-
with:
66-
workspaces: src/ci/citool
6756
- name: Test citool
6857
# Only test citool on the auto branch, to reduce latency of the calculate matrix job
6958
# on PR/try builds.

.gitmodules

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,6 @@
1818
path = src/doc/rust-by-example
1919
url = https://github.com/rust-lang/rust-by-example.git
2020
shallow = true
21-
[submodule "library/stdarch"]
22-
path = library/stdarch
23-
url = https://github.com/rust-lang/stdarch.git
24-
shallow = true
2521
[submodule "src/doc/edition-guide"]
2622
path = src/doc/edition-guide
2723
url = https://github.com/rust-lang/edition-guide.git

.mailmap

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -162,8 +162,10 @@ David Carlier <[email protected]>
162162
David Klein <[email protected]>
163163
164164
David Ross <[email protected]>
165-
165+
166+
166167
168+
167169
168170
169171
dependabot[bot] <dependabot[bot]@users.noreply.github.com> <27856297+dependabot-preview[bot]@users.noreply.github.com>
@@ -688,6 +690,7 @@ Xinye Tao <[email protected]>
688690
Xuefeng Wu <[email protected]> Xuefeng Wu <[email protected]>
689691
Xuefeng Wu <[email protected]> XuefengWu <[email protected]>
690692
York Xiang <[email protected]>
693+
691694
692695
Youngsuk Kim <[email protected]>
693696
Yuki Okushi <[email protected]>
@@ -698,3 +701,4 @@ Zach Pomerantz <[email protected]>
698701
699702
Zack Slayton <[email protected]>
700703
Zbigniew Siciarz <[email protected]> Zbigniew Siciarz <[email protected]>
704+

0 commit comments

Comments
 (0)