Rollup of 7 pull requests #124452

matthiaskrgr · 2024-04-27T22:55:47Z

Successful merges:

x vendor #123942 (x vendor)
add test for incremental ICE: slice-pattern-const.rs #83085 #124165 (add test for incremental ICE: slice-pattern-const.rs incremental ICE: slice-pattern-const.rs #83085)
Abort a process when FD ownership is violated #124210 (Abort a process when FD ownership is violated)
bootstrap: Describe build_steps modules #124242 (bootstrap: Describe build_steps modules)
Remove unused [patch] for clippy_lints #124406 (Remove unused [patch] for clippy_lints)
bootstrap: Document struct Builder and its fields #124429 (bootstrap: Document struct Builder and its fields)
Unconditionally call really_init on GNU/Linux #124447 (Unconditionally call really_init on GNU/Linux)

r? @ghost
@rustbot modify labels: rollup

When an EBADF happens then something else already touched an FD in ways it is not allowed to. At that point things can already be arbitrarily bad, e.g. clobbered mmaps. Recovery is not possible. All we can do is hasten the fire.

Fixes rust-lang#83085

The description was most accurate when it was still called rustbuild, and I presume indeed did mostly run in CI. It has become something more so try to describe it better for current-day usage.

Signed-off-by: onur-ozkan <[email protected]>

uses the same machinery as assert_unsafe_precondition

This makes miri not diverge in behavior, it fixes running Rust linux-gnu binaries on musl with gcompat, it fixes dlopen edge-cases that cranelift somehow hits, etc.

…crum `x vendor` This PR implements `x vendor` on bootstrap; enabling dependency vendoring without the need for developers to have `cargo` installed on their system (previously, we suggested running `cargo vendor ...` but now we can accomplish the same task with `x vendor`). In addition, fixes rust-lang#112391 problem.

…ce-incr, r=Mark-Simulacrum add test for incremental ICE: slice-pattern-const.rs rust-lang#83085 Fixes rust-lang#83085

… r=Mark-Simulacrum Abort a process when FD ownership is violated When an owned FD has already been closed before it's dropped that means something else touched an FD in ways it is not allowed to. At that point things can already be arbitrarily bad, e.g. clobbered mmaps. Recovery is not possible. All we can do is hasten the fire. Unlike the previous attempt in rust-lang#124130 this shouldn't suffer from the possibility that FUSE filesystems can return arbitrary errors.

…files-better, r=Mark-Simulacrum bootstrap: Describe build_steps modules One of my preferred ways to understand source code is to start with its API. This implies the code is documented reasonably accurately, even if it is a private API. The description of one of these modules had not been updated since 2015 and so was both terse and confusing, so I rewrote it. Then I noticed many others went unremarked, so I offered some remarks.

…rk-Simulacrum Remove unused `[patch]` for clippy_lints Looks like it was once used by RLS

…imulacrum bootstrap: Document `struct Builder` and its fields I'm exploring the code of bootstrap and had a bit of a hard time understanding exactly what `Builder` is for at first. I decided to help document it and its field to help future explorers.

…nu, r=ChrisDenton Unconditionally call `really_init` on GNU/Linux This makes miri not diverge in behavior, it fixes running Rust linux-gnu binaries on musl with gcompat, it fixes dlopen edge-cases that cranelift somehow hits, etc. Fixes rust-lang#124126 thou hast gazed into this abyss with me: r? `@ChrisDenton`

matthiaskrgr · 2024-04-27T22:56:14Z

@bors r+ rollup=never p=7

bors · 2024-04-27T22:56:17Z

📌 Commit 0b5e173 has been approved by matthiaskrgr

It is now in the queue for this repository.

bors · 2024-04-27T23:00:48Z

⌛ Testing commit 0b5e173 with merge cdd02e9...

…iaskrgr Rollup of 7 pull requests Successful merges: - rust-lang#123942 (`x vendor`) - rust-lang#124165 (add test for incremental ICE: slice-pattern-const.rs rust-lang#83085) - rust-lang#124210 (Abort a process when FD ownership is violated) - rust-lang#124242 (bootstrap: Describe build_steps modules) - rust-lang#124406 (Remove unused `[patch]` for clippy_lints) - rust-lang#124429 (bootstrap: Document `struct Builder` and its fields) - rust-lang#124447 (Unconditionally call `really_init` on GNU/Linux) r? `@ghost` `@rustbot` modify labels: rollup

rust-log-analyzer · 2024-04-27T23:22:08Z

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)

[RUSTC-TIMING] gimli test:false 3.078
[RUSTC-TIMING] object test:false 4.271
warning: dropping unsupported crate type `dylib` for target `wasm32-wasip1`

error[E0425]: cannot find function `debug_assert_fd_is_open` in module `crate::sys::fs`
    |
    |
180 |                 crate::sys::fs::debug_assert_fd_is_open(self.fd);
    |                                 ^^^^^^^^^^^^^^^^^^^^^^^ not found in `crate::sys::fs`
For more information about this error, try `rustc --explain E0425`.
[RUSTC-TIMING] std test:false 2.223
warning: `std` (lib) generated 1 warning
error: could not compile `std` (lib) due to 1 previous error; 1 warning emitted

bors · 2024-04-27T23:22:35Z

💔 Test failed - checks-actions

the8472 and others added 25 commits April 20, 2024 23:20

Abort a process when FD ownership is violated

38ded12

When an EBADF happens then something else already touched an FD in ways it is not allowed to. At that point things can already be arbitrarily bad, e.g. clobbered mmaps. Recovery is not possible. All we can do is hasten the fire.

add test for incremental ICE: slice-pattern-const.rs rust-lang#83085

8088ea0

Fixes rust-lang#83085

bootstrap: Describe build_steps::test for 2024

a2fa934

The description was most accurate when it was still called rustbuild, and I presume indeed did mostly run in CI. It has become something more so try to describe it better for current-day usage.

bootstrap: Describe build_steps::run

2042616

bootstrap: Describe build_steps::toolstate

35ed725

bootstrap: Describe build_steps::suggest

8c40d0e

bootstrap: Describe build_steps::setup

bc37f9e

bootstrap: Demagic a repeating path

ce27ea9

bootstrap: Describe build_steps::clean how 2024 knows it

b756b11

introduce x vendor

67e3668

Signed-off-by: onur-ozkan <[email protected]>

suggest x.py vendor instead of cargo vendor

6dd011d

Signed-off-by: onur-ozkan <[email protected]>

export assert_unsafe_precondition macro for std-internal use

25babe9

put FD validity behind late debug_asserts checking

072c32d

uses the same machinery as assert_unsafe_precondition

bootstrap: link to the forge about toolstate

32aadc5

bootstrap: reinterpret the main advantage of x.py setup

f4e02a1

Remove unused [patch] for clippy_lints

5b5ee0e

bootstrap: Document struct Builder and its fields

4e83776

Unconditionally call really_init

fa73ebb

This makes miri not diverge in behavior, it fixes running Rust linux-gnu binaries on musl with gcompat, it fixes dlopen edge-cases that cranelift somehow hits, etc.

Rollup merge of rust-lang#124165 - matthiaskrgr:slice-pattern-const-i…

609c633

…ce-incr, r=Mark-Simulacrum add test for incremental ICE: slice-pattern-const.rs rust-lang#83085 Fixes rust-lang#83085

Rollup merge of rust-lang#124406 - Alexendoo:cargo-patch-clippy, r=Ma…

919970b

…rk-Simulacrum Remove unused `[patch]` for clippy_lints Looks like it was once used by RLS

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 Apr 27, 2024

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 27, 2024

workingjubilee mentioned this pull request Apr 27, 2024

Abort a process when FD ownership is violated #124210

Merged

matthiaskrgr closed this Apr 27, 2024

matthiaskrgr deleted the rollup-psvo04i branch September 1, 2024 17:36

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Rollup of 7 pull requests #124452

Rollup of 7 pull requests #124452

matthiaskrgr commented Apr 27, 2024

matthiaskrgr commented Apr 27, 2024

bors commented Apr 27, 2024

bors commented Apr 27, 2024

rust-log-analyzer commented Apr 27, 2024

bors commented Apr 27, 2024

Rollup of 7 pull requests #124452

Rollup of 7 pull requests #124452

Conversation

matthiaskrgr commented Apr 27, 2024

matthiaskrgr commented Apr 27, 2024

bors commented Apr 27, 2024

bors commented Apr 27, 2024

rust-log-analyzer commented Apr 27, 2024

bors commented Apr 27, 2024