diff options
| author | bors <bors@rust-lang.org> | 2023-07-29 04:18:46 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2023-07-29 04:18:46 +0000 |
| commit | 5ed61a4378700aeb5af88385d9ae054c8adf2322 (patch) | |
| tree | 1adcdcbbcd83a4d9d2e2c4c0ac84824a59b5e164 /src | |
| parent | 4734ac0943cb19cdf42e9d1aa21380da242e7674 (diff) | |
| parent | c6c1008b187e38e0b6cebff016cc7efc88f233c0 (diff) | |
| download | rust-5ed61a4378700aeb5af88385d9ae054c8adf2322.tar.gz rust-5ed61a4378700aeb5af88385d9ae054c8adf2322.zip | |
Auto merge of #114197 - matthiaskrgr:rollup-iluf7u4, r=matthiaskrgr
Rollup of 7 pull requests Successful merges: - #113773 (Don't attempt to compute layout of type referencing error) - #114107 (Prevent people from assigning me as a PR reviewer) - #114124 (tests/ui/proc-macro/*: Migrate FIXMEs to check-pass) - #114171 (Fix switch-stdout test for none unix/windows platforms) - #114172 (Fix issue_15149 test for the SGX target) - #114173 (btree/map.rs: remove "Basic usage" text) - #114174 (doc: replace wrong punctuation mark) r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'src')
| -rw-r--r-- | src/librustdoc/html/templates/type_layout.html | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/librustdoc/html/templates/type_layout.html b/src/librustdoc/html/templates/type_layout.html index 20e09a54805..287cbab07d2 100644 --- a/src/librustdoc/html/templates/type_layout.html +++ b/src/librustdoc/html/templates/type_layout.html @@ -44,6 +44,11 @@ <strong>Note:</strong> Encountered an error during type layout; {#+ #} the type was too big. {# #} </p> {# #} + {% when Err(LayoutError::ReferencesError(_)) %} + <p> {# #} + <strong>Note:</strong> Encountered an error during type layout; {#+ #} + the type references errors. {# #} + </p> {# #} {% when Err(LayoutError::NormalizationFailure(_, _)) %} <p> {# #} <strong>Note:</strong> Encountered an error during type layout; {#+ #} |