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.

Sign up for GitHub

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

Jump to bottom

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

Merged
merged 1 commit into from
Aug 5, 2024
Merged

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

merged 1 commit into from
Aug 5, 2024

Conversation

onur-ozkan
Copy link
Member

@onur-ozkan onur-ozkan commented Aug 4, 2024 •
edited
Loading

Fixes a regression from #128182.

Resolves #128610

@rustbot
Copy link
Collaborator

rustbot commented Aug 4, 2024

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

@rustbot 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 Aug 4, 2024
@onur-ozkan onur-ozkan mentioned this pull request Aug 4, 2024
Closed
@onur-ozkan onur-ozkan force-pushed the hotfix branch 2 times, most recently from ebaea3d to 5f0e0a6 Compare August 4, 2024 09:10
@onur-ozkan onur-ozkan changed the title precompute the std crates before documenting for rust-docs-json handle crates when they are not specified for std docs Aug 4, 2024
@onur-ozkan
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]>
@aDotInTheVoid
Copy link
Member

question (as someone who doesn’t understand bootstrap/rustup components): is it possible to add a test for this? can we ensure that the rust-docs-json is gaurenteed to have std.json and this doesn’t regress again?

@onur-ozkan
Copy link
Member Author

question (as someone who doesn’t understand bootstrap/rustup components): is it possible to add a test for this? can we ensure that the rust-docs-json is gaurenteed to have std.json and this doesn’t regress again?

There are a few ways to test it, but I wasn't sure where to handle/test it. The best way might be to mock the bootstrap tests, but that requires huge work. This should be enough until then.

@Mark-Simulacrum
Copy link
Member

@bors r+

@bors
Copy link
Contributor

bors commented Aug 4, 2024

📌 Commit b64260e has been approved by Mark-Simulacrum

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 Aug 4, 2024
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Aug 4, 2024
@matthiaskrgr
Rollup merge of rust-lang#128631 - onur-ozkan:hotfix, r=Mark-Simulacrum
0fefb37 
handle crates when they are not specified for std docs

Fixes a regression from rust-lang#128182.

Resolves rust-lang#128610
@matthiaskrgr matthiaskrgr mentioned this pull request Aug 4, 2024
Closed
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@aDotInTheVoid
Copy link
Member

Actual failure:

  
  ---- core::builder::tests::dist::dist_baseline stdout ----
  thread 'core::builder::tests::dist::dist_baseline' panicked at src/core/build_steps/dist.rs:117:13:
  rust-docs-json is missing `alloc.json`.
  note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace
  
  ---- core::builder::tests::dist::dist_with_empty_host stdout ----
  thread 'core::builder::tests::dist::dist_with_empty_host' panicked at src/core/build_steps/dist.rs:117:13:
  rust-docs-json is missing `alloc.json`.
  
  ---- core::builder::tests::dist::dist_with_hosts stdout ----
  thread 'core::builder::tests::dist::dist_with_hosts' panicked at src/core/build_steps/dist.rs:117:13:
  rust-docs-json is missing `alloc.json`.
  
  ---- core::builder::tests::dist::dist_with_same_targets_and_hosts stdout ----
  thread 'core::builder::tests::dist::dist_with_same_targets_and_hosts' panicked at src/core/build_steps/dist.rs:117:13:
  rust-docs-json is missing `alloc.json`.
  
  ---- core::builder::tests::dist::dist_with_targets stdout ----
  thread 'core::builder::tests::dist::dist_with_targets' panicked at src/core/build_steps/dist.rs:117:13:
  rust-docs-json is missing `alloc.json`.
  
  ---- core::builder::tests::dist::dist_with_targets_and_hosts stdout ----
  thread 'core::builder::tests::dist::dist_with_targets_and_hosts' panicked at src/core/build_steps/dist.rs:117:13:
  rust-docs-json is missing `alloc.json`.

@matthiaskrgr
Copy link
Member

@bors r- rollup=iffy

@bors 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 Aug 4, 2024
@onur-ozkan
Copy link
Member Author

@bors r=Mark-Simulacrum rollup

@bors
Copy link
Contributor

bors commented Aug 4, 2024

📌 Commit 491edbf has been approved by Mark-Simulacrum

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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Aug 4, 2024
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Aug 4, 2024
@matthiaskrgr
Rollup merge of rust-lang#128631 - onur-ozkan:hotfix, r=Mark-Simulacrum
9710488 
handle crates when they are not specified for std docs

Fixes a regression from rust-lang#128182.

Resolves rust-lang#128610
@matthiaskrgr matthiaskrgr mentioned this pull request Aug 4, 2024
Closed
bors added a commit to rust-lang-ci/rust that referenced this pull request Aug 4, 2024
@bors
Auto merge of rust-lang#128658 - matthiaskrgr:rollup-6w3xsco, r=matth…
6963d0f 
…iaskrgr

Rollup of 8 pull requests

Successful merges:

 - rust-lang#127655 (turn `invalid_type_param_default` into a `FutureReleaseErrorReportInDeps`)
 - rust-lang#127974 (force compiling std from source if modified)
 - rust-lang#128026 (std::thread: available_parallelism implementation for vxWorks proposal.)
 - rust-lang#128309 (Implement cursors for `BTreeSet`)
 - rust-lang#128500 (Add test for updating enum discriminant through pointer)
 - rust-lang#128630 (docs(resolve): more explain about `target`)
 - rust-lang#128631 (handle crates when they are not specified for std docs)
 - rust-lang#128638 (run-make: enable msvc for `link-dedup`)

r? `@ghost`
`@rustbot` modify labels: rollup
@matthiaskrgr
Copy link
Member

@bors r- rollup=never

@bors 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 Aug 4, 2024
onur-ozkan
onur-ozkan commented Aug 5, 2024
View reviewed changes
src/bootstrap/src/core/build_steps/dist.rs Outdated
Comment on lines 117 to 118
for f in ["alloc.json", "core.json", "std.json"] {
assert!(out.join(f).exists(), "rust-docs-json is missing `{f}`.");
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I guess we should do this only for the t1 targets?

@onur-ozkan
Copy link
Member Author

@rustbot ready

@rustbot 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 Aug 5, 2024
@onur-ozkan
Copy link
Member Author

Reverted 2nd commit to unblock this hotfix. We can add that sanity check later.

@bors r=Mark-Simulacrum rollup

@bors
Copy link
Contributor

bors commented Aug 5, 2024

📌 Commit 2ac0969 has been approved by Mark-Simulacrum

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 Aug 5, 2024
@matthiaskrgr matthiaskrgr mentioned this pull request Aug 5, 2024
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Aug 5, 2024
@bors
Auto merge of rust-lang#128689 - matthiaskrgr:rollup-ukyn8wq, r=matth…
f7eefec 
…iaskrgr

Rollup of 5 pull requests

Successful merges:

 - rust-lang#128385 (rustdoc-json: discard non-local inherent impls for primitives)
 - rust-lang#128559 (Don't re-elaborated already elaborated caller bounds in method probe)
 - rust-lang#128631 (handle crates when they are not specified for std docs)
 - rust-lang#128664 (Add `Debug` impls to API types in `rustc_codegen_ssa`)
 - rust-lang#128686 (fix the invalid argument type)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 9d924d1 into rust-lang:master Aug 5, 2024
12 checks passed
@rustbot rustbot added this to the 1.82.0 milestone Aug 5, 2024
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Aug 5, 2024
@rust-timer
Unrolled build for rust-lang#128631
eed49b4 
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
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@Mark-Simulacrum Mark-Simulacrum

Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap)
Projects
None yet
Milestone
1.82.0
7 participants
@onur-ozkan @rustbot @aDotInTheVoid @Mark-Simulacrum @bors @rust-log-analyzer @matthiaskrgr