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.

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

Rollup of 7 pull requests #112966

Closed
wants to merge 21 commits into from

Conversation

matthiaskrgr
Copy link
Member

Successful merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

compiler-errors and others added 21 commits June 15, 2023 03:18
Add extern declarations and optional dependencies to fix build done
directly via `cargo build`.
 - Introduce an Opaque type for adding information that is still
   internal to the compiler.
… r=wesleywiser

Always register sized obligation for argument

Removes a "hack" that skips registering sized obligations for parameters that are simple identifiers. This doesn't seem to affect diagnostics because we're probably already being smart enough about deduplicating identical error messages anyways.

Fixes rust-lang#112608
…i-obk

Implement a few more rvalue translation to smir

Add the implementation for a few more RValue variants. For now, I simplified the stable version of `RValue::Ref` by removing the notion of Region.

r? `@oli-obk`
…ter, r=notriddle

Add link to rustdoc book search chapter in help popover

One thing that was missing in the rustdoc output and its help popover was a link back to the search feature chapter in the rustdoc book.

It looks like this:

![image](https:/rust-lang/rust/assets/3050060/425413e5-e734-4d40-b675-8b2dcef874a2)

r? ``@notriddle``
…yout, r=wesleywiser

Don't ICE on unnormalized struct tail in layout computation

1. We try to compute a `SizeSkeleton` even if a layout error occurs, but we really only need to do this if we get `LayoutError::Unknown`, since that means our type is too polymorphic to actually compute the full layout. If we have other errors, like `LayoutError::NormalizationError` or `LayoutError::Cycle`, then we can't really make any progress, since this represents an actual error.
2. Avoid using `normalize_erasing_regions` and `struct_tail_erasing_lifetimes` since those ICE on normalization errors, and since we may call `layout_of` in HIR typeck, we don't know for certain that we're on the happy path.

Fixes rust-lang#112736
Stop hiding const eval limit in external macros

fixes rust-lang#112748

We don't emit a hard error if there was a previous deny lint triggering with the same message. If that lint ends up not being emitted, we ICE and don't emit an error either.
…, r=notriddle

[tests/rustdoc] Add @files command

The ```@!has``` checks is very problematic as it wouldn't catch if the file scheme is updated and the file is generated again. ```@files``` allows to ensure that the given folder contains exactly the provided entries (files and folders).

I'm wondering if we should forbid the ```@!has``` for files. To be discussed after this PR I suppose.

r? ``@notriddle``
…ter, r=ozkanonur

Fix rustdoc gui tester

Problem was that the `main` was always exiting with `0`, whether or not there was an error. It led to failing GUI tests being ignored in the CI since no one saw them.

r? `@klensy`
@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) 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 Jun 23, 2023
@matthiaskrgr
Copy link
Member Author

@bors r+ rollup=never p=7

@bors
Copy link
Contributor

bors commented Jun 23, 2023

📌 Commit a23b5f6 has been approved by matthiaskrgr

It is now in the queue for this repository.

@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 Jun 23, 2023
@bors
Copy link
Contributor

bors commented Jun 23, 2023

⌛ Testing commit a23b5f6 with merge 6c127d72a2a81b2f6763038e105e0518df5fa542...

@bors
Copy link
Contributor

bors commented Jun 23, 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 Jun 23, 2023
@rust-log-analyzer
Copy link
Collaborator

The job mingw-check failed! Check out the build log: (web) (plain)

Click to see the possible cause of the failure (guessed by this bot)
[RUSTC-TIMING] rustc_codegen_ssa test:false 2.945
    Checking rustc_codegen_llvm v0.0.0 (/checkout/compiler/rustc_codegen_llvm)
[RUSTC-TIMING] rustc_ast_lowering test:false 1.275
    Checking rustc_smir v0.0.0 (/checkout/compiler/rustc_smir)
error[E0026]: variant `rustc_middle::mir::BorrowKind::Mut` does not have a field named `allow_two_phase_borrow`
    |
    |
216 |             Mut { allow_two_phase_borrow } => {
    |                   |
    |                   variant `rustc_middle::mir::BorrowKind::Mut` does not have this field
    |                   help: `rustc_middle::mir::BorrowKind::Mut` has a field named `kind`


error[E0027]: pattern does not mention field `kind`
   --> compiler/rustc_smir/src/rustc_smir/mod.rs:216:13
    |
216 |             Mut { allow_two_phase_borrow } => {
    |
help: include the missing field in the pattern
    |
    |
216 |             Mut { allow_two_phase_borrow, kind } => {
    |                                         ~~~~~~~~
help: if you don't care about this missing field, you can explicitly ignore it
    |
216 |             Mut { allow_two_phase_borrow, .. } => {

Some errors have detailed explanations: E0026, E0027.
For more information about an error, try `rustc --explain E0026`.
[RUSTC-TIMING] rustc_smir test:false 0.163

@rust-log-analyzer
Copy link
Collaborator

The job mingw-check failed! Check out the build log: (web) (plain)

Click to see the possible cause of the failure (guessed by this bot)
    Checking rustc_query_impl v0.0.0 (/checkout/compiler/rustc_query_impl)
    Checking rustc_monomorphize v0.0.0 (/checkout/compiler/rustc_monomorphize)
    Checking rustc_ast_lowering v0.0.0 (/checkout/compiler/rustc_ast_lowering)
    Checking rustc_smir v0.0.0 (/checkout/compiler/rustc_smir)
error[E0026]: variant `rustc_middle::mir::BorrowKind::Mut` does not have a field named `allow_two_phase_borrow`
    |
    |
216 |             Mut { allow_two_phase_borrow } => {
    |                   |
    |                   variant `rustc_middle::mir::BorrowKind::Mut` does not have this field
    |                   help: `rustc_middle::mir::BorrowKind::Mut` has a field named `kind`


error[E0027]: pattern does not mention field `kind`
   --> compiler/rustc_smir/src/rustc_smir/mod.rs:216:13
    |
216 |             Mut { allow_two_phase_borrow } => {
    |
help: include the missing field in the pattern
    |
    |
216 |             Mut { allow_two_phase_borrow, kind } => {
    |                                         ~~~~~~~~
help: if you don't care about this missing field, you can explicitly ignore it
    |
216 |             Mut { allow_two_phase_borrow, .. } => {

Some errors have detailed explanations: E0026, E0027.
For more information about an error, try `rustc --explain E0026`.
error: could not compile `rustc_smir` (lib) due to 2 previous errors

@matthiaskrgr matthiaskrgr deleted the rollup-3c9cmxg branch March 16, 2024 18:18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
rollup A PR which is a rollup S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) 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
Development

Successfully merging this pull request may close these issues.

8 participants