Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Rollup of 6 pull requests #95830

Closed
wants to merge 14 commits into from
Closed

Rollup of 6 pull requests #95830

wants to merge 14 commits into from

Conversation

Dylan-DPC
Copy link
Member

Successful merges:

Failed merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

RalfJung and others added 14 commits March 27, 2022 14:10
@RalfJung
assert_uninit_valid: ensure we detect at least arrays of uninhabited …
e132077 
…types
@compiler-errors
don't report int/float ambiguity when we have previous errors
39bff4b
@yaahc
reword panic vs result section to remove recoverable vs unrecoverable…
aa3c141 
… framing
@GuillaumeGomez
Fix invalid array access in beautify_doc_string
43d0497
@GuillaumeGomez
Add test for empty doc comments with a backline
5e8bd9b
@Gankra @niluxv
WIP PROOF-OF-CONCEPT: Make the compiler complain about all int<->ptr …
1040cab 
…casts.

ALL

OF

THEM
@niluxv
Split fuzzy_provenance_casts into lossy and fuzzy, feature gate and…
98a4834 
… test it

* split `fuzzy_provenance_casts` into a ptr2int and a int2ptr lint
* feature gate both lints
* update documentation to be more realistic short term
* add tests for these lints
@Urgau
Remove extra space before a where clause in the documentation
f6c7f10
@Dylan-DPC
Rollup merge of rust-lang#95374 - RalfJung:assert_uninit_valid, r=Mar…
bdcefe9 
…k-Simulacrum

assert_uninit_valid: ensure we detect at least arrays of uninhabited types

We can't easily extend this check to *all* arrays (Cc rust-lang#87041), but it turns out the existing check already catches arrays of uninhabited types. So let's make sure it stays that way by adding them to the test.
@Dylan-DPC
Rollup merge of rust-lang#95599 - niluxv:strict-provenance-lint, r=mi…
f54d1e1 
…chaelwoerister

Strict provenance lints

See rust-lang#95488.
This PR introduces two unstable (allow by default) lints to which lint on int2ptr and ptr2int casts, as the former is not possible in the strict provenance model and the latter can be written nicer using the `.addr()` API.
Based on an initial version of the lint by ``@Gankra`` in rust-lang#95199.
@Dylan-DPC
Rollup merge of rust-lang#95751 - compiler-errors:ambig-int, r=jackh726
a999fce 
Don't report numeric inference ambiguity when we have previous errors

Fixes rust-lang#95648
@Dylan-DPC
Rollup merge of rust-lang#95787 - yaahc:panic-doc-update-v2, r=dtolnay
192372e 
reword panic vs result section to remove recoverable vs unrecoverable framing

Based on feedback from the Error Handling FAQ: rust-lang/project-error-handling#50 (comment)

r? ```@dtolnay```
@Dylan-DPC
Rollup merge of rust-lang#95804 - GuillaumeGomez:empty-doc-comment-wi…
1769808 
…th-backline, r=notriddle

rustdoc: Fix empty doc comment with backline ICE

Fixes rust-lang#95800.

r? ``@notriddle``
@Dylan-DPC
Rollup merge of rust-lang#95813 - Urgau:rustdoc-where-clause-space, r…
70a7a1c 
…=GuillaumeGomez

Remove extra space before a where clause

Remove extra space before where clause in the generated documentation.

The fix is to move the space before the break-line so that it doesn't appear visually but is still here. Removing it completely would create things like this `impl<D> Delta<D>where D: MyTrait` (missing a space before the where) which I don't think we want.

Added two regression test, first one test that the `<br>` is after the space and the second check that the `<br>` is before the spaces.

Before:
![image](https://user-images.githubusercontent.com/3616612/162475212-d4bb6727-ed66-4a55-a4a2-4f55189bf8bd.png)

After:
![image](https://user-images.githubusercontent.com/3616612/162475467-508fd082-60a7-4a8c-b693-8b188e8843e6.png)

r? ``@GuillaumeGomez``
@rustbot rustbot added T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. rollup A PR which is a rollup labels Apr 9, 2022
@Dylan-DPC
Copy link
Member Author

@bors r+ rollup=never p=5

@bors
Copy link
Contributor

bors commented Apr 9, 2022

📌 Commit 70a7a1c has been approved by Dylan-DPC

@bors bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Apr 9, 2022
@bors
Copy link
Contributor

bors commented Apr 9, 2022

⌛ Testing commit 70a7a1c with merge 4a6694c3a32a2617d8f5edb2c49e83e9ad3244c1...

@rust-log-analyzer
Copy link
Collaborator

The job x86_64-gnu-stable failed! Check out the build log: (web) (plain)

Click to see the possible cause of the failure (guessed by this bot) 
test [ui] src/test/ui/lint/lint-removed-cmdline.rs ... ok
test [ui] src/test/ui/lint/lint-renamed.rs ... ok
test [ui] src/test/ui/lint/lint-renamed-cmdline.rs ... ok
test [ui] src/test/ui/lint/lint-output-format.rs ... ok
test [ui] src/test/ui/lint/lint-strict-provenance-fuzzy-casts.rs ... ok
test [ui] src/test/ui/lint/lint-strict-provenance-lossy-casts.rs ... ok
test [ui] src/test/ui/lint/lint-shorthand-field.rs ... ok
test [ui] src/test/ui/lint/lint-temporary-cstring-as-param.rs ... ok
test [ui] src/test/ui/lint/lint-temporary-cstring-as-ptr.rs ... ok
test [ui] src/test/ui/lint/lint-type-limits.rs ... ok
---
failures:

---- [rustdoc] src/test/rustdoc/where.rs stdout ----

error: htmldocck failed!
status: exit status: 1
command: "/usr/bin/python3" "/checkout/src/etc/htmldocck.py" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/rustdoc/where" "/checkout/src/test/rustdoc/where.rs"
--- expected ---


<div class="docblock item-decl"><pre class="rust struct"><code>pub struct Simd&lt;T, const LANES:&#160;<a class="primitive" href="https://doc.rust-lang.org/nightly/std/primitive.usize.html">usize</a>&gt;(_) <br /><span class="where">where<br />&#160;&#160;&#160;&#160;T: <a class="trait" href="https://doc.rust-lang.org/nightly/core/marker/trait.Sized.html" title="trait core::marker::Sized">Sized</a></span>;</code></pre></div>

--- actual ---


<div class="docblock item-decl"><pre class="rust struct"><code>pub struct Simd&lt;T, const LANES:&#160;<a class="primitive" href="https://doc.rust-lang.org/1.62.0/std/primitive.usize.html">usize</a>&gt;(_) <br /><span class="where">where<br />&#160;&#160;&#160;&#160;T: <a class="trait" href="https://doc.rust-lang.org/1.62.0/core/marker/trait.Sized.html" title="trait core::marker::Sized">Sized</a></span>;</code></pre></div>
--- stderr -------------------------------
--- stderr -------------------------------
24: @snapshot check failed
 Actual snapshot value is different than expected
 // @snapshot SWhere_Simd_item-decl - '//div[@class="docblock item-decl"]'
Encountered 1 errors
------------------------------------------

@bors
Copy link
Contributor

bors commented Apr 9, 2022

💔 Test failed - checks-actions

@bors bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Apr 9, 2022
@Dylan-DPC Dylan-DPC mentioned this pull request Apr 9, 2022
Merged
@Dylan-DPC Dylan-DPC closed this Apr 9, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
rollup A PR which is a rollup S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet