handle no_std targets on std builds #128182

onur-ozkan · 2024-07-25T13:07:22Z

This PR unifies the Step::run_make logic and improves it by skipping std specific crates for no_std targets. In addition, since we now handle library crates properly, bootstrap is capable of running x doc library even for no_std targets as it is able to generate documentation for alloc crate from the standard library.

Resolves #128027

cc @ChrisDenton

rustbot · 2024-07-25T13:07:32Z

r? @Mark-Simulacrum

rustbot has assigned @Mark-Simulacrum.
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

ChrisDenton · 2024-07-25T14:43:01Z

This seems to work locally on individual targets but I am getting ICEs when checking a lot of targets at once. E.g. ./x check std aarch64-kmc-solid_asp3 works on its own but when included with a large number of other targets I get:

thread 'rustc' panicked at compiler\rustc_codegen_ssa\src\back\link.rs:86:13:
compiler\rustc_codegen_ssa\src\back\link.rs:86:13: invalid output type `Executable` for target os `aarch64-kmc-solid_asp3`

I've not managed to narrowed it down but it could be there's a specific other target that's causing issues when they're used together.

onur-ozkan · 2024-07-25T20:03:07Z

it could be there's a specific other target that's causing issues when they're used together.

Probably.

onur-ozkan · 2024-07-26T06:00:42Z

src/bootstrap/src/core/build_steps/compile.rs

+    // FIXME: Extend builder tests to cover the `crates` field of `Std` instances.
+    if cfg!(feature = "bootstrap-self-test") {
+        return vec![];
+    }


Additional context:

rust/src/bootstrap/src/core/builder/tests.rs

Lines 60 to 62 in 72d73ce

macro_rules! std {

($host:ident => $target:ident, stage = $stage:literal) => {

compile::Std::new(

That above and doc_std helper macros needs to be improved to mock crates field in Std with relevant values.

onur-ozkan · 2024-07-26T06:00:53Z

@rustbot ready

Mark-Simulacrum · 2024-07-28T18:40:42Z

@bors r+ rollup

bors · 2024-07-28T18:40:45Z

📌 Commit 47122e3 has been approved by Mark-Simulacrum

It is now in the queue for this repository.

…rk-Simulacrum handle no_std targets on std builds This PR unifies the `Step::run_make` logic and improves it by skipping std specific crates for no_std targets. In addition, since we now handle library crates properly, bootstrap is capable of running `x doc library` even for no_std targets as it is able to generate documentation for `alloc` crate from the standard library. Resolves rust-lang#128027 cc `@ChrisDenton`

Rollup of 4 pull requests Successful merges: - rust-lang#109174 (Replace `io::Cursor::{remaining_slice, is_empty}`) - rust-lang#128147 (migrate fmt-write-bloat to rmake) - rust-lang#128182 (handle no_std targets on std builds) - rust-lang#128310 (Add missing periods on `BTreeMap` cursor `peek_next` docs) Failed merges: - rust-lang#128269 (improve cargo invocations on bootstrap) r? `@ghost` `@rustbot` modify labels: rollup

…iaskrgr Rollup of 5 pull requests Successful merges: - rust-lang#109174 (Replace `io::Cursor::{remaining_slice, is_empty}`) - rust-lang#127290 (Fully document `rustdoc-json-types`) - rust-lang#128055 (std: unsafe-wrap personality::dwarf::eh) - rust-lang#128269 (improve cargo invocations on bootstrap) - rust-lang#128310 (Add missing periods on `BTreeMap` cursor `peek_next` docs) Failed merges: - rust-lang#127543 (More unsafe attr verification) - rust-lang#128182 (handle no_std targets on std builds) r? `@ghost` `@rustbot` modify labels: rollup

bors · 2024-07-29T06:04:11Z

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

This change unifies the `Step::run_make` logic and improves it by skipping std specific crates for no_std targets. Signed-off-by: onur-ozkan <[email protected]>

Since we now handle library crates properly, there's no need to panic for `no_std` targets anymore. `x doc library` now generates documentation for the `alloc` crate from standard library. Signed-off-by: onur-ozkan <[email protected]>

`crates` field is handled in the `Step::make_run` just like in any other `Std` implementation, so we don't need to resolve them in `Std::new`. Signed-off-by: onur-ozkan <[email protected]>

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

onur-ozkan · 2024-07-29T08:54:21Z

Rebased.

@bors r=Mark-Simulacrum

bors · 2024-07-29T08:54:24Z

📌 Commit f56d58e has been approved by Mark-Simulacrum

It is now in the queue for this repository.

…rk-Simulacrum handle no_std targets on std builds This PR unifies the `Step::run_make` logic and improves it by skipping std specific crates for no_std targets. In addition, since we now handle library crates properly, bootstrap is capable of running `x doc library` even for no_std targets as it is able to generate documentation for `alloc` crate from the standard library. Resolves rust-lang#128027 cc `@ChrisDenton`

…iaskrgr Rollup of 6 pull requests Successful merges: - rust-lang#128182 (handle no_std targets on std builds) - rust-lang#128277 (miri: fix offset_from behavior on wildcard pointers) - rust-lang#128304 (Isolate the diagnostic code that expects `thir::Pat` to be printable) - rust-lang#128307 (Clean and enable `rustdoc::unescaped_backticks` for `core/alloc/std/test/proc_macro`) - rust-lang#128322 (CI: move RFL job forward to v6.11-rc1) - rust-lang#128333 (Miri subtree update) r? `@ghost` `@rustbot` modify labels: rollup

Rollup merge of rust-lang#128182 - onur-ozkan:fix-no-std-crates, r=Mark-Simulacrum handle no_std targets on std builds This PR unifies the `Step::run_make` logic and improves it by skipping std specific crates for no_std targets. In addition, since we now handle library crates properly, bootstrap is capable of running `x doc library` even for no_std targets as it is able to generate documentation for `alloc` crate from the standard library. Resolves rust-lang#128027 cc ``@ChrisDenton``

This fixes a regression from rust-lang#128182. Signed-off-by: onur-ozkan <[email protected]>

handle crates when they are not specified for std docs Fixes a regression from rust-lang#128182. Resolves rust-lang#128610

Rollup merge of rust-lang#128631 - onur-ozkan:hotfix, r=Mark-Simulacrum handle crates when they are not specified for std docs Fixes a regression from rust-lang#128182. Resolves rust-lang#128610

rustbot assigned Mark-Simulacrum Jul 25, 2024

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) labels Jul 25, 2024

This comment has been minimized.

Sign in to view

onur-ozkan 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 Jul 26, 2024

onur-ozkan commented Jul 26, 2024

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 Jul 26, 2024

onur-ozkan force-pushed the fix-no-std-crates branch from cfe8fe2 to 47122e3 Compare July 26, 2024 06:02

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 Jul 28, 2024

tgross35 mentioned this pull request Jul 28, 2024

Rollup of 4 pull requests #128319

Closed

matthiaskrgr mentioned this pull request Jul 29, 2024

Rollup of 5 pull requests #128330

Merged

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 Jul 29, 2024

onur-ozkan force-pushed the fix-no-std-crates branch from 47122e3 to 9e29f23 Compare July 29, 2024 07:36

onur-ozkan added 2 commits July 29, 2024 10:43

handle no_std targets on std builds

6e24719

This change unifies the `Step::run_make` logic and improves it by skipping std specific crates for no_std targets. Signed-off-by: onur-ozkan <[email protected]>

allow running x doc on std for no_std targets

4c87e84

Since we now handle library crates properly, there's no need to panic for `no_std` targets anymore. `x doc library` now generates documentation for the `alloc` crate from standard library. Signed-off-by: onur-ozkan <[email protected]>

onur-ozkan added 2 commits July 29, 2024 10:43

remove the requirement of Builder arg in doc::Std::new function

d3aed2c

`crates` field is handled in the `Step::make_run` just like in any other `Std` implementation, so we don't need to resolve them in `Std::new`. Signed-off-by: onur-ozkan <[email protected]>

ignore crates if running unit tests

f56d58e

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

onur-ozkan force-pushed the fix-no-std-crates branch from 9e29f23 to f56d58e Compare July 29, 2024 07:46

onur-ozkan 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 Jul 29, 2024

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 Jul 29, 2024

This was referenced Jul 29, 2024

Rollup of 4 pull requests #128332

Closed

Rollup of 6 pull requests #128334

Merged

bors merged commit 7e6943d into rust-lang:master Jul 29, 2024
6 checks passed

rustbot added this to the 1.82.0 milestone Jul 29, 2024

onur-ozkan deleted the fix-no-std-crates branch July 29, 2024 12:32

LukeMathWalker mentioned this pull request Aug 3, 2024

[rustdoc-json] Regression — core.json, alloc.json and std.json are no longer available on nightly for rust-docs-json component #128610

Closed

onur-ozkan added a commit to onur-ozkan/rust that referenced this pull request Aug 4, 2024

precompute the std crates before documenting for rust-docs-json

384de54

This fixes a regression from rust-lang#128182. Signed-off-by: onur-ozkan <[email protected]>

onur-ozkan mentioned this pull request Aug 4, 2024

handle crates when they are not specified for std docs #128631

Merged

onur-ozkan added a commit to onur-ozkan/rust that referenced this pull request Aug 4, 2024

handle crates when they are not specified for std json docs

ebaea3d

This fixes a regression from rust-lang#128182. Signed-off-by: onur-ozkan <[email protected]>

onur-ozkan added a commit to onur-ozkan/rust that referenced this pull request Aug 4, 2024

handle crates when they are not specified for std docs

5f0e0a6

This fixes a regression from rust-lang#128182. Signed-off-by: onur-ozkan <[email protected]>

onur-ozkan added a commit to onur-ozkan/rust that referenced this pull request Aug 4, 2024

handle crates when they are not specified for std docs

2ac0969

This fixes a regression from rust-lang#128182. Signed-off-by: onur-ozkan <[email protected]>

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

handle no_std targets on std builds #128182

handle no_std targets on std builds #128182

onur-ozkan commented Jul 25, 2024

rustbot commented Jul 25, 2024

This comment has been minimized.

ChrisDenton commented Jul 25, 2024 •

edited

Loading

onur-ozkan commented Jul 25, 2024

onur-ozkan Jul 26, 2024

onur-ozkan commented Jul 26, 2024

Mark-Simulacrum commented Jul 28, 2024

bors commented Jul 28, 2024

bors commented Jul 29, 2024

onur-ozkan commented Jul 29, 2024

bors commented Jul 29, 2024

	macro_rules! std {
	($host:ident => $target:ident, stage = $stage:literal) => {
	compile::Std::new(

handle no_std targets on std builds #128182

handle no_std targets on std builds #128182

Conversation

onur-ozkan commented Jul 25, 2024

rustbot commented Jul 25, 2024

This comment has been minimized.

ChrisDenton commented Jul 25, 2024 • edited Loading

onur-ozkan commented Jul 25, 2024

onur-ozkan Jul 26, 2024

Choose a reason for hiding this comment

onur-ozkan commented Jul 26, 2024

Mark-Simulacrum commented Jul 28, 2024

bors commented Jul 28, 2024

bors commented Jul 29, 2024

onur-ozkan commented Jul 29, 2024

bors commented Jul 29, 2024

ChrisDenton commented Jul 25, 2024 •

edited

Loading