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 8 pull requests #109384

Merged
merged 20 commits into from
Mar 20, 2023
Merged

Rollup of 8 pull requests #109384

merged 20 commits into from
Mar 20, 2023

Conversation

matthiaskrgr
Copy link
Member

Successful merges:

Failed merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

eggyal and others added 20 commits March 15, 2023 14:57
When bootstrap compiles native dependencies like LLVM, it should set
CMAKE_SYSTEM_NAME for the target system; otherwise cmake may not
identify that it is cross-compiling.

In particular, when building a Linux rustc on a macOS host, cmake was
including `-isysroot /path/to/macOS.sdk` options that caused things to
break.  By setting `CMAKE_SYSTEM_NAME=Linux` when building for Linux
targets, the macOS SDK is no longer passed as sysroot to the compiler.
- Separate out functions so that each unit test doesn't create a file on disk
- Add a few unit tests

Notably, verifying that we generate valid toml relies on python 3.11 so
we can use `tomllib`.
This also fixes a regression from
rust-lang#106085 which stopped testing that
we support python2 in PR CI.
This makes a bit more sense — iter impl converts to slice first, while
slice impl used to create iter, doing unnecessary conversions.
…lacrum

Set `CMAKE_SYSTEM_NAME` for Linux targets

When bootstrap compiles native dependencies like LLVM, it should set `CMAKE_SYSTEM_NAME` for the target system; otherwise cmake may not identify that it is cross-compiling.

In particular, when building a Linux rustc on a macOS host, cmake was including `-isysroot /path/to/macOS.sdk` options that caused things to break.  By setting `CMAKE_SYSTEM_NAME=Linux` when building for Linux targets, the macOS SDK is no longer passed as sysroot to the compiler.

r? bootstrap
rustdoc: Correctly merge import's and its target's docs in one more case

Fixes rust-lang#108334.
Fixes rust-lang#108378.
Fixes rust-lang#108658.
…lacrum

Add tests for configure.py

I highly recommend reviewing this with whitespace disabled.

Notably, verifying that we generate valid toml relies on python 3.11 so
we can use `tomllib`, so this also switches`x86_64-gnu-llvm-14` (one of the PR builders) to use 3.11.

While fixing that, I noticed that we stopped testing python2.7 support on PR CI in rust-lang#106085. `@fee1-dead` `@pietroalbini` please be more careful in the future, there is no CI for CI itself that verifies we are testing everything we should be.

- Separate out functions so that each unit test doesn't create a file on disk
- Add a few unit tests
…ray_windows, r=scottmcm

Make `slice::is_sorted_by` implementation nicer

Just tweak implementation a little :)

r? `@thomcc`
…er-errors

Fix generics_of for impl's RPITIT synthesized associated type

The only useful commit is the last one.

This makes `generics_of` for the impl side RPITIT copy from the trait's associated type and avoid the fn on the impl side which was previously wrongly used.
This solution is better but we still need to fix resolution of the generated generics.

r? ``@compiler-errors``
…er-errors

Ignore `Inlined` spans when computing caller location.

Fixes rust-lang#105538
…oxyUwU

Only expect a GAT const param for `type_of` of GAT const arg

IDK why we were account for both `is_ty_or_const` instead of just for a const param, since we're computing the `type_of` a const param specifically.

Fixes rust-lang#109300
…crum

Update mdbook

This updates mdbook from 0.4.25 to 0.4.28.
Changelog: https://github.com/rust-lang/mdBook/blob/master/CHANGELOG.md#mdbook-0428

The primary changes are some interaction fixes for Mobile Safari and removing custom scrollbars on webkit browsers, along with a few other fixes.
@rustbot rustbot added 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. 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. rollup A PR which is a rollup labels Mar 20, 2023
@matthiaskrgr
Copy link
Member Author

@bors r+ rollup=never p=8

@bors
Copy link
Contributor

bors commented Mar 20, 2023

📌 Commit 58ffabb has been approved by matthiaskrgr

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 Mar 20, 2023
@bors
Copy link
Contributor

bors commented Mar 20, 2023

⌛ Testing commit 58ffabb with merge ddc34e1cdb77dc9302444a48b4ac21793d5c960e...

@rust-log-analyzer
Copy link
Collaborator

The job dist-i686-mingw failed! Check out the build log: (web) (plain)

Click to see the possible cause of the failure (guessed by this bot)
[2526/3021] Linking CXX static library lib\libLLVMDebugInfoGSYM.a
[2527/3021] Building CXX object lib/XRay/CMakeFiles/LLVMXRay.dir/RecordPrinter.cpp.obj
[2528/3021] Linking CXX static library lib\libLLVMJITLink.a
[2529/3021] Linking CXX static library lib\libLLVMRuntimeDyld.a
FAILED: lib/libLLVMRuntimeDyld.a 
cmd.exe /C "cd . && "C:\Program Files\CMake\bin\cmake.exe" -E rm -f lib\libLLVMRuntimeDyld.a && C:\a\rust\rust\mingw32\bin\ar.exe qc lib\libLLVMRuntimeDyld.a  lib/ExecutionEngine/RuntimeDyld/CMakeFiles/LLVMRuntimeDyld.dir/JITSymbol.cpp.obj lib/ExecutionEngine/RuntimeDyld/CMakeFiles/LLVMRuntimeDyld.dir/RTDyldMemoryManager.cpp.obj lib/ExecutionEngine/RuntimeDyld/CMakeFiles/LLVMRuntimeDyld.dir/RuntimeDyld.cpp.obj lib/ExecutionEngine/RuntimeDyld/CMakeFiles/LLVMRuntimeDyld.dir/RuntimeDyldChecker.cpp.obj lib/ExecutionEngine/RuntimeDyld/CMakeFiles/LLVMRuntimeDyld.dir/RuntimeDyldCOFF.cpp.obj lib/ExecutionEngine/RuntimeDyld/CMakeFiles/LLVMRuntimeDyld.dir/RuntimeDyldELF.cpp.obj lib/ExecutionEngine/RuntimeDyld/CMakeFiles/LLVMRuntimeDyld.dir/RuntimeDyldMachO.cpp.obj lib/ExecutionEngine/RuntimeDyld/CMakeFiles/LLVMRuntimeDyld.dir/Targets/RuntimeDyldELFMips.cpp.obj && C:\a\rust\rust\mingw32\bin\ranlib.exe lib\libLLVMRuntimeDyld.a && cd ."
C:\a\rust\rust\mingw32\bin\ranlib.exe: could not create temporary file whilst writing archive: no more archived files
[2530/3021] Linking CXX static library lib\libLLVMDebugInfoPDB.a
[2531/3021] Linking CXX static library lib\libLLVMDlltoolDriver.a
[2532/3021] Building CXX object lib/XRay/CMakeFiles/LLVMXRay.dir/FileHeaderReader.cpp.obj
[2533/3021] Building CXX object lib/XRay/CMakeFiles/LLVMXRay.dir/Trace.cpp.obj
[2533/3021] Building CXX object lib/XRay/CMakeFiles/LLVMXRay.dir/Trace.cpp.obj
[2534/3021] Building CXX object lib/ToolDrivers/llvm-lib/CMakeFiles/LLVMLibDriver.dir/LibDriver.cpp.obj
[2535/3021] Building CXX object lib/XRay/CMakeFiles/LLVMXRay.dir/FDRTraceWriter.cpp.obj
[2536/3021] Building CXX object lib/XRay/CMakeFiles/LLVMXRay.dir/Profile.cpp.obj
ninja: build stopped: subcommand failed.
command did not execute successfully, got: exit code: 1


build script failed, must exit now', C:\Users\runneradmin\.cargo\registry\src\index.crates.io-1cd66030c949c28d\cmake-0.1.48\src\lib.rs:975:5
 finished in 278.920 seconds
Build completed unsuccessfully in 0:07:24

@bors
Copy link
Contributor

bors commented Mar 20, 2023

💔 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 Mar 20, 2023
@matthiaskrgr
Copy link
Member Author

@bors retry #108227

@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 Mar 20, 2023
@bors
Copy link
Contributor

bors commented Mar 20, 2023

⌛ Testing commit 58ffabb with merge b6814e94b48dd7487f25fd713e9c7369d2e1cbcc...

@bors
Copy link
Contributor

bors commented Mar 20, 2023

💔 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 Mar 20, 2023
@matthiaskrgr
Copy link
Member Author

@bors retry failure while compilingg getrandom, seems spurious

@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 Mar 20, 2023
@rust-log-analyzer
Copy link
Collaborator

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

Click to see the possible cause of the failure (guessed by this bot)
   Compiling sysinfo v0.26.7
error: could not compile `bootstrap`

Caused by:
  process didn't exit successfully: `/Users/runner/work/rust/rust/build/x86_64-apple-darwin/stage0/bin/rustc --crate-name bootstrap --edition=2021 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 split-debuginfo=unpacked -C debuginfo=1 --cfg 'feature="build-metrics"' --cfg 'feature="sysinfo"' -C metadata=a93843710546b921 -C extra-filename=-a93843710546b921 --out-dir /Users/runner/work/rust/rust/build/bootstrap/debug/deps -C incremental=/Users/runner/work/rust/rust/build/bootstrap/debug/incremental -L dependency=/Users/runner/work/rust/rust/build/bootstrap/debug/deps --extern build_helper=/Users/runner/work/rust/rust/build/bootstrap/debug/deps/libbuild_helper-9d2bc277721db64f.rmeta --extern cc=/Users/runner/work/rust/rust/build/bootstrap/debug/deps/libcc-49bfe8c7d867fb37.rmeta --extern cmake=/Users/runner/work/rust/rust/build/bootstrap/debug/deps/libcmake-89997d098798ab5e.rmeta --extern fd_lock=/Users/runner/work/rust/rust/build/bootstrap/debug/deps/libfd_lock-d352b88169ae9b78.rmeta --extern filetime=/Users/runner/work/rust/rust/build/bootstrap/debug/deps/libfiletime-dfad8c62ded938a8.rmeta --extern getopts=/Users/runner/work/rust/rust/build/bootstrap/debug/deps/libgetopts-919ee0a0aa1476b8.rmeta --extern hex=/Users/runner/work/rust/rust/build/bootstrap/debug/deps/libhex-236ab3c1bfe4e4f1.rmeta --extern ignore=/Users/runner/work/rust/rust/build/bootstrap/debug/deps/libignore-a7771d5b7aea3d15.rmeta --extern libc=/Users/runner/work/rust/rust/build/bootstrap/debug/deps/liblibc-44c5b86cce046821.rmeta --extern object=/Users/runner/work/rust/rust/build/bootstrap/debug/deps/libobject-311d048112783467.rmeta --extern once_cell=/Users/runner/work/rust/rust/build/bootstrap/debug/deps/libonce_cell-fb2de34fe0557dc6.rmeta --extern opener=/Users/runner/work/rust/rust/build/bootstrap/debug/deps/libopener-0eab13e0ca8f31ca.rmeta --extern serde=/Users/runner/work/rust/rust/build/bootstrap/debug/deps/libserde-d05a262813607a2d.rmeta --extern serde_derive=/Users/runner/work/rust/rust/build/bootstrap/debug/deps/libserde_derive-2aab301c883d1ded.dylib --extern serde_json=/Users/runner/work/rust/rust/build/bootstrap/debug/deps/libserde_json-0a148363995afa96.rmeta --extern sha2=/Users/runner/work/rust/rust/build/bootstrap/debug/deps/libsha2-7b55139cb79fb0aa.rmeta --extern sysinfo=/Users/runner/work/rust/rust/build/bootstrap/debug/deps/libsysinfo-c6ae361f7ec35ee4.rlib --extern tar=/Users/runner/work/rust/rust/build/bootstrap/debug/deps/libtar-8a82ba23634473a9.rmeta --extern toml=/Users/runner/work/rust/rust/build/bootstrap/debug/deps/libtoml-e06787ff05533496.rmeta --extern walkdir=/Users/runner/work/rust/rust/build/bootstrap/debug/deps/libwalkdir-d7f1d54c877394c7.rmeta --extern xz2=/Users/runner/work/rust/rust/build/bootstrap/debug/deps/libxz2-a46d8b83251c0877.rmeta -Wrust_2018_idioms -Wunused_lifetimes -Dwarnings -L native=/usr/local/Cellar/xz/5.4.1/lib` (signal: 11, SIGSEGV: invalid memory reference)
Build completed unsuccessfully in 0:01:03
make: *** [prepare] Error 1
Command failed. Attempt 2/5:
Building bootstrap
---
[RUSTC-TIMING] maplit test:false 0.158
[RUSTC-TIMING] tinyvec test:false 3.045
   Compiling getrandom v0.2.8
[RUSTC-TIMING] getrandom test:false 0.074
rustc exited with signal: 11 (SIGSEGV)
error: could not compile `getrandom`
Caused by:
Caused by:
  process didn't exit successfully: `/Users/runner/work/rust/rust/build/bootstrap/debug/rustc --crate-name getrandom --edition=2018 /Users/runner/.cargo/registry/src/index.crates.io-6f17d22bba15001f/getrandom-0.2.8/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 debuginfo=0 -C debug-assertions=off --cfg 'feature="std"' -Zunstable-options --check-cfg 'values(feature, "compiler_builtins", "core", "custom", "js", "js-sys", "rdrand", "rustc-dep-of-std", "std", "test-in-browser", "wasm-bindgen")' --check-cfg 'names()' --check-cfg 'values()' -C metadata=f766d2e2836dc94c -C extra-filename=-f766d2e2836dc94c --out-dir /Users/runner/work/rust/rust/build/x86_64-apple-darwin/stage0-bootstrap-tools/release/deps -L dependency=/Users/runner/work/rust/rust/build/x86_64-apple-darwin/stage0-bootstrap-tools/release/deps --extern cfg_if=/Users/runner/work/rust/rust/build/x86_64-apple-darwin/stage0-bootstrap-tools/release/deps/libcfg_if-fba5cb65ecfbce1a.rmeta --extern libc=/Users/runner/work/rust/rust/build/x86_64-apple-darwin/stage0-bootstrap-tools/release/deps/liblibc-0ee6d37c7da666ea.rmeta --cap-lints allow -Z binary-dep-depinfo` (exit status: 254)
[RUSTC-TIMING] humantime test:false 1.207
[RUSTC-TIMING] ucd_trie test:false 1.754
[RUSTC-TIMING] libc test:false 3.925
[RUSTC-TIMING] fastrand test:false 1.129

@bors
Copy link
Contributor

bors commented Mar 20, 2023

⌛ Testing commit 58ffabb with merge febd59e...

@bors
Copy link
Contributor

bors commented Mar 20, 2023

☀️ Test successful - checks-actions
Approved by: matthiaskrgr
Pushing febd59e to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Mar 20, 2023
@bors bors merged commit febd59e into rust-lang:master Mar 20, 2023
@rustbot rustbot added this to the 1.70.0 milestone Mar 20, 2023
@rust-timer
Copy link
Collaborator

@rust-timer
Copy link
Collaborator

Finished benchmarking commit (febd59e): comparison URL.

Overall result: ✅ improvements - no action needed

@rustbot label: -perf-regression

Instruction count

This is a highly reliable metric that was used to determine the overall result at the top of this comment.

mean range count
Regressions ❌
(primary)
- - 0
Regressions ❌
(secondary)
- - 0
Improvements ✅
(primary)
-0.6% [-0.6%, -0.6%] 1
Improvements ✅
(secondary)
-1.2% [-1.2%, -1.2%] 1
All ❌✅ (primary) -0.6% [-0.6%, -0.6%] 1

Max RSS (memory usage)

Results

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

mean range count
Regressions ❌
(primary)
1.1% [0.5%, 2.4%] 10
Regressions ❌
(secondary)
2.7% [2.1%, 3.1%] 10
Improvements ✅
(primary)
-1.5% [-1.6%, -1.5%] 2
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) 0.6% [-1.6%, 2.4%] 12

Cycles

Results

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

mean range count
Regressions ❌
(primary)
- - 0
Regressions ❌
(secondary)
- - 0
Improvements ✅
(primary)
-0.4% [-0.4%, -0.4%] 1
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) -0.4% [-0.4%, -0.4%] 1

@matthiaskrgr matthiaskrgr deleted the rollup-hu348gs branch March 16, 2024 18:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-testsuite Area: The testsuite used to check the correctness of rustc merged-by-bors This PR was explicitly merged by bors. rollup A PR which is a rollup 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) 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.
Projects
None yet
Development

Successfully merging this pull request may close these issues.