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 6 pull requests #138289

Closed
wants to merge 14 commits into from

Conversation

matthiaskrgr
Copy link
Member

Successful merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

NobodyXu and others added 14 commits March 2, 2025 00:33
Signed-off-by: Jiahao XU <Jiahao_XU@outlook.com>
Signed-off-by: Jiahao XU <Jiahao_XU@outlook.com>
Signed-off-by: StevenMia <flite@foxmail.com>
…, r=nnethercote

Make some invalid codegen attr errors structured/translatable
…r=joshtriplett

Stablize anonymous pipe

Since rust-lang#135822 is staled, I create this PR to stablise anonymous pipe

Closes rust-lang#127154
…struct, r=nnethercote

Fix dyn -> param suggestion in struct ICEs

Makes the logic from rust-lang#138042 a bit less ICEy and more clean. Also fixes an incorrect suggestion when the struct already has generics. I'll point out the major changes and observations in the code.

Fixes rust-lang#138229
Fixes rust-lang#138211

r? nnethercote since you reviewed the original pr, or re-roll if you don't want to review this
chore: Fix some comments

 Fix some comments
…ompiler-errors

fix ICE in pretty-printing `global_asm!`

fixes rust-lang#138260

since rust-lang#137180, `global_asm!` gets a fake body, that the pretty printing logic did not know what to do with.

based on [#t-compiler/help > tests for MIR pretty printing](https://rust-lang.zulipchat.com/#narrow/channel/182449-t-compiler.2Fhelp/topic/tests.20for.20MIR.20pretty.20printing) I created `tests/ui/unpretty/mir` which seemed as good a place as any for a test. If there is a better place, let me know.
…3, r=compiler-errors

triagebot.toml: Don't label `test/rustdoc-json` as A-rustdoc-search (…

Followup to rust-lang#137958. I managed to miss a place, as shown by the questionable labeling of rust-lang#138285.
@rustbot rustbot added A-attributes Area: Attributes (`#[…]`, `#![…]`) A-meta Area: Issues & PRs about the rust-lang/rust repository itself O-unix Operating system: Unix-like O-windows Operating system: Windows 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. rollup A PR which is a rollup labels Mar 9, 2025
@matthiaskrgr
Copy link
Member Author

@bors r+ rollup=never p=5

@bors
Copy link
Contributor

bors commented Mar 9, 2025

📌 Commit 3f35ba6 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 Mar 9, 2025
@bors
Copy link
Contributor

bors commented Mar 10, 2025

⌛ Testing commit 3f35ba6 with merge 5c4b604...

bors added a commit to rust-lang-ci/rust that referenced this pull request Mar 10, 2025
…iaskrgr

Rollup of 6 pull requests

Successful merges:

 - rust-lang#137279 (Make some invalid codegen attr errors structured/translatable)
 - rust-lang#137793 (Stablize anonymous pipe)
 - rust-lang#138238 (Fix dyn -> param suggestion in struct ICEs)
 - rust-lang#138270 (chore: Fix some comments)
 - rust-lang#138280 (fix ICE in pretty-printing `global_asm!`)
 - rust-lang#138286 (triagebot.toml: Don't label `test/rustdoc-json` as A-rustdoc-search (…)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors mentioned this pull request Mar 10, 2025
@rust-log-analyzer
Copy link
Collaborator

The job test-various failed! Check out the build log: (web) (plain)

Click to see the possible cause of the failure (guessed by this bot)
error[E0432]: unresolved import `crate::sys::fd::FileDesc`
  --> library/std/src/os/fd/raw.rs:18:5
   |
18 | use crate::sys::fd::FileDesc;
   |     ^^^^^^^^^^^^^^^^^^^^^^^^ no `FileDesc` in `sys::pal::wasi::fd`

error[E0599]: no method named `as_raw_fd` found for struct `AnonPipe` in the current scope
   --> library/std/src/os/fd/raw.rs:284:16
    |
284 |         self.0.as_raw_fd()
    |                ^^^^^^^^^ method not found in `AnonPipe`
    |
   ::: library/std/src/sys/pal/wasi/../unsupported/pipe.rs:5:1
    |
5   | pub struct AnonPipe(!);
    | ------------------- method `as_raw_fd` not found for this struct
    |
    = help: items from traits can only be used if the trait is implemented and in scope
note: `os::fd::raw::AsRawFd` defines an item `as_raw_fd`, perhaps you need to implement it
   --> library/std/src/os/fd/raw.rs:36:1
    |
36  | pub trait AsRawFd {
    | ^^^^^^^^^^^^^^^^^

error[E0599]: no method named `into_raw_fd` found for struct `AnonPipe` in the current scope
   --> library/std/src/os/fd/raw.rs:298:16
    |
298 |         self.0.into_raw_fd()
    |                ^^^^^^^^^^^ method not found in `AnonPipe`
    |
   ::: library/std/src/sys/pal/wasi/../unsupported/pipe.rs:5:1
    |
5   | pub struct AnonPipe(!);
    | ------------------- method `into_raw_fd` not found for this struct
    |
    = help: items from traits can only be used if the trait is implemented and in scope
note: `os::fd::raw::IntoRawFd` defines an item `into_raw_fd`, perhaps you need to implement it
   --> library/std/src/os/fd/raw.rs:113:1
    |
113 | pub trait IntoRawFd {
    | ^^^^^^^^^^^^^^^^^^^

error[E0599]: no method named `as_raw_fd` found for struct `AnonPipe` in the current scope
   --> library/std/src/os/fd/raw.rs:305:16
    |
305 |         self.0.as_raw_fd()
    |                ^^^^^^^^^ method not found in `AnonPipe`
    |
   ::: library/std/src/sys/pal/wasi/../unsupported/pipe.rs:5:1
    |
5   | pub struct AnonPipe(!);
    | ------------------- method `as_raw_fd` not found for this struct
    |
    = help: items from traits can only be used if the trait is implemented and in scope
note: `os::fd::raw::AsRawFd` defines an item `as_raw_fd`, perhaps you need to implement it
   --> library/std/src/os/fd/raw.rs:36:1
    |
36  | pub trait AsRawFd {
    | ^^^^^^^^^^^^^^^^^

error[E0599]: no method named `into_raw_fd` found for struct `AnonPipe` in the current scope
   --> library/std/src/os/fd/raw.rs:319:16
    |
319 |         self.0.into_raw_fd()
    |                ^^^^^^^^^^^ method not found in `AnonPipe`
    |
   ::: library/std/src/sys/pal/wasi/../unsupported/pipe.rs:5:1
    |
5   | pub struct AnonPipe(!);
    | ------------------- method `into_raw_fd` not found for this struct
    |
    = help: items from traits can only be used if the trait is implemented and in scope
note: `os::fd::raw::IntoRawFd` defines an item `into_raw_fd`, perhaps you need to implement it
   --> library/std/src/os/fd/raw.rs:113:1
    |
113 | pub trait IntoRawFd {
    | ^^^^^^^^^^^^^^^^^^^

error[E0599]: no method named `as_fd` found for struct `AnonPipe` in the current scope
   --> library/std/src/os/fd/owned.rs:491:16
    |
491 |         self.0.as_fd()
    |                ^^^^^ method not found in `AnonPipe`
    |
   ::: library/std/src/sys/pal/wasi/../unsupported/pipe.rs:5:1
    |
5   | pub struct AnonPipe(!);
    | ------------------- method `as_fd` not found for this struct
    |
    = help: items from traits can only be used if the trait is implemented and in scope
note: `owned::AsFd` defines an item `as_fd`, perhaps you need to implement it
   --> library/std/src/os/fd/owned.rs:227:1
    |
227 | pub trait AsFd {
    | ^^^^^^^^^^^^^^

error[E0433]: failed to resolve: use of undeclared type `FileDesc`
   --> library/std/src/os/fd/owned.rs:498:9
    |
498 |         FileDesc::into_inner(pipe.0)
    |         ^^^^^^^^ use of undeclared type `FileDesc`

error[E0599]: no method named `as_fd` found for struct `AnonPipe` in the current scope
   --> library/std/src/os/fd/owned.rs:505:16
    |
505 |         self.0.as_fd()
    |                ^^^^^ method not found in `AnonPipe`
    |
   ::: library/std/src/sys/pal/wasi/../unsupported/pipe.rs:5:1
    |
5   | pub struct AnonPipe(!);
    | ------------------- method `as_fd` not found for this struct
    |
    = help: items from traits can only be used if the trait is implemented and in scope
note: `owned::AsFd` defines an item `as_fd`, perhaps you need to implement it
   --> library/std/src/os/fd/owned.rs:227:1
    |
227 | pub trait AsFd {
    | ^^^^^^^^^^^^^^

---

error[E0433]: failed to resolve: use of undeclared type `FileDesc`
   --> library/std/src/os/fd/owned.rs:519:14
    |
519 |         Self(FileDesc::from_inner(owned_fd))
    |              ^^^^^^^^ use of undeclared type `FileDesc`

error[E0433]: failed to resolve: use of undeclared type `FileDesc`
   --> library/std/src/os/fd/owned.rs:526:14
    |
526 |         Self(FileDesc::from_inner(owned_fd))
    |              ^^^^^^^^ use of undeclared type `FileDesc`

error: unreachable call
  --> library/std/src/sys/pal/wasi/../unsupported/pipe.rs:61:9
   |
61 |         Self(inner)

@bors
Copy link
Contributor

bors commented Mar 10, 2025

💔 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 10, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-attributes Area: Attributes (`#[…]`, `#![…]`) A-meta Area: Issues & PRs about the rust-lang/rust repository itself O-unix Operating system: Unix-like O-windows Operating system: Windows 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-libs Relevant to the library team, which will review and decide on the PR/issue.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

10 participants