Skip to content

Rollup of 6 pull requests #109626

New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Merged
merged 13 commits into from
Mar 26, 2023
Merged

Rollup of 6 pull requests #109626

merged 13 commits into from
Mar 26, 2023

Conversation

matthiaskrgr
Copy link
Member

Successful merges:

Failed merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

peter-lyons-kehl and others added 13 commits March 25, 2023 06:19
Since structs are always `VariantIdx(0)`, there's a bunch of files where the only reason they had `VariantIdx` or `vec::Idx` imported at all was to get the first variant.

So this uses a constant for that, and adds some doc-comments to `VariantIdx` while I'm there, since it doesn't have any today.
Don't display `// some variants omitted` if enum is marked
`#[non_exhaustive]`
…ed, r=notriddle,GuillaumeGomez

rustdoc: skip `// some variants omitted` if enum is `#[non_exhaustive]`

Fixes rust-lang#108925

Never touched rustdoc before so probably not the best code.

cc `@dtolnay`
… r=GuillaumeGomez

Rustdoc Book refer to rustdoc::missing_doc_code_examples. Fixes rust-lang#109592.

Fixes rust-lang#109592. But, please see a related question at rust-lang#109592 (item `2.`).
…to-hide-trait, r=notriddle

Improve "Auto-hide trait implementation documentation" GUI test

Part of rust-lang#66181.

I'll start working on the `include` command for `browser-ui-test` so we can greatly reduce the duplicated code between setting tests.

r? ``@notriddle``
…urther-specializable, r=BoxyUwU

Still-further-specializable projections are ambiguous in new solver

Fixes https://github.com/rust-lang/rust/pull/108896/files#r1148450781

r? ``@BoxyUwU`` (though feel free to re-roll)

---

This can be used to create an unsound transmute function with the new solver:

```rust
#![feature(specialization)]

trait Default {
   type Id;

   fn intu(&self) -> &Self::Id;
}

impl<T> Default for T {
   default type Id = T;

   fn intu(&self) -> &Self::Id {
        self
   }
}

fn transmute<T: Default<Id = U>, U: Copy>(t: T) -> U {
    *t.intu()
}

use std::num::NonZeroU8;
fn main() {
    let s = transmute::<u8, Option<NonZeroU8>>(0);
    assert_eq!(s, None);
}
```
…iler-errors

Refactor: `VariantIdx::from_u32(0)` -> `FIRST_VARIANT`

Since structs are always `VariantIdx(0)`, there's a bunch of files where the only reason they had `VariantIdx` or `vec::Idx` imported at all was to get the first variant.

So this uses a constant for that, and adds some doc-comments to `VariantIdx` while I'm there, since [it doesn't have any today](https://doc.rust-lang.org/nightly/nightly-rustc/rustc_target/abi/struct.VariantIdx.html).
@rustbot rustbot added 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-libs Relevant to the library 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. WG-trait-system-refactor The Rustc Trait System Refactor Initiative (-Znext-solver) rollup A PR which is a rollup labels Mar 26, 2023
@matthiaskrgr
Copy link
Member Author

@bors r+ rollup=never p=6

@bors
Copy link
Collaborator

bors commented Mar 26, 2023

📌 Commit 4aa4ce6 has been approved by matthiaskrgr

It is now in the queue for this repository.

@bors
Copy link
Collaborator

bors commented Mar 26, 2023

🌲 The tree is currently closed for pull requests below priority 100. This pull request will be tested once the tree is reopened.

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Mar 26, 2023
@compiler-errors
Copy link
Member

@bors p=100

we can just retry it til it passes 😆

@bors
Copy link
Collaborator

bors commented Mar 26, 2023

⌛ Testing commit 4aa4ce6 with merge 4f0507aad366046e514126574b7097fde8907558...

@bors
Copy link
Collaborator

bors commented Mar 26, 2023

💔 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 Mar 26, 2023
@compiler-errors
Copy link
Member

@bors retry

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Mar 26, 2023
@bors
Copy link
Collaborator

bors commented Mar 26, 2023

⌛ Testing commit 4aa4ce6 with merge e793849e24b429f95cdeca0f7ee7c87ca5ed6657...

@bors
Copy link
Collaborator

bors commented Mar 26, 2023

💔 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 Mar 26, 2023
@compiler-errors
Copy link
Member

well it was worth a shot

@bors p=6 retry

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Mar 26, 2023
@matthiaskrgr
Copy link
Member Author

@bors retry p=101

@bors
Copy link
Collaborator

bors commented Mar 26, 2023

⌛ Testing commit 4aa4ce6 with merge 89c2e3d...

@bors
Copy link
Collaborator

bors commented Mar 26, 2023

☀️ Test successful - checks-actions
Approved by: matthiaskrgr
Pushing 89c2e3d to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Mar 26, 2023
@bors bors merged commit 89c2e3d into rust-lang:master Mar 26, 2023
@rustbot rustbot added this to the 1.70.0 milestone Mar 26, 2023
@rust-timer
Copy link
Collaborator

📌 Perf builds for each rolled up PR:

PR# Perf Build Sha
#109621 0a3248da71fa2252f4b123771f8e89cccf2834fc
#109620 9ac1831292d44c074959b148da3b3be52058e61c
#109619 9580948d697a018c27b47421507cadffdcb1cb5b
#109595 411fb6f4a539d55ef0c3f82cdf9231ef8906b6cc
#109593 5649c9c82027c45afda691b2a9ad53619203d2bb
#109007 295dd1513d43814ecf225f4662dd3ed28e34cde3

previous master: 2420bd34ba

In the case of a perf regression, run the following command for each PR you suspect might be the cause: @rust-timer build $SHA

@rust-timer
Copy link
Collaborator

Finished benchmarking commit (89c2e3d): comparison URL.

Overall result: no relevant changes - no action needed

@rustbot label: -perf-regression

Instruction count

This benchmark run did not return any relevant results for this metric.

Max RSS (memory usage)

Results

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

mean range count
Regressions ❌
(primary)
- - 0
Regressions ❌
(secondary)
- - 0
Improvements ✅
(primary)
-1.3% [-2.2%, -0.4%] 36
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) -1.3% [-2.2%, -0.4%] 36

Cycles

Results

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

mean range count
Regressions ❌
(primary)
2.0% [2.0%, 2.0%] 1
Regressions ❌
(secondary)
- - 0
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) 2.0% [2.0%, 2.0%] 1

@matthiaskrgr matthiaskrgr deleted the rollup-k0y7bdd branch March 16, 2024 18:19
# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
merged-by-bors This PR was explicitly merged by bors. rollup A PR which is a rollup S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-libs Relevant to the library 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. WG-trait-system-refactor The Rustc Trait System Refactor Initiative (-Znext-solver)
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Rustdoc Book: replace missing_doc_code_examples with rustdoc::missing_doc_code_examples
10 participants