Skip to content

Rollup of 3 pull requests #142703

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.

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

Closed
wants to merge 8 commits into from
Closed

Conversation

Kobzol
Copy link
Contributor

@Kobzol Kobzol commented Jun 19, 2025

Successful merges:

Failed merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

Forist2034 and others added 8 commits June 14, 2025 06:50
install docs for each target in different directory

Solves rust-lang#140922
…jieyouxu,Shourya742

Add config builder for bootstrap tests

I started writing a bunch of snapshot tests for build/check steps, and quickly realized that the current interface for defining them won't be enough, so I created a simple builder, which can scale to pretty much any kind of configuration in the future.
Update books

## rust-lang/book

1 commits in 4433c9f0cad8460bee05ede040587f8a1fa3f1de..8a6d44e45b7b564eeb6bae30507e1fbac439d72d
2025-06-18 17:06:36 UTC to 2025-06-18 17:06:36 UTC

- Chapter 12 from tech review (rust-lang/book#4410)

## rust-lang/reference

6 commits in d4c66b346f4b72d29e70390a3fa3ea7d4e064db1..50fc1628f36563958399123829c73755fa7a8421
2025-06-19 02:02:39 UTC to 2025-06-17 21:18:46 UTC

- Document inferred const args (`feature(generic_arg_infer)`) (rust-lang/reference#1835)
- const_eval: we allow references to statics and promoteds (rust-lang/reference#1858)
- Fix missing rule on destructors (rust-lang/reference#1861)
- Fix inconsistent heading depth (rust-lang/reference#1860)
- Fix recursive root-accessible grammar check (rust-lang/reference#1852)
- Fix grammar links (rust-lang/reference#1851)

## rust-lang/rust-by-example

1 commits in 9baa9e863116cb9524a177d5a5c475baac18928a..05c7d8bae65f23a1837430c5a19be129d414f5ec
2025-06-18 13:15:17 UTC to 2025-06-18 13:15:17 UTC

- Revert "introduce new `@media` query to set a higher content width on ultra wide screens" (rust-lang/rust-by-example#1939)
@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) rollup A PR which is a rollup labels Jun 19, 2025
@Kobzol
Copy link
Contributor Author

Kobzol commented Jun 19, 2025

@bors r+ rollup=never p=5

@bors
Copy link
Collaborator

bors commented Jun 19, 2025

📌 Commit 026046b has been approved by Kobzol

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 Jun 19, 2025
bors added a commit that referenced this pull request Jun 19, 2025
Rollup of 3 pull requests

Successful merges:

 - #142478 (install docs for each target in different directory)
 - #142629 (Add config builder for bootstrap tests)
 - #142699 (Update books)

Failed merges:

 - #142637 (Remove some glob imports from the type system)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors
Copy link
Collaborator

bors commented Jun 19, 2025

⌛ Testing commit 026046b with merge b6f8df8...

@rust-log-analyzer
Copy link
Collaborator

The job aarch64-apple failed! Check out the build log: (web) (plain)

Click to see the possible cause of the failure (guessed by this bot)

thread 'main' panicked at src/bootstrap/src/bin/rustc.rs:278:37:

Failed to run:
DYLD_LIBRARY_PATH="/Users/runner/work/rust/rust/build/aarch64-apple-darwin/stage1/lib" "/Users/runner/work/rust/rust/build/aarch64-apple-darwin/stage1/bin/rustc" "--crate-name" "build_script_build" "--edition=2021" "/Users/runner/.cargo/registry/src/index.crates.io-1949cf8c6b5b557f/proc-macro2-1.0.95/build.rs" "--error-format=json" "--json=diagnostic-rendered-ansi,artifacts,future-incompat" "--crate-type" "bin" "--emit=dep-info,link" "-C" "embed-bitcode=no" "-C" "debug-assertions=off" "--cfg" "feature=\"default\"" "--cfg" "feature=\"proc-macro\"" "--check-cfg" "cfg(docsrs,test)" "--check-cfg" "cfg(feature, values(\"default\", \"nightly\", \"proc-macro\", \"span-locations\"))" "-C" "metadata=96c1846ce26f45da" "-C" "extra-filename=-1f9ba794885f5d35" "--out-dir" "/Users/runner/work/rust/rust/build/aarch64-apple-darwin/stage1-tools/release/build/proc-macro2-1f9ba794885f5d35" "-L" "dependency=/Users/runner/work/rust/rust/build/aarch64-apple-darwin/stage1-tools/release/deps" "--cap-lints" "allow" "-Z" "binary-dep-depinfo" "--check-cfg=cfg(bootstrap)"
-------------: Os { code: 2, kind: NotFound, message: "No such file or directory" }
note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace
error: could not compile `proc-macro2` (build script)

Caused by:
  process didn't exit successfully: `/Users/runner/work/rust/rust/build/bootstrap/debug/rustc /Users/runner/work/rust/rust/build/bootstrap/debug/rustc --crate-name build_script_build --edition=2021 /Users/runner/.cargo/registry/src/index.crates.io-1949cf8c6b5b557f/proc-macro2-1.0.95/build.rs --error-format=json --json=diagnostic-rendered-ansi,artifacts,future-incompat --crate-type bin --emit=dep-info,link -C embed-bitcode=no -C debug-assertions=off --cfg 'feature="default"' --cfg 'feature="proc-macro"' --check-cfg 'cfg(docsrs,test)' --check-cfg 'cfg(feature, values("default", "nightly", "proc-macro", "span-locations"))' -C metadata=96c1846ce26f45da -C extra-filename=-1f9ba794885f5d35 --out-dir /Users/runner/work/rust/rust/build/aarch64-apple-darwin/stage1-tools/release/build/proc-macro2-1f9ba794885f5d35 -L dependency=/Users/runner/work/rust/rust/build/aarch64-apple-darwin/stage1-tools/release/deps --cap-lints allow -Z binary-dep-depinfo` (exit status: 101)
warning: build failed, waiting for other jobs to finish...

thread 'main' panicked at src/bootstrap/src/bin/rustc.rs:278:37:

Failed to run:
DYLD_LIBRARY_PATH="/Users/runner/work/rust/rust/build/aarch64-apple-darwin/stage1/lib" "/Users/runner/work/rust/rust/build/aarch64-apple-darwin/stage1/bin/rustc" "--crate-name" "unicode_ident" "--edition=2018" "/Users/runner/.cargo/registry/src/index.crates.io-1949cf8c6b5b557f/unicode-ident-1.0.18/src/lib.rs" "--error-format=json" "--json=diagnostic-rendered-ansi,artifacts,future-incompat" "--crate-type" "lib" "--emit=dep-info,metadata,link" "-C" "embed-bitcode=no" "-C" "debug-assertions=off" "--check-cfg" "cfg(docsrs,test)" "--check-cfg" "cfg(feature, values())" "-C" "metadata=d38e8e13b5499f68" "-C" "extra-filename=-299c105385b37d18" "--out-dir" "/Users/runner/work/rust/rust/build/aarch64-apple-darwin/stage1-tools/release/deps" "-L" "dependency=/Users/runner/work/rust/rust/build/aarch64-apple-darwin/stage1-tools/release/deps" "--cap-lints" "allow" "-Z" "binary-dep-depinfo" "--check-cfg=cfg(bootstrap)"
-------------: Os { code: 2, kind: NotFound, message: "No such file or directory" }
note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace

error: could not compile `unicode-ident` (lib)

Caused by:
  process didn't exit successfully: `/Users/runner/work/rust/rust/build/bootstrap/debug/rustc /Users/runner/work/rust/rust/build/bootstrap/debug/rustc --crate-name unicode_ident --edition=2018 /Users/runner/.cargo/registry/src/index.crates.io-1949cf8c6b5b557f/unicode-ident-1.0.18/src/lib.rs --error-format=json --json=diagnostic-rendered-ansi,artifacts,future-incompat --crate-type lib --emit=dep-info,metadata,link -C embed-bitcode=no -C debug-assertions=off --check-cfg 'cfg(docsrs,test)' --check-cfg 'cfg(feature, values())' -C metadata=d38e8e13b5499f68 -C extra-filename=-299c105385b37d18 --out-dir /Users/runner/work/rust/rust/build/aarch64-apple-darwin/stage1-tools/release/deps -L dependency=/Users/runner/work/rust/rust/build/aarch64-apple-darwin/stage1-tools/release/deps --cap-lints allow -Z binary-dep-depinfo` (exit status: 101)
thread 'main' panicked at src/bootstrap/src/bin/rustc.rs:278:37:

Failed to run:
DYLD_LIBRARY_PATH="/Users/runner/work/rust/rust/build/aarch64-apple-darwin/stage1/lib" "/Users/runner/work/rust/rust/build/aarch64-apple-darwin/stage1/bin/rustc" "--crate-name" "build_script_build" "--edition=2021" "/Users/runner/.cargo/registry/src/index.crates.io-1949cf8c6b5b557f/libc-0.2.172/build.rs" "--error-format=json" "--json=diagnostic-rendered-ansi,artifacts,future-incompat" "--crate-type" "bin" "--emit=dep-info,link" "-C" "embed-bitcode=no" "-C" "debug-assertions=off" "--cfg" "feature=\"default\"" "--cfg" "feature=\"std\"" "--check-cfg" "cfg(docsrs,test)" "--check-cfg" "cfg(feature, values(\"align\", \"const-extern-fn\", \"default\", \"extra_traits\", \"rustc-dep-of-std\", \"rustc-std-workspace-core\", \"std\", \"use_std\"))" "-C" "metadata=d64f1e34ec212474" "-C" "extra-filename=-028f8650bbcf6ecd" "--out-dir" "/Users/runner/work/rust/rust/build/aarch64-apple-darwin/stage1-tools/release/build/libc-028f8650bbcf6ecd" "-L" "dependency=/Users/runner/work/rust/rust/build/aarch64-apple-darwin/stage1-tools/release/deps" "--cap-lints" "allow" "-Z" "binary-dep-depinfo" "--check-cfg=cfg(bootstrap)"
-------------: Os { code: 2, kind: NotFound, message: "No such file or directory" }
note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace
error: could not compile `libc` (build script)

Caused by:
  process didn't exit successfully: `/Users/runner/work/rust/rust/build/bootstrap/debug/rustc /Users/runner/work/rust/rust/build/bootstrap/debug/rustc --crate-name build_script_build --edition=2021 /Users/runner/.cargo/registry/src/index.crates.io-1949cf8c6b5b557f/libc-0.2.172/build.rs --error-format=json --json=diagnostic-rendered-ansi,artifacts,future-incompat --crate-type bin --emit=dep-info,link -C embed-bitcode=no -C debug-assertions=off --cfg 'feature="default"' --cfg 'feature="std"' --check-cfg 'cfg(docsrs,test)' --check-cfg 'cfg(feature, values("align", "const-extern-fn", "default", "extra_traits", "rustc-dep-of-std", "rustc-std-workspace-core", "std", "use_std"))' -C metadata=d64f1e34ec212474 -C extra-filename=-028f8650bbcf6ecd --out-dir /Users/runner/work/rust/rust/build/aarch64-apple-darwin/stage1-tools/release/build/libc-028f8650bbcf6ecd -L dependency=/Users/runner/work/rust/rust/build/aarch64-apple-darwin/stage1-tools/release/deps --cap-lints allow -Z binary-dep-depinfo` (exit status: 101)
Build completed unsuccessfully in 1:03:29
  local time: Thu Jun 19 10:37:02 UTC 2025
  network time: Thu, 19 Jun 2025 10:37:02 GMT
##[error]Process completed with exit code 1.
Post job cleanup.

@bors
Copy link
Collaborator

bors commented Jun 19, 2025

💔 Test failed - checks-actions

@bors 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 Jun 19, 2025
@Kobzol Kobzol closed this Jun 19, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
rollup A PR which is a rollup 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)
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants