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.

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

Rollup of 9 pull requests #137545

Closed
wants to merge 26 commits into from

Conversation

GuillaumeGomez
Copy link
Member

Successful merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

robertbastian and others added 26 commits February 9, 2025 17:08
$ ./configure
configure: processing command line
configure:
configure: build.configure-args := []
configure: profile              := dist
configure:
configure: writing `config.toml` in current directory
configure:
configure: run `python /mnt/filling/store/nabijaczleweli/code/rust/x.py --help`

This is naturally not valid since I don't have a "python" executable
(and this will hopefully become more and more true as Python 2 dies out).

./configure knows this since it does try python3 "$@", then python2.7 &c.

After, this now says
  configure: run `python3 /mnt/filling/store/nabijaczleweli/code/rust/x.py --help`
which is possible, and corresponds to the interpreter actually running.
Co-authored-by: Amanieu d'Antras <amanieu@gmail.com>
On MIPS the DWARF version is stored in 2 bytes with the `.2byte`
assembler directive.
Update `String::from_raw_parts` safety requirements

These have become out of sync with `Vec::from_raw_part`'s safety requirements, and are likely to diverge again. I think it's safest to just point at `Vec`'s requirements.

rust-lang#119206 (comment)
…ouxu

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

It does not seem necessary to have to recompile run-make-support on changes to the local compiler/stdlib. This PR simplifies the implementation of a few tools, then switches rms to stage0 and also makes the handling of environment variables in run-make tests simpler.

Best reviewed commit-by-commit. I can split it into multiple PRs if you want.

Also tested that `COMPILETEST_FORCE_STAGE0=1 ./x test tests/run-make --stage 0` still works. Incredibly, it looks like it even passes more tests than on `master` 😆

r? `@jieyouxu`

try-job: x86_64-apple-1
try-job: x86_64-apple-2
try-job: aarch64-apple
try-job: x86_64-msvc-1
try-job: x86_64-msvc-2
try-job: x86_64-mingw-1
try-job: x86_64-mingw-2
…ust_be_overridden, r=oli-obk

remove `#[rustc_intrinsic_must_be_overridde]`

In rust-lang#135031, we gained support for just leaving away the body. Now that the bootstrap compiler got bumped, stop using the old style and remove support for it.

r? `@oli-obk`

There are a few more mentions of this attribute in RA code that I didn't touch; Cc `@rust-lang/rust-analyzer`
configure.py: don't instruct user to run nonexistent program

```shell-session
$ ./configure
configure: processing command line
configure:
configure: build.configure-args := []
configure: profile              := dist
configure:
configure: writing `config.toml` in current directory
configure:
configure: run `python /mnt/filling/store/nabijaczleweli/code/rust/x.py --help`
```

This is naturally not valid since I don't have a "python" executable (and this will hopefully become more and more true as Python 2 dies out).

./configure knows this since it does `try python3 "$`@"`,` then `python2.7` &c.

After, this now says
```
configure: run `python3 /mnt/filling/store/nabijaczleweli/code/rust/x.py --help`
```
which is possible, and corresponds to the interpreter actually running.
…nup, r=Amanieu

remove some unnecessary rustc_const_unstable

If the function is anyway unstable, it doesn't need to be `rustc_const_unstable`.

`copy_from_slice` turns out to not do anything const-unstable itself, we just haven't stably committed to it being available in const yet. See [here](https://rustc-dev-guide.rust-lang.org/stability.html?highlight=rustc_const_stable_indirect) for more details on the `rustc_const_stable_indirect` attribute.
Update stdarch

Update stdarch to fix rust-lang#137419. (This also pulls in a lot of other changes though).

r? `@Amanieu`
…, r=jieyouxu

DWARF mixed versions with LTO on MIPS

On MIPS the DWARF version is stored in 2 bytes with the `.2byte` assembler directive.
… r=notriddle

 Add rustdoc-gui regression test for rust-lang#137082

Fixes rust-lang#137082.

Added new commands in `browser-ui-test` allowing us to add a regression test for rust-lang#137082 and also another to copy code examples content.

r? `@notriddle`
std: Fix another new symlink test on Windows

Checking for `got_symlink_permission` first is a standard procedure for such tests.
@rustbot rustbot added A-compiletest Area: The compiletest test runner A-run-make Area: port run-make Makefiles to rmake.rs A-testsuite Area: The testsuite used to check the correctness of rustc S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Feb 24, 2025
@rustbot rustbot added T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-infra Relevant to the infrastructure team, which will review and decide on the PR/issue. T-libs Relevant to the library team, which will review and decide on the PR/issue. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. T-rustdoc-frontend Relevant to the rustdoc-frontend team, which will review and decide on the web UI/UX output. rollup A PR which is a rollup labels Feb 24, 2025
@GuillaumeGomez
Copy link
Member Author

@bors r+ p=5 rollup=never

@bors
Copy link
Contributor

bors commented Feb 24, 2025

📌 Commit 892c26a has been approved by GuillaumeGomez

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 Feb 24, 2025
@bors
Copy link
Contributor

bors commented Feb 24, 2025

⌛ Testing commit 892c26a with merge 771f3a0...

bors added a commit to rust-lang-ci/rust that referenced this pull request Feb 24, 2025
…llaumeGomez

Rollup of 9 pull requests

Successful merges:

 - rust-lang#136775 (Update `String::from_raw_parts` safety requirements)
 - rust-lang#137373 (Compile run-make-support and run-make tests with the bootstrap compiler)
 - rust-lang#137489 (remove `#[rustc_intrinsic_must_be_overridde]`)
 - rust-lang#137493 (configure.py: don't instruct user to run nonexistent program)
 - rust-lang#137516 (remove some unnecessary rustc_const_unstable)
 - rust-lang#137527 (Update stdarch)
 - rust-lang#137530 (DWARF mixed versions with LTO on MIPS)
 - rust-lang#137539 ( Add rustdoc-gui regression test for rust-lang#137082 )
 - rust-lang#137543 (std: Fix another new symlink test on Windows)

r? `@ghost`
`@rustbot` modify labels: rollup
@rust-log-analyzer
Copy link
Collaborator

The job test-various failed! Check out the build log: (web) (plain)

Click to see the possible cause of the failure (guessed by this bot)
   Compiling lld-wrapper v0.1.0 (/checkout/src/tools/lld-wrapper)
[RUSTC-TIMING] lld_wrapper test:false 0.238
    Finished `release` profile [optimized] target(s) in 0.42s
##[endgroup]
[TIMING] core::build_steps::tool::ToolBuild { compiler: Compiler { stage: 0, host: x86_64-unknown-linux-gnu }, target: x86_64-unknown-linux-gnu, tool: "lld-wrapper", path: "src/tools/lld-wrapper", mode: ToolStd, source_type: InTree, extra_features: [], allow_features: "", cargo_args: [], artifact_kind: Binary } -- 0.438
[TIMING] core::build_steps::tool::LldWrapper { build_compiler: Compiler { stage: 0, host: x86_64-unknown-linux-gnu }, target_compiler: Compiler { stage: 1, host: x86_64-unknown-linux-gnu } } -- 0.000
##[group]Building stage0 tool wasm-component-ld (x86_64-unknown-linux-gnu)
---
   Compiling wasm-component-ld-wrapper v0.1.0 (/checkout/src/tools/wasm-component-ld)
[RUSTC-TIMING] wasm_component_ld test:false 0.461
    Finished `release` profile [optimized] target(s) in 55.49s
##[endgroup]
[TIMING] core::build_steps::tool::ToolBuild { compiler: Compiler { stage: 0, host: x86_64-unknown-linux-gnu }, target: x86_64-unknown-linux-gnu, tool: "wasm-component-ld", path: "src/tools/wasm-component-ld", mode: ToolStd, source_type: InTree, extra_features: [], allow_features: "min_specialization", cargo_args: [], artifact_kind: Binary } -- 55.522
##[group]Building tool llvm-bitcode-linker (stage0 -> stage1, x86_64-unknown-linux-gnu)
   Compiling proc-macro2 v1.0.93
   Compiling unicode-ident v1.0.14
   Compiling once_cell v1.20.2
---
[RUSTC-TIMING] clap_builder test:false 7.897
[RUSTC-TIMING] llvm_bitcode_linker test:false 1.098
    Finished `release` profile [optimized] target(s) in 10.59s
##[endgroup]
[TIMING] core::build_steps::tool::ToolBuild { compiler: Compiler { stage: 0, host: x86_64-unknown-linux-gnu }, target: x86_64-unknown-linux-gnu, tool: "llvm-bitcode-linker", path: "src/tools/llvm-bitcode-linker", mode: ToolRustc, source_type: InTree, extra_features: [], allow_features: "", cargo_args: [], artifact_kind: Binary } -- 10.610
[TIMING] core::build_steps::compile::Assemble { target_compiler: Compiler { stage: 1, host: x86_64-unknown-linux-gnu } } -- 0.017
[TIMING] core::build_steps::compile::StartupObjects { compiler: Compiler { stage: 1, host: x86_64-unknown-linux-gnu }, target: x86_64-unknown-linux-gnu } -- 0.000
##[group]Building stage1 library artifacts (x86_64-unknown-linux-gnu)
   Compiling shlex v1.3.0
---
   Compiling lld-wrapper v0.1.0 (/checkout/src/tools/lld-wrapper)
[RUSTC-TIMING] lld_wrapper test:false 0.274
    Finished `release` profile [optimized] target(s) in 0.49s
##[endgroup]
[TIMING] core::build_steps::tool::ToolBuild { compiler: Compiler { stage: 1, host: x86_64-unknown-linux-gnu }, target: x86_64-unknown-linux-gnu, tool: "lld-wrapper", path: "src/tools/lld-wrapper", mode: ToolStd, source_type: InTree, extra_features: [], allow_features: "", cargo_args: [], artifact_kind: Binary } -- 0.514
##[group]Building stage1 tool wasm-component-ld (x86_64-unknown-linux-gnu)
   Compiling proc-macro2 v1.0.93
   Compiling unicode-ident v1.0.14
   Compiling stable_deref_trait v1.2.0
---
   Compiling wasm-component-ld-wrapper v0.1.0 (/checkout/src/tools/wasm-component-ld)
[RUSTC-TIMING] wasm_component_ld test:false 0.151
    Finished `release` profile [optimized] target(s) in 1m 14s
##[endgroup]
[TIMING] core::build_steps::tool::ToolBuild { compiler: Compiler { stage: 1, host: x86_64-unknown-linux-gnu }, target: x86_64-unknown-linux-gnu, tool: "wasm-component-ld", path: "src/tools/wasm-component-ld", mode: ToolStd, source_type: InTree, extra_features: [], allow_features: "min_specialization", cargo_args: [], artifact_kind: Binary } -- 74.909
##[group]Building tool llvm-bitcode-linker (stage0 -> stage1, x86_64-unknown-linux-gnu)
[RUSTC-TIMING] build_script_build test:false 0.284
[RUSTC-TIMING] unicode_ident test:false 0.064
[RUSTC-TIMING] once_cell test:false 0.165
---
[RUSTC-TIMING] llvm_bitcode_linker test:false 0.696
[RUSTC-TIMING] llvm_bitcode_linker test:false 1.098
    Finished `release` profile [optimized] target(s) in 0.14s
##[endgroup]
[TIMING] core::build_steps::tool::ToolBuild { compiler: Compiler { stage: 1, host: x86_64-unknown-linux-gnu }, target: x86_64-unknown-linux-gnu, tool: "llvm-bitcode-linker", path: "src/tools/llvm-bitcode-linker", mode: ToolRustc, source_type: InTree, extra_features: [], allow_features: "", cargo_args: [], artifact_kind: Binary } -- 0.162
[TIMING] core::build_steps::compile::Assemble { target_compiler: Compiler { stage: 2, host: x86_64-unknown-linux-gnu } } -- 0.018
##[group]Building stage0 tool run_make_support (x86_64-unknown-linux-gnu)
---
   Compiling run_make_support v0.2.0 (/checkout/src/tools/run-make-support)
[RUSTC-TIMING] run_make_support test:false 2.019
    Finished `release` profile [optimized] target(s) in 23.49s
##[endgroup]
[TIMING] core::build_steps::tool::ToolBuild { compiler: Compiler { stage: 0, host: x86_64-unknown-linux-gnu }, target: x86_64-unknown-linux-gnu, tool: "run_make_support", path: "src/tools/run-make-support", mode: ToolBootstrap, source_type: InTree, extra_features: [], allow_features: "", cargo_args: [], artifact_kind: Library } -- 23.516
##[group]Building test helpers for x86_64-unknown-linux-gnu
##[endgroup]
[TIMING] core::build_steps::test::TestHelpers { target: x86_64-unknown-linux-gnu } -- 0.051
[TIMING] core::build_steps::compile::StartupObjects { compiler: Compiler { stage: 2, host: x86_64-unknown-linux-gnu }, target: x86_64-unknown-linux-gnu } -- 0.000
---
[RUSTC-TIMING] compiletest test:false 7.989
[RUSTC-TIMING] compiletest test:false 0.522
    Finished `release` profile [optimized] target(s) in 30.08s
##[endgroup]
[TIMING] core::build_steps::tool::ToolBuild { compiler: Compiler { stage: 0, host: x86_64-unknown-linux-gnu }, target: x86_64-unknown-linux-gnu, tool: "compiletest", path: "src/tools/compiletest", mode: ToolStd, source_type: InTree, extra_features: [], allow_features: "test", cargo_args: [], artifact_kind: Binary } -- 30.112
[TIMING] core::build_steps::compile::StartupObjects { compiler: Compiler { stage: 2, host: x86_64-unknown-linux-gnu }, target: wasm32-wasip1 } -- 0.000
[TIMING] core::builder::Libdir { compiler: Compiler { stage: 2, host: x86_64-unknown-linux-gnu }, target: wasm32-wasip1 } -- 0.000
##[group]Building stage2 library artifacts (x86_64-unknown-linux-gnu -> wasm32-wasip1)
---
[RUSTC-TIMING] cargo test:false 114.723
[RUSTC-TIMING] cargo test:false 10.622
    Finished `release` profile [optimized] target(s) in 5m 35s
##[endgroup]
[TIMING] core::build_steps::tool::ToolBuild { compiler: Compiler { stage: 2, host: x86_64-unknown-linux-gnu }, target: x86_64-unknown-linux-gnu, tool: "cargo", path: "src/tools/cargo", mode: ToolRustc, source_type: Submodule, extra_features: [], allow_features: "", cargo_args: [], artifact_kind: Binary } -- 336.040
##[group]Building tool rustdoc_tool_binary (stage1 -> stage2, x86_64-unknown-linux-gnu)
---
   Compiling rustdoc-tool v0.0.0 (/checkout/src/tools/rustdoc)
[RUSTC-TIMING] rustdoc_tool_binary test:false 0.249
    Finished `release` profile [optimized] target(s) in 1m 39s
##[endgroup]
[TIMING] core::build_steps::tool::ToolBuild { compiler: Compiler { stage: 2, host: x86_64-unknown-linux-gnu }, target: x86_64-unknown-linux-gnu, tool: "rustdoc_tool_binary", path: "src/tools/rustdoc", mode: ToolRustc, source_type: InTree, extra_features: [], allow_features: "", cargo_args: [], artifact_kind: Binary } -- 99.928
##[group]Testing stage2 compiletest suite=run-make mode=run-make (x86_64-unknown-linux-gnu -> wasm32-wasip1)

running 382 tests
test [run-make] tests/run-make/CURRENT_RUSTC_VERSION ... ok
---
---- [run-make] tests/run-make/a-b-a-linker-guard stdout ----

error: rmake recipe failed to complete
status: exit status: 1
command: cd "/checkout/obj/build/x86_64-unknown-linux-gnu/test/run-make/a-b-a-linker-guard/rmake_out" && env -u RUSTFLAGS AR="/wasi-sdk-25.0-x86_64-linux/bin/llvm-ar" BUILD_ROOT="/checkout/obj/build/x86_64-unknown-linux-gnu" CARGO="/checkout/obj/build/x86_64-unknown-linux-gnu/stage1-tools-bin/cargo" CC="/wasi-sdk-25.0-x86_64-linux/bin/wasm32-wasip1-clang" CC_DEFAULT_FLAGS="-ffunction-sections -fdata-sections -fno-exceptions --target=wasm32-wasip1" CXX="/wasi-sdk-25.0-x86_64-linux/bin/wasm32-wasip1-clang++" CXX_DEFAULT_FLAGS="-ffunction-sections -fdata-sections -fno-exceptions --target=wasm32-wasip1" HOST_RUSTC_DYLIB_PATH="/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/lib" LD_LIBRARY_PATH="/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-bootstrap-tools/x86_64-unknown-linux-gnu/release/deps:/checkout/obj/build/x86_64-unknown-linux-gnu/stage0/lib:/checkout/obj/build/x86_64-unknown-linux-gnu/stage0/lib/rustlib/x86_64-unknown-linux-gnu/lib" LD_LIB_PATH_ENVVAR="LD_LIBRARY_PATH" LLVM_BIN_DIR="/checkout/obj/build/x86_64-unknown-linux-gnu/ci-llvm/bin" LLVM_COMPONENTS="aarch64 aarch64asmparser aarch64codegen aarch64desc aarch64disassembler aarch64info aarch64utils aggressiveinstcombine all all-targets amdgpu amdgpuasmparser amdgpucodegen amdgpudesc amdgpudisassembler amdgpuinfo amdgputargetmca amdgpuutils analysis arm armasmparser armcodegen armdesc armdisassembler arminfo armutils asmparser asmprinter avr avrasmparser avrcodegen avrdesc avrdisassembler avrinfo binaryformat bitreader bitstreamreader bitwriter bpf bpfasmparser bpfcodegen bpfdesc bpfdisassembler bpfinfo cfguard cgdata codegen codegentypes core coroutines coverage csky cskyasmparser cskycodegen cskydesc cskydisassembler cskyinfo debuginfobtf debuginfocodeview debuginfodwarf debuginfogsym debuginfologicalview debuginfomsf debuginfopdb demangle dlltooldriver dwarflinker dwarflinkerclassic dwarflinkerparallel dwp engine executionengine extensions filecheck frontendatomic frontenddriver frontendhlsl frontendoffloading frontendopenacc frontendopenmp fuzzercli fuzzmutate globalisel hexagon hexagonasmparser hexagoncodegen hexagondesc hexagondisassembler hexagoninfo hipstdpar instcombine instrumentation interfacestub interpreter ipo irprinter irreader jitlink libdriver lineeditor linker loongarch loongarchasmparser loongarchcodegen loongarchdesc loongarchdisassembler loongarchinfo lto m68k m68kasmparser m68kcodegen m68kdesc m68kdisassembler m68kinfo mc mca mcdisassembler mcjit mcparser mips mipsasmparser mipscodegen mipsdesc mipsdisassembler mipsinfo mirparser msp430 msp430asmparser msp430codegen msp430desc msp430disassembler msp430info native nativecodegen nvptx nvptxcodegen nvptxdesc nvptxinfo objcarcopts objcopy object objectyaml option orcdebugging orcjit orcshared orctargetprocess passes powerpc powerpcasmparser powerpccodegen powerpcdesc powerpcdisassembler powerpcinfo profiledata remarks riscv riscvasmparser riscvcodegen riscvdesc riscvdisassembler riscvinfo riscvtargetmca runtimedyld sandboxir scalaropts selectiondag sparc sparcasmparser sparccodegen sparcdesc sparcdisassembler sparcinfo support symbolize systemz systemzasmparser systemzcodegen systemzdesc systemzdisassembler systemzinfo tablegen target targetparser telemetry textapi textapibinaryreader transformutils vectorize webassembly webassemblyasmparser webassemblycodegen webassemblydesc webassemblydisassembler webassemblyinfo webassemblyutils windowsdriver windowsmanifest x86 x86asmparser x86codegen x86desc x86disassembler x86info x86targetmca xray xtensa xtensaasmparser xtensacodegen xtensadesc xtensadisassembler xtensainfo" LLVM_FILECHECK="/checkout/obj/build/x86_64-unknown-linux-gnu/ci-llvm/bin/FileCheck" NODE="/node/bin/node" PYTHON="/usr/bin/python3" RUSTC="/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/bin/rustc" RUSTDOC="/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/bin/rustdoc" SOURCE_ROOT="/checkout" TARGET="wasm32-wasip1" TARGET_EXE_DYLIB_PATH="/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/lib/rustlib/wasm32-wasip1/lib" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/run-make/a-b-a-linker-guard/rmake"
--- stderr -------------------------------
command failed at line 24
command failed at line 24
Command { cmd: LC_ALL="C" LD_LIBRARY_PATH="/checkout/obj/build/x86_64-unknown-linux-gnu/test/run-make/a-b-a-linker-guard/rmake_out:/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/lib/rustlib/wasm32-wasip1/lib:/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-bootstrap-tools/x86_64-unknown-linux-gnu/release/deps:/checkout/obj/build/x86_64-unknown-linux-gnu/stage0/lib:/checkout/obj/build/x86_64-unknown-linux-gnu/stage0/lib/rustlib/x86_64-unknown-linux-gnu/lib" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/run-make/a-b-a-linker-guard/rmake_out/b", stdin_buf: None, stdin: None, stdout: None, stderr: None, drop_bomb: DropBomb { command: "/checkout/obj/build/x86_64-unknown-linux-gnu/test/run-make/a-b-a-linker-guard/rmake_out/b", defused: true, armed_location: Location { file: "/checkout/tests/run-make/a-b-a-linker-guard/rmake.rs", line: 24, col: 5 } }, already_executed: true }
output status: `exit status: 127`
=== STDOUT ===


=== STDERR ===
=== STDERR ===
/checkout/obj/build/x86_64-unknown-linux-gnu/test/run-make/a-b-a-linker-guard/rmake_out/b: error while loading shared libraries: libstd-d2155335bb1ad0bd.so: cannot open shared object file: No such file or directory



failures:

@bors
Copy link
Contributor

bors commented Feb 24, 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 Feb 24, 2025
@Kobzol Kobzol closed this Feb 25, 2025
@GuillaumeGomez GuillaumeGomez deleted the rollup-ss95p06 branch February 25, 2025 13:33
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-compiletest Area: The compiletest test runner A-run-make Area: port run-make Makefiles to rmake.rs A-testsuite Area: The testsuite used to check the correctness of rustc 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) T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-infra Relevant to the infrastructure team, which will review and decide on the PR/issue. T-libs Relevant to the library team, which will review and decide on the PR/issue. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. T-rustdoc-frontend Relevant to the rustdoc-frontend team, which will review and decide on the web UI/UX output.
Projects
None yet
Development

Successfully merging this pull request may close these issues.