Prevent `rmake.rs` from using unstable features, and fix 3 run-make tests that currently do #137537

jieyouxu · 2025-02-24T12:26:27Z

Addresses (mostly) #137532.
Follow-up to #137373.

Summary

Fix 3 run-make tests that currently use unstable features:
1. tests/run-make/issue-107495-archive-permissions/rmake.rs uses #![feature(rustc_private)] for libc on unix, but run_make_support already exports libc, so just use that.
2. tests/run-make/cross-lang-lto/rmake.rs uses #![feature(path_file_prefix)] for convenience, replaced with similar filename prefix logic.
3. tests/run-make/broken-pipe-no-ice/rmake.rs uses #![feature(anonymous_pipe)] for anonymous pipes. This is more complicated¹, and I decided to temporarily introduce a dependency on os_pipe before std's anonymous_pipe library feature is stabilized². I left a FIXME tracked by Prevent run-make test recipes (rmake.rs) from using *any* unstable features #137532 to make the switch once anonymous_pipe stabilizes and reaches beta.
Use RUSTC_BOOTSTRAP=-1 when building rmake.rs to have the stage 0 rustc reject any unstable features used in rmake.rs.
The requirement that rmake.rs may not use any unstable features is now documented in rustc-dev-guide.
This PR does not impose RUSTC_BOOTSTRAP=-1 when building run-make-support, but I suppose we could.

r? @Kobzol

try-job: x86_64-msvc-1
try-job: x86_64-mingw-1

We can't just try to spawn rustc and immediate close the stderr handle because of race condition, as there's no guarantee rustc will not try to print to stderr before the handle gets closed. ↩
In-progress stabilization PR over at https://github.com/rust-lang/rust/pull/135822. ↩

jieyouxu · 2025-02-24T12:27:15Z

@rustbot blocked (on #137373)

Kobzol

Thanks! I think that we should do the same for run-make-support (disable unstable features), but it's probably not trivial given it is now defined by a macro. Let me know once this is rebased after my PR is merged.

tests/run-make/issue-107495-archive-permissions/rmake.rs

tests/run-make/cross-lang-lto/rmake.rs

Kobzol · 2025-03-06T08:51:04Z

@rustbot label -S-blocked

rustbot · 2025-03-06T15:18:17Z

These commits modify the Cargo.lock file. Unintentional changes to Cargo.lock can be introduced when switching branches and rebasing PRs.

If this was unintentional then you should revert the changes before this PR is merged.
Otherwise, you can ignore this comment.

The rustc-dev-guide subtree was changed. If this PR only touches the dev guide consider submitting a PR directly to rust-lang/rustc-dev-guide otherwise thank you for updating the dev guide with your changes.

cc @BoxyUwU, @jieyouxu, @Kobzol

BoxyUwU · 2025-03-06T15:28:36Z

TIP: you can start your PR title with the word "wipe" and then it wont be merged, that way you can ensure it isn't merged while its still based on top of another PR

jieyouxu · 2025-03-06T15:37:23Z

TIP: you can start your PR title with the word "wipe" and then it wont be merged, that way you can ensure it isn't merged while its still based on top of another PR

Fair. It's mostly a remark for myself though for the backlinks 😆

jieyouxu · 2025-03-06T15:42:31Z

I think that we should do the same for run-make-support (disable unstable features), but it's probably not trivial given it is now defined by a macro.

I briefly looked at this, doesn't seem worth it to add a special hack to the ToolBuild step or add yet another thing to the macro.

So only rebased, no functional changes.
@rustbot ready

Kobzol · 2025-03-06T15:52:14Z

Thanks, looks good! You can r=me once CI is green.

jieyouxu · 2025-03-06T16:42:09Z

@bors r=Kobzol rollup=maybe

bors · 2025-03-06T16:42:12Z

📌 Commit dcc4c6c has been approved by Kobzol

It is now in the queue for this repository.

Prevent `rmake.rs` from using unstable features, and fix 3 run-make tests that currently do Addresses (mostly) rust-lang#137532. Follow-up to rust-lang#137373. ### Summary - Fix 3 run-make tests that currently use unstable features: 1. `tests/run-make/issue-107495-archive-permissions/rmake.rs` uses `#![feature(rustc_private)]` for `libc` on `unix`, but `run_make_support` already exports `libc`, so just use that. 2. `tests/run-make/cross-lang-lto/rmake.rs` uses `#![feature(path_file_prefix)]` for convenience, replaced with similar filename prefix logic. 3. `tests/run-make/broken-pipe-no-ice/rmake.rs` uses `#![feature(anonymous_pipe)]` for anonymous pipes. This is more complicated[^race-condition], and I decided to temporarily introduce a dependency on [`os_pipe`] before std's `anonymous_pipe` library feature is stabilized[^pipe-stab]. I left a FIXME tracked by rust-lang#137532 to make the switch once `anonymous_pipe` stabilizes and reaches beta. - Use `RUSTC_BOOTSTRAP=-1` when building `rmake.rs` to have the stage 0 rustc reject any unstable features used in `rmake.rs`. - The requirement that `rmake.rs` may not use any unstable features is now documented in rustc-dev-guide. - This PR does not impose `RUSTC_BOOTSTRAP=-1` when building `run-make-support`, but I suppose we could. r? `@Kobzol` [`os_pipe`]: https://github.com/oconnor663/os_pipe.rs [^race-condition]: We can't just try to spawn `rustc` and immediate close the stderr handle because of race condition, as there's no guarantee `rustc` will not try to print to stderr before the handle gets closed. [^pipe-stab]: In-progress stabilization PR over at rust-lang#135822.

…kingjubilee Rollup of 12 pull requests Successful merges: - rust-lang#136667 (Revert vita's c_char back to i8) - rust-lang#136780 (std: move stdio to `sys`) - rust-lang#137107 (Override default `Write` methods for cursor-like types) - rust-lang#137363 (compiler: factor Windows x86-32 ABI impl into its own file) - rust-lang#137528 (Windows: Fix error in `fs::rename` on Windows 1607) - rust-lang#137537 (Prevent `rmake.rs` from using unstable features, and fix 3 run-make tests that currently do) - rust-lang#137777 (Specialize `OsString::push` and `OsString as From` for UTF-8) - rust-lang#137832 (Fix crash in BufReader::peek()) - rust-lang#137904 (Improve the generic MIR in the default `PartialOrd::le` and friends) - rust-lang#138115 (Suggest typo fix for static lifetime) - rust-lang#138125 (Simplify `printf` and shell format suggestions) - rust-lang#138129 (Stabilize const_char_classify, const_sockaddr_setters) r? `@ghost` `@rustbot` modify labels: rollup

jhpratt · 2025-03-07T09:01:49Z

@bors r-

#138146 (comment)

This is already applied for rustc/std tools. This is needed to make `windows` crates avoid trying to depend on a generated `windows.0.xx.0.lib`.

For `broken-pipe-no-ice` until std `anonymous_pipe` stabilizes.

…eature

…ures

jieyouxu · 2025-03-07T11:14:12Z

Cargo.lock

+checksum = "5ffd2b0a5634335b135d5728d84c5e0fd726954b87111f7506a61c502280d982"
+dependencies = [
+ "libc",
+ "windows-sys 0.59.0",


Remark [RAW_DYLIB 1/2]: os_pipe depends on windows-sys which tries to link in windows.0.52.0.lib unless you pass a --cfg windows_raw_dylib. This is already what rustc / rustc tool cargo uses. I.e. the comment

// By default, windows-rs depends on a native library that doesn't get copied into the // sysroot. Passing this cfg enables raw-dylib support instead, which makes the native // library unnecessary. This can be removed when windows-rs enables raw-dylib // unconditionally.

applies here.

jieyouxu · 2025-03-07T11:14:38Z

src/bootstrap/src/core/builder/cargo.rs

+        if let Mode::Rustc | Mode::ToolRustc | Mode::ToolBootstrap = mode {
            rustflags.arg("--cfg=windows_raw_dylib");
        }


Remark [RAW_DYLIB 2/2]: here.

jieyouxu · 2025-03-07T11:15:19Z

src/doc/rustc-dev-guide/src/tests/compiletest.md

+`rmake.rs` and `run-make-support` may *not* use any nightly/unstable features,
+as they must be compilable by a stage 0 rustc that may be a beta or even stable
+rustc.


Remark: adjusted this to also say that run-make-support may not depend on nightly/unstable features.

jieyouxu · 2025-03-07T11:16:02Z

Introducing os_pipe transitively depended on windows-sys, where the usual --cfg windows_raw_dylib workaround is needed.

@rustbot ready

jieyouxu · 2025-03-07T11:16:32Z

This passes on msvc locally, but let's try anyway.
@bors try

Prevent `rmake.rs` from using unstable features, and fix 3 run-make tests that currently do Addresses (mostly) rust-lang#137532. Follow-up to rust-lang#137373. ### Summary - Fix 3 run-make tests that currently use unstable features: 1. `tests/run-make/issue-107495-archive-permissions/rmake.rs` uses `#![feature(rustc_private)]` for `libc` on `unix`, but `run_make_support` already exports `libc`, so just use that. 2. `tests/run-make/cross-lang-lto/rmake.rs` uses `#![feature(path_file_prefix)]` for convenience, replaced with similar filename prefix logic. 3. `tests/run-make/broken-pipe-no-ice/rmake.rs` uses `#![feature(anonymous_pipe)]` for anonymous pipes. This is more complicated[^race-condition], and I decided to temporarily introduce a dependency on [`os_pipe`] before std's `anonymous_pipe` library feature is stabilized[^pipe-stab]. I left a FIXME tracked by rust-lang#137532 to make the switch once `anonymous_pipe` stabilizes and reaches beta. - Use `RUSTC_BOOTSTRAP=-1` when building `rmake.rs` to have the stage 0 rustc reject any unstable features used in `rmake.rs`. - The requirement that `rmake.rs` may not use any unstable features is now documented in rustc-dev-guide. - This PR does not impose `RUSTC_BOOTSTRAP=-1` when building `run-make-support`, but I suppose we could. r? `@Kobzol` try-job: x86_64-msvc-1 try-job: x86_64-mingw-1 [`os_pipe`]: https://github.com/oconnor663/os_pipe.rs [^race-condition]: We can't just try to spawn `rustc` and immediate close the stderr handle because of race condition, as there's no guarantee `rustc` will not try to print to stderr before the handle gets closed. [^pipe-stab]: In-progress stabilization PR over at rust-lang#135822.

bors · 2025-03-07T11:17:43Z

⌛ Trying commit c9c572c with merge 486bfd6...

Kobzol · 2025-03-07T11:39:34Z

You can r=me if the try job passes.

bors · 2025-03-07T14:03:01Z

☀️ Try build successful - checks-actions
Build commit: 486bfd6 (486bfd6307b46a8c375b80de379e0f1df3440659)

jieyouxu · 2025-03-07T14:32:22Z

@bors r=Kobzol

bors · 2025-03-07T14:32:24Z

📌 Commit c9c572c has been approved by Kobzol

It is now in the queue for this repository.

Rollup of 12 pull requests Successful merges: - rust-lang#137337 (Add verbatim linker to AIXLinker) - rust-lang#137363 (compiler: factor Windows x86-32 ABI impl into its own file) - rust-lang#137537 (Prevent `rmake.rs` from using unstable features, and fix 3 run-make tests that currently do) - rust-lang#137606 (add a "future" edition) - rust-lang#137957 (Remove i586-pc-windows-msvc) - rust-lang#138000 (atomic: clarify that failing conditional RMW operations are not 'writes') - rust-lang#138013 (Add post-merge analysis CI workflow) - rust-lang#138033 (rustdoc: Add attribute-related tests for rustdoc JSON.) - rust-lang#138137 (setTargetTriple now accepts Triple rather than string) - rust-lang#138173 (Delay bug for negative auto trait rather than ICEing) - rust-lang#138184 (Allow anyone to relabel `CI-spurious-*`) - rust-lang#138187 (remove clones) r? `@ghost` `@rustbot` modify labels: rollup

Rollup merge of rust-lang#137537 - jieyouxu:daily-rmake, r=Kobzol Prevent `rmake.rs` from using unstable features, and fix 3 run-make tests that currently do Addresses (mostly) rust-lang#137532. Follow-up to rust-lang#137373. ### Summary - Fix 3 run-make tests that currently use unstable features: 1. `tests/run-make/issue-107495-archive-permissions/rmake.rs` uses `#![feature(rustc_private)]` for `libc` on `unix`, but `run_make_support` already exports `libc`, so just use that. 2. `tests/run-make/cross-lang-lto/rmake.rs` uses `#![feature(path_file_prefix)]` for convenience, replaced with similar filename prefix logic. 3. `tests/run-make/broken-pipe-no-ice/rmake.rs` uses `#![feature(anonymous_pipe)]` for anonymous pipes. This is more complicated[^race-condition], and I decided to temporarily introduce a dependency on [`os_pipe`] before std's `anonymous_pipe` library feature is stabilized[^pipe-stab]. I left a FIXME tracked by rust-lang#137532 to make the switch once `anonymous_pipe` stabilizes and reaches beta. - Use `RUSTC_BOOTSTRAP=-1` when building `rmake.rs` to have the stage 0 rustc reject any unstable features used in `rmake.rs`. - The requirement that `rmake.rs` may not use any unstable features is now documented in rustc-dev-guide. - This PR does not impose `RUSTC_BOOTSTRAP=-1` when building `run-make-support`, but I suppose we could. r? `@Kobzol` try-job: x86_64-msvc-1 try-job: x86_64-mingw-1 [`os_pipe`]: https://github.com/oconnor663/os_pipe.rs [^race-condition]: We can't just try to spawn `rustc` and immediate close the stderr handle because of race condition, as there's no guarantee `rustc` will not try to print to stderr before the handle gets closed. [^pipe-stab]: In-progress stabilization PR over at rust-lang#135822.

rustbot assigned Kobzol Feb 24, 2025

rustbot added the S-blocked Status: Blocked on something else such as an RFC or other implementation work. label Feb 24, 2025

jieyouxu mentioned this pull request Feb 24, 2025

Compile run-make-support and run-make tests with the bootstrap compiler #137373

Merged

Kobzol reviewed Feb 24, 2025

View reviewed changes

tests/run-make/issue-107495-archive-permissions/rmake.rs Outdated Show resolved Hide resolved

tests/run-make/cross-lang-lto/rmake.rs Show resolved Hide resolved

jieyouxu mentioned this pull request Feb 28, 2025

Stablize anonymous pipe #137793

Open

jieyouxu added the T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) label Feb 28, 2025

rustbot removed the S-blocked Status: Blocked on something else such as an RFC or other implementation work. label Mar 6, 2025

jieyouxu added the S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. label Mar 6, 2025

jieyouxu force-pushed the daily-rmake branch from 3d2ee5e to dcc4c6c Compare March 6, 2025 15:18

rustbot added A-compiletest Area: The compiletest test runner A-run-make Area: port run-make Makefiles to rmake.rs A-rustc-dev-guide Area: rustc-dev-guide A-testsuite Area: The testsuite used to check the correctness of rustc labels Mar 6, 2025

rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Mar 6, 2025

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 6, 2025

workingjubilee mentioned this pull request Mar 7, 2025

Rollup of 12 pull requests #138146

Closed

bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Mar 7, 2025

jieyouxu and others added 7 commits March 7, 2025 19:07

Apply --cfg windows_raw_dylib for bootstrap tools too

ec3cde2

This is already applied for rustc/std tools. This is needed to make `windows` crates avoid trying to depend on a generated `windows.0.xx.0.lib`.

Prevent rmake.rs from using any nightly/unstable features

bd884d8

Fix issue-107495-archive-permissions to not rely on rustc_private

da57f14

Fix cross-lang-lto to not use path_file_prefix

9befcfd

Temporarily depend on os_pipe in run-make-support and re-export it

d47e5a3

For `broken-pipe-no-ice` until std `anonymous_pipe` stabilizes.

Fix broken-pipe-no-ice to not depend on unstable anonymous_pipe f…

224f287

…eature

Document that rmake.rs/run-make-support may not use unstable feat…

c9c572c

…ures

jieyouxu force-pushed the daily-rmake branch from dcc4c6c to c9c572c Compare March 7, 2025 11:11

jieyouxu commented Mar 7, 2025

View reviewed changes

rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Mar 7, 2025

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 7, 2025

jhpratt mentioned this pull request Mar 8, 2025

Rollup of 12 pull requests #138202

Merged

bors merged commit 9c82eaf into rust-lang:master Mar 8, 2025
7 checks passed

rustbot added this to the 1.87.0 milestone Mar 8, 2025

jieyouxu deleted the daily-rmake branch March 8, 2025 06:37

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Prevent `rmake.rs` from using unstable features, and fix 3 run-make tests that currently do #137537

Prevent `rmake.rs` from using unstable features, and fix 3 run-make tests that currently do #137537

jieyouxu commented Feb 24, 2025 •

edited

Loading

jieyouxu commented Feb 24, 2025

Kobzol left a comment

Kobzol commented Mar 6, 2025

rustbot commented Mar 6, 2025

BoxyUwU commented Mar 6, 2025

jieyouxu commented Mar 6, 2025 •

edited

Loading

jieyouxu commented Mar 6, 2025

Kobzol commented Mar 6, 2025

jieyouxu commented Mar 6, 2025

bors commented Mar 6, 2025

jhpratt commented Mar 7, 2025

jieyouxu Mar 7, 2025

jieyouxu Mar 7, 2025

jieyouxu Mar 7, 2025

jieyouxu commented Mar 7, 2025

jieyouxu commented Mar 7, 2025

bors commented Mar 7, 2025

Kobzol commented Mar 7, 2025

bors commented Mar 7, 2025

jieyouxu commented Mar 7, 2025

bors commented Mar 7, 2025

Prevent rmake.rs from using unstable features, and fix 3 run-make tests that currently do #137537

Prevent rmake.rs from using unstable features, and fix 3 run-make tests that currently do #137537

Conversation

jieyouxu commented Feb 24, 2025 • edited Loading

Summary

Footnotes

jieyouxu commented Feb 24, 2025

Kobzol left a comment

Choose a reason for hiding this comment

Kobzol commented Mar 6, 2025

rustbot commented Mar 6, 2025

BoxyUwU commented Mar 6, 2025

jieyouxu commented Mar 6, 2025 • edited Loading

jieyouxu commented Mar 6, 2025

Kobzol commented Mar 6, 2025

jieyouxu commented Mar 6, 2025

bors commented Mar 6, 2025

jhpratt commented Mar 7, 2025

jieyouxu Mar 7, 2025

Choose a reason for hiding this comment

jieyouxu Mar 7, 2025

Choose a reason for hiding this comment

jieyouxu Mar 7, 2025

Choose a reason for hiding this comment

jieyouxu commented Mar 7, 2025

jieyouxu commented Mar 7, 2025

bors commented Mar 7, 2025

Kobzol commented Mar 7, 2025

bors commented Mar 7, 2025

jieyouxu commented Mar 7, 2025

bors commented Mar 7, 2025

Prevent `rmake.rs` from using unstable features, and fix 3 run-make tests that currently do #137537

Prevent `rmake.rs` from using unstable features, and fix 3 run-make tests that currently do #137537

jieyouxu commented Feb 24, 2025 •

edited

Loading

jieyouxu commented Mar 6, 2025 •

edited

Loading