Remove libc from MSVC targets #124050

saethlin · 2024-04-17T01:00:12Z

@ChrisDenton started working on a project to remove libc from Windows MSVC targets. I'm completing that work here.

The primary change is to cfg out the dependency in library/. And then there's a lot of test patching. Happy to separate this more if people want.

rustbot · 2024-04-17T01:00:20Z

r? @compiler-errors

rustbot has assigned @compiler-errors.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

bors · 2024-04-17T18:31:04Z

☔ The latest upstream changes (presumably #124084) made this pull request unmergeable. Please resolve the merge conflicts.

bors · 2024-04-18T17:07:49Z

☔ The latest upstream changes (presumably #124072) made this pull request unmergeable. Please resolve the merge conflicts.

saethlin · 2024-04-18T17:22:07Z

@ChrisDenton Is there anything else that needs to be done to remove libc from MSVC targets? I feel like this was almost too easy.

ChrisDenton · 2024-04-18T18:18:14Z

There's also #123976.

Also I found the std_detect crate is pulling in libc even if unused. See std uses the default features "std_detect_file_io", and "std_detect_dlsym_getauxval"

rust/library/sysroot/Cargo.toml

Line 14 in 0e15f5e

default = ["std_detect_file_io", "std_detect_dlsym_getauxval", "panic-unwind"]

Which in the std-detect crate enables the libc feature which in turn enables the libc dependency: https://github.com/rust-lang/stdarch/blob/7df81ba8c3e2d02c2ace0c5a6f4f32d800c09e56/crates/std_detect/Cargo.toml#L37

However, libc isn't used for those two features on Windows (it is currently used for a third, not default enabled. feature). But I'm not sure how to have a dependency enabled when it's both feature and target specific.

ChrisDenton · 2024-04-18T18:33:39Z

Rebasing on this PR and excluding libc from std_detect I'm still seeing the following UI test failures:

failures:
    [ui] tests\ui\attributes\unix_sigpipe\unix_sigpipe-inherit.rs
    [ui] tests\ui\attributes\unix_sigpipe\unix_sigpipe-not-used.rs#without_feature
    [ui] tests\ui\attributes\unix_sigpipe\unix_sigpipe-not-used.rs#with_feature
    [ui] tests\ui\attributes\unix_sigpipe\unix_sigpipe-sig_dfl.rs
    [ui] tests\ui\attributes\unix_sigpipe\unix_sigpipe-rustc_main.rs
    [ui] tests\ui\attributes\unix_sigpipe\unix_sigpipe-sig_ign.rs
    [ui] tests\ui\error-codes\E0259.rs
    [ui] tests\ui\feature-gates\rustc-private.rs
    [ui] tests\ui\foreign\foreign-fn-linkname.rs
    [ui] tests\ui\foreign\foreign2.rs
    [ui] tests\ui\imports\issue-37887.rs
    [ui] tests\ui\lint\unnecessary-extern-crate.rs
    [ui] tests\ui\meta\no_std-extern-libc.rs
    [ui] tests\ui\process\no-stdio.rs
    [ui] tests\ui\runtime\stdout-during-shutdown.rs
    [ui] tests\ui\wait-forked-but-failed-child.rs

saethlin · 2024-04-18T20:46:23Z

Ah-ha! That makes more sense.

saethlin · 2024-04-18T21:05:14Z

Now we should be down to

    [ui] tests\ui\foreign\foreign2.rs
    [ui] tests\ui\foreign\foreign-fn-linkname.rs
    [ui] tests\ui\runtime\stdout-during-shutdown.rs
    [ui] tests\ui\wait-forked-but-failed-child.rs

These tests are all pretty unix-y, but I'm going to educate myself a bit and see if there's a way to make a windows equivalent in some cases.

bors · 2024-04-21T01:28:23Z

☔ The latest upstream changes (presumably #124208) made this pull request unmergeable. Please resolve the merge conflicts.

saethlin · 2024-05-15T13:23:44Z

Fix for the nomicon: rust-lang/nomicon#450

CI: fix toolstate publishing Toolstate publishing after something broke was not working (discovered [here](rust-lang#124050 (comment))). The toolstate env. vars should only be needed for the publishing step, so I moved them there. The toolstate script is also being checked in `mingw-check` on PR and auto CI, but it doesn't really seem to do anything, and it shouldn't require the token.

bors · 2024-05-20T08:40:11Z

☔ The latest upstream changes (presumably #124560) made this pull request unmergeable. Please resolve the merge conflicts.

saethlin · 2024-05-20T16:34:33Z

@bors r=ChrisDenton

bors · 2024-05-20T16:34:36Z

📌 Commit 39ef149 has been approved by ChrisDenton

It is now in the queue for this repository.

…sDenton Remove libc from MSVC targets `@ChrisDenton` started working on a project to remove libc from Windows MSVC targets. I'm completing that work here. The primary change is to cfg out the dependency in `library/`. And then there's a lot of test patching. Happy to separate this more if people want.

…iaskrgr Rollup of 6 pull requests Successful merges: - rust-lang#124050 (Remove libc from MSVC targets) - rust-lang#124283 (Note for E0599 if shadowed bindings has the method.) - rust-lang#125123 (Fix `read_exact` and `read_buf_exact` for `&[u8]` and `io:Cursor`) - rust-lang#125158 (hir pretty: fix block indent) - rust-lang#125298 (Add codegen test for array comparision opt) - rust-lang#125332 (Update books) Failed merges: - rust-lang#125310 (Move ~100 tests from tests/ui to subdirs) r? `@ghost` `@rustbot` modify labels: rollup

…iaskrgr Rollup of 8 pull requests Successful merges: - rust-lang#124050 (Remove libc from MSVC targets) - rust-lang#124283 (Note for E0599 if shadowed bindings has the method.) - rust-lang#125123 (Fix `read_exact` and `read_buf_exact` for `&[u8]` and `io:Cursor`) - rust-lang#125158 (hir pretty: fix block indent) - rust-lang#125308 (track cycle participants per root) - rust-lang#125332 (Update books) - rust-lang#125333 (switch to the default implementation of `write_vectored`) - rust-lang#125346 (Remove some `Path::to_str` from `rustc_codegen_llvm`) Failed merges: - rust-lang#125310 (Move ~100 tests from tests/ui to subdirs) r? `@ghost` `@rustbot` modify labels: rollup

Rollup merge of rust-lang#124050 - saethlin:less-sysroot-libc, r=ChrisDenton Remove libc from MSVC targets ``@ChrisDenton`` started working on a project to remove libc from Windows MSVC targets. I'm completing that work here. The primary change is to cfg out the dependency in `library/`. And then there's a lot of test patching. Happy to separate this more if people want.

CI: fix toolstate publishing Toolstate publishing after something broke was not working (discovered [here](rust-lang/rust#124050 (comment))). The toolstate env. vars should only be needed for the publishing step, so I moved them there. The toolstate script is also being checked in `mingw-check` on PR and auto CI, but it doesn't really seem to do anything, and it shouldn't require the token.

rustbot assigned compiler-errors Apr 17, 2024

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. labels Apr 17, 2024

saethlin 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-review Status: Awaiting review from the assignee but also interested parties. labels Apr 17, 2024

saethlin force-pushed the less-sysroot-libc branch from e7cb951 to 934f92d Compare April 17, 2024 22:52

rustbot added A-testsuite Area: The testsuite used to check the correctness of rustc PG-exploit-mitigations Project group: Exploit mitigations T-infra Relevant to the infrastructure team, which will review and decide on the PR/issue. labels Apr 17, 2024

This comment has been minimized.

Sign in to view

saethlin force-pushed the less-sysroot-libc branch 3 times, most recently from 0a688d3 to 45d4e81 Compare April 18, 2024 16:13

saethlin changed the title ~~Remove libc from more tests~~ Remove libc from MSVC targets Apr 18, 2024

saethlin force-pushed the less-sysroot-libc branch from 45d4e81 to fdc9b3d Compare April 18, 2024 17:13

saethlin added the T-libs Relevant to the library team, which will review and decide on the PR/issue. label Apr 18, 2024

saethlin force-pushed the less-sysroot-libc branch from ab82b85 to 7a95ff7 Compare April 18, 2024 21:53

This comment has been minimized.

Sign in to view

saethlin force-pushed the less-sysroot-libc branch from 88a0da2 to b135388 Compare April 21, 2024 03:21

saethlin mentioned this pull request Apr 22, 2024

Update stdarch submodule #124244

Merged

saethlin mentioned this pull request May 15, 2024

Tidy up beneath-std, support Windows-MSVC without libc rust-lang/nomicon#450

Merged

Kobzol mentioned this pull request May 15, 2024

CI: fix toolstate publishing #125145

Merged

saethlin added 10 commits May 20, 2024 11:13

Fix up a few more tests

8d3bc55

Add only-unix to sigpipe tests

e0632d7

Handle a few more simple tests

18b0a07

Add a Windows version of foreign2.rs

281178d

Patch up foreign-fn-linkname.rs

70147cd

Port stdout-during-shutdown

7a906e1

Fix feature-gates/rustc-private.rs

f45a7a2

Update tests/incremental/foreign.rs

30379f9

Remove Windows dependency on libc

aa31281

Undo accidental change to tests/ui/sanitizer/thread.rs

39ef149

saethlin force-pushed the less-sysroot-libc branch from 5995a60 to 39ef149 Compare May 20, 2024 15:18

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 May 20, 2024

matthiaskrgr mentioned this pull request May 20, 2024

Rollup of 6 pull requests #125344

Closed

matthiaskrgr mentioned this pull request May 20, 2024

Rollup of 8 pull requests #125349

Merged

bors merged commit 8903de3 into rust-lang:master May 21, 2024
6 checks passed

rustbot added this to the 1.80.0 milestone May 21, 2024

saethlin deleted the less-sysroot-libc branch May 21, 2024 03:39

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Remove libc from MSVC targets #124050

Remove libc from MSVC targets #124050

saethlin commented Apr 17, 2024 •

edited

rustbot commented Apr 17, 2024

bors commented Apr 17, 2024

This comment has been minimized.

bors commented Apr 18, 2024

saethlin commented Apr 18, 2024

ChrisDenton commented Apr 18, 2024

ChrisDenton commented Apr 18, 2024

saethlin commented Apr 18, 2024

saethlin commented Apr 18, 2024 •

edited

This comment has been minimized.

This comment has been minimized.

bors commented Apr 21, 2024

saethlin commented May 15, 2024

bors commented May 20, 2024

saethlin commented May 20, 2024

bors commented May 20, 2024

Remove libc from MSVC targets #124050

Remove libc from MSVC targets #124050

Conversation

saethlin commented Apr 17, 2024 • edited

rustbot commented Apr 17, 2024

bors commented Apr 17, 2024

This comment has been minimized.

bors commented Apr 18, 2024

saethlin commented Apr 18, 2024

ChrisDenton commented Apr 18, 2024

ChrisDenton commented Apr 18, 2024

saethlin commented Apr 18, 2024

saethlin commented Apr 18, 2024 • edited

This comment has been minimized.

This comment has been minimized.

bors commented Apr 21, 2024

saethlin commented May 15, 2024

bors commented May 20, 2024

saethlin commented May 20, 2024

bors commented May 20, 2024

saethlin commented Apr 17, 2024 •

edited

saethlin commented Apr 18, 2024 •

edited