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 #108934

Merged
merged 21 commits into from
Mar 10, 2023
Merged

Rollup of 8 pull requests #108934

merged 21 commits into from
Mar 10, 2023

Conversation

matthiaskrgr
Copy link
Member

Successful merges:

Failed merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

compiler-errors and others added 21 commits March 6, 2023 16:37
Currently tidy does not consider code in target_family as
platform-specific. I think this is erroneous and should be fixed.

Signed-off-by: Ayush Singh <ayushsingh1325@gmail.com>
To avoid generating a FOUC at startup, this commit uses `document.write` to
load the stylesheet initially.

Co-Authored-By: Guillaume Gomez <guillaume1.gomez@gmail.com>
Use NEAR check to allow one pixel difference between scroll positions.
Co-authored-by: Guillaume Gomez <guillaume1.gomez@gmail.com>
This avoids spam for dozens of modified files.
correspondance -> correspondence
…theme, r=GuillaumeGomez,jsha

Only load one CSS theme by default

This is a tweaked version of rust-lang#103971 that uses `document.write` to create the stylesheet link at startup, avoiding a FOUC during page navigation. It also rebases the PR, making it work with the new hashed filenames.

Fixes rust-lang#82614

Preview: http://notriddle.com/notriddle-rustdoc-demos/load-only-one-theme-v2/std/index.html
…er, r=TaKO8Ki

Place binder correctly for arbitrary trait bound suggestion

suggest `for<'a> &'a T: Trait` instead of `&'a T: for<'a> T`.
x fmt: Don't print all modified files if there's more than 10

This avoids spam for dozens of modified files.

Fixes rust-lang#106920.
…-obk

feat/refactor: improve errors in case of ident with number at start

Improve parser code when we parse a integer (or float) literal but expect an identifier. We emit an error message saying that identifiers can't begin with numbers. This PR just improves that code and expands it to all identifiers. Note that I haven't implemented error recovery (this didn't exist before anyway), I might do that in a follow up PR.
…-reexport-of-private, r=notriddle

Fix invalid inlining of reexport of reexport of private item

Fixes rust-lang#108679.

The problem is that a reexport is always resolving to the end type, so if the end type is private, the reexport inlines. Except that if you reexport a public reexport (which reexports the private item), then it should not be inlined again.

r? `@notriddle`
…ubilee

Consider target_family as pal

Currently, tidy does not consider code in target_family as platform-specific. This is erroneous and should be fixed.

r? `@workingjubilee`
Add auto notification for changes to stable mir

Adds a new entry to the triagebot configuration file to notify subscribers about changes to the stable MIR. I added myself and `@oli-obk` for now.

r?oli-obk
Fix typo in span_map.rs

correspondance -> correspondence
@rustbot rustbot added A-meta Area: Issues & PRs about the rust-lang/rust repository itself 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-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. labels Mar 9, 2023
@matthiaskrgr
Copy link
Member Author

@bors r+ rollup=never p=8

@bors
Copy link
Contributor

bors commented Mar 9, 2023

📌 Commit 5b3f84d has been approved by matthiaskrgr

It is now in the queue for this repository.

@rustbot rustbot added the rollup A PR which is a rollup label Mar 9, 2023
@bors
Copy link
Contributor

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

bors commented Mar 10, 2023

⌛ Testing commit 5b3f84d with merge 9c39d5015666e45c2ef795cad7c4b97fc575c8cb...

@bors
Copy link
Contributor

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

bors commented Mar 10, 2023

⌛ Testing commit 5b3f84d with merge 104f430...

@bors
Copy link
Contributor

bors commented Mar 10, 2023

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

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

@rust-timer
Copy link
Collaborator

Finished benchmarking commit (104f430): comparison URL.

Overall result: ❌✅ regressions and improvements - ACTION NEEDED

Next Steps: If you can justify the regressions found in this perf run, please indicate this with @rustbot label: +perf-regression-triaged along with sufficient written justification. If you cannot justify the regressions please open an issue or create a new PR that fixes the regressions, add a comment linking to the newly created issue or PR, and then add the perf-regression-triaged label to this PR.

@rustbot label: +perf-regression
cc @rust-lang/wg-compiler-performance

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.8% [0.5%, 1.1%] 2
Improvements ✅
(primary)
-0.9% [-1.0%, -0.7%] 2
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) -0.9% [-1.0%, -0.7%] 2

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.2% [0.7%, 2.1%] 4
Regressions ❌
(secondary)
2.6% [1.9%, 3.7%] 5
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) 1.2% [0.7%, 2.1%] 4

Cycles

This benchmark run did not return any relevant results for this metric.

@rustbot rustbot added the perf-regression Performance regression. label Mar 10, 2023
@rust-log-analyzer
Copy link
Collaborator

A job failed! Check out the build log: (web) (plain)

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

@rust-log-analyzer
Copy link
Collaborator

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

Click to see the possible cause of the failure (guessed by this bot)
[2607/3021] Linking CXX static library lib\libLLVMMSP430CodeGen.a
[2608/3021] Linking CXX static library lib\libLLVMBPFCodeGen.a
[2609/3021] Linking CXX static library lib\libLLVMNVPTXCodeGen.a
[2610/3021] Linking CXX static library lib\libLLVMPowerPCCodeGen.a
FAILED: lib/libLLVMPowerPCCodeGen.a 
cmd.exe /C "cd . && "C:\Program Files\CMake\bin\cmake.exe" -E rm -f lib\libLLVMPowerPCCodeGen.a && D:\a\rust\rust\mingw32\bin\ar.exe qc lib\libLLVMPowerPCCodeGen.a  lib/Target/PowerPC/CMakeFiles/LLVMPowerPCCodeGen.dir/GISel/PPCInstructionSelector.cpp.obj lib/Target/PowerPC/CMakeFiles/LLVMPowerPCCodeGen.dir/PPCBoolRetToInt.cpp.obj lib/Target/PowerPC/CMakeFiles/LLVMPowerPCCodeGen.dir/PPCAsmPrinter.cpp.obj lib/Target/PowerPC/CMakeFiles/LLVMPowerPCCodeGen.dir/PPCBranchSelector.cpp.obj lib/Target/PowerPC/CMakeFiles/LLVMPowerPCCodeGen.dir/PPCBranchCoalescing.cpp.obj lib/Target/PowerPC/CMakeFiles/LLVMPowerPCCodeGen.dir/PPCCallingConv.cpp.obj lib/Target/PowerPC/CMakeFiles/LLVMPowerPCCodeGen.dir/PPCCCState.cpp.obj lib/Target/PowerPC/CMakeFiles/LLVMPowerPCCodeGen.dir/PPCCTRLoops.cpp.obj lib/Target/PowerPC/CMakeFiles/LLVMPowerPCCodeGen.dir/PPCCTRLoopsVerify.cpp.obj lib/Target/PowerPC/CMakeFiles/LLVMPowerPCCodeGen.dir/PPCExpandAtomicPseudoInsts.cpp.obj lib/Target/PowerPC/CMakeFiles/LLVMPowerPCCodeGen.dir/PPCHazardRecognizers.cpp.obj lib/Target/PowerPC/CMakeFiles/LLVMPowerPCCodeGen.dir/PPCInstrInfo.cpp.obj lib/Target/PowerPC/CMakeFiles/LLVMPowerPCCodeGen.dir/PPCISelDAGToDAG.cpp.obj lib/Target/PowerPC/CMakeFiles/LLVMPowerPCCodeGen.dir/PPCISelLowering.cpp.obj lib/Target/PowerPC/CMakeFiles/LLVMPowerPCCodeGen.dir/PPCEarlyReturn.cpp.obj lib/Target/PowerPC/CMakeFiles/LLVMPowerPCCodeGen.dir/PPCFastISel.cpp.obj lib/Target/PowerPC/CMakeFiles/LLVMPowerPCCodeGen.dir/PPCFrameLowering.cpp.obj lib/Target/PowerPC/CMakeFiles/LLVMPowerPCCodeGen.dir/PPCLoopInstrFormPrep.cpp.obj lib/Target/PowerPC/CMakeFiles/LLVMPowerPCCodeGen.dir/PPCMCInstLower.cpp.obj lib/Target/PowerPC/CMakeFiles/LLVMPowerPCCodeGen.dir/PPCMachineFunctionInfo.cpp.obj lib/Target/PowerPC/CMakeFiles/LLVMPowerPCCodeGen.dir/PPCMachineScheduler.cpp.obj lib/Target/PowerPC/CMakeFiles/LLVMPowerPCCodeGen.dir/PPCMacroFusion.cpp.obj lib/Target/PowerPC/CMakeFiles/LLVMPowerPCCodeGen.dir/PPCMIPeephole.cpp.obj lib/Target/PowerPC/CMakeFiles/LLVMPowerPCCodeGen.dir/PPCRegisterInfo.cpp.obj lib/Target/PowerPC/CMakeFiles/LLVMPowerPCCodeGen.dir/PPCSubtarget.cpp.obj lib/Target/PowerPC/CMakeFiles/LLVMPowerPCCodeGen.dir/PPCTargetMachine.cpp.obj lib/Target/PowerPC/CMakeFiles/LLVMPowerPCCodeGen.dir/PPCTargetObjectFile.cpp.obj lib/Target/PowerPC/CMakeFiles/LLVMPowerPCCodeGen.dir/PPCTargetTransformInfo.cpp.obj lib/Target/PowerPC/CMakeFiles/LLVMPowerPCCodeGen.dir/PPCTOCRegDeps.cpp.obj lib/Target/PowerPC/CMakeFiles/LLVMPowerPCCodeGen.dir/PPCTLSDynamicCall.cpp.obj lib/Target/PowerPC/CMakeFiles/LLVMPowerPCCodeGen.dir/PPCVSXCopy.cpp.obj lib/Target/PowerPC/CMakeFiles/LLVMPowerPCCodeGen.dir/PPCReduceCRLogicals.cpp.obj lib/Target/PowerPC/CMakeFiles/LLVMPowerPCCodeGen.dir/PPCVSXFMAMutate.cpp.obj lib/Target/PowerPC/CMakeFiles/LLVMPowerPCCodeGen.dir/PPCVSXSwapRemoval.cpp.obj lib/Target/PowerPC/CMakeFiles/LLVMPowerPCCodeGen.dir/PPCExpandISEL.cpp.obj lib/Target/PowerPC/CMakeFiles/LLVMPowerPCCodeGen.dir/PPCPreEmitPeephole.cpp.obj lib/Target/PowerPC/CMakeFiles/LLVMPowerPCCodeGen.dir/PPCLowerMASSVEntries.cpp.obj lib/Target/PowerPC/CMakeFiles/LLVMPowerPCCodeGen.dir/PPCGenScalarMASSEntries.cpp.obj lib/Target/PowerPC/CMakeFiles/LLVMPowerPCCodeGen.dir/GISel/PPCCallLowering.cpp.obj lib/Target/PowerPC/CMakeFiles/LLVMPowerPCCodeGen.dir/GISel/PPCRegisterBankInfo.cpp.obj lib/Target/PowerPC/CMakeFiles/LLVMPowerPCCodeGen.dir/GISel/PPCLegalizerInfo.cpp.obj && D:\a\rust\rust\mingw32\bin\ranlib.exe lib\libLLVMPowerPCCodeGen.a && cd ."
D:\a\rust\rust\mingw32\bin\ar.exe: could not create temporary file whilst writing archive: no more archived files
[2611/3021] Linking CXX static library lib\libLLVMHexagonCodeGen.a
[2612/3021] Building CXX object tools/dsymutil/CMakeFiles/dsymutil.dir/dsymutil.cpp.obj
[2613/3021] Linking CXX static library lib\libLLVMMipsCodeGen.a
[2614/3021] Linking CXX static library lib\libLLVMAArch64CodeGen.a
[2614/3021] Linking CXX static library lib\libLLVMAArch64CodeGen.a
[2615/3021] Linking CXX static library lib\libLLVMARMCodeGen.a
[2616/3021] Linking CXX executable bin\llvm-profdata.exe
[2617/3021] Linking CXX static library lib\libLLVMPasses.a
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 303.077 seconds
Build completed unsuccessfully in 0:06:42
Build completed unsuccessfully in 0:06:42
make: *** [Makefile:80: ci-mingw-subset-2] Error 1

@rust-log-analyzer
Copy link
Collaborator

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

Click to see the possible cause of the failure (guessed by this bot)
[2528/3021] Linking CXX static library lib\libLLVMObjectYAML.a
[2529/3021] Building CXX object lib/XRay/CMakeFiles/LLVMXRay.dir/FDRRecordProducer.cpp.obj
[2530/3021] Linking CXX static library lib\libLLVMDebugInfoGSYM.a
[2531/3021] Linking CXX static library lib\libLLVMDebugInfoPDB.a
FAILED: lib/libLLVMDebugInfoPDB.a 
cmd.exe /C "cd . && "C:\Program Files\CMake\bin\cmake.exe" -E rm -f lib\libLLVMDebugInfoPDB.a && D:\a\rust\rust\mingw32\bin\ar.exe qc lib\libLLVMDebugInfoPDB.a  @CMakeFiles\LLVMDebugInfoPDB.rsp && D:\a\rust\rust\mingw32\bin\ranlib.exe lib\libLLVMDebugInfoPDB.a && cd ."
D:\a\rust\rust\mingw32\bin\ranlib.exe: could not create temporary file whilst writing archive: no more archived files
[2532/3021] Linking CXX static library lib\libLLVMDlltoolDriver.a
[2533/3021] Linking CXX static library lib\libLLVMJITLink.a
[2534/3021] Linking CXX static library lib\libLLVMLibDriver.a
[2535/3021] Building CXX object lib/XRay/CMakeFiles/LLVMXRay.dir/FDRRecords.cpp.obj
[2535/3021] Building CXX object lib/XRay/CMakeFiles/LLVMXRay.dir/FDRRecords.cpp.obj
[2536/3021] Linking CXX static library lib\libLLVMRuntimeDyld.a
[2537/3021] Building CXX object lib/XRay/CMakeFiles/LLVMXRay.dir/FDRTraceWriter.cpp.obj
[2538/3021] Building CXX object lib/XRay/CMakeFiles/LLVMXRay.dir/Trace.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 234.249 seconds
Build completed unsuccessfully in 0:05:15
Build completed unsuccessfully in 0:05:15
make: *** [Makefile:80: ci-mingw-subset-2] Error 1

@rust-log-analyzer
Copy link
Collaborator

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

Click to see the possible cause of the failure (guessed by this bot)
[2527/3025] Building CXX object lib/XRay/CMakeFiles/LLVMXRay.dir/FDRRecordProducer.cpp.obj
[2528/3025] Building CXX object lib/XRay/CMakeFiles/LLVMXRay.dir/BlockPrinter.cpp.obj
[2529/3025] Building CXX object lib/XRay/CMakeFiles/LLVMXRay.dir/Profile.cpp.obj
[2530/3025] Linking CXX static library lib\libLLVMJITLink.a
FAILED: lib/libLLVMJITLink.a 
cmd.exe /C "cd . && "C:\Program Files\CMake\bin\cmake.exe" -E rm -f lib\libLLVMJITLink.a && D:\a\rust\rust\mingw64\bin\ar.exe qc lib\libLLVMJITLink.a  lib/ExecutionEngine/JITLink/CMakeFiles/LLVMJITLink.dir/DWARFRecordSectionSplitter.cpp.obj lib/ExecutionEngine/JITLink/CMakeFiles/LLVMJITLink.dir/EHFrameSupport.cpp.obj lib/ExecutionEngine/JITLink/CMakeFiles/LLVMJITLink.dir/JITLink.cpp.obj lib/ExecutionEngine/JITLink/CMakeFiles/LLVMJITLink.dir/JITLinkGeneric.cpp.obj lib/ExecutionEngine/JITLink/CMakeFiles/LLVMJITLink.dir/JITLinkMemoryManager.cpp.obj lib/ExecutionEngine/JITLink/CMakeFiles/LLVMJITLink.dir/MemoryFlags.cpp.obj lib/ExecutionEngine/JITLink/CMakeFiles/LLVMJITLink.dir/MachO.cpp.obj lib/ExecutionEngine/JITLink/CMakeFiles/LLVMJITLink.dir/MachO_arm64.cpp.obj lib/ExecutionEngine/JITLink/CMakeFiles/LLVMJITLink.dir/MachO_x86_64.cpp.obj lib/ExecutionEngine/JITLink/CMakeFiles/LLVMJITLink.dir/MachOLinkGraphBuilder.cpp.obj lib/ExecutionEngine/JITLink/CMakeFiles/LLVMJITLink.dir/ELF.cpp.obj lib/ExecutionEngine/JITLink/CMakeFiles/LLVMJITLink.dir/ELFLinkGraphBuilder.cpp.obj lib/ExecutionEngine/JITLink/CMakeFiles/LLVMJITLink.dir/ELF_aarch64.cpp.obj lib/ExecutionEngine/JITLink/CMakeFiles/LLVMJITLink.dir/ELF_riscv.cpp.obj lib/ExecutionEngine/JITLink/CMakeFiles/LLVMJITLink.dir/ELF_x86_64.cpp.obj lib/ExecutionEngine/JITLink/CMakeFiles/LLVMJITLink.dir/COFF.cpp.obj lib/ExecutionEngine/JITLink/CMakeFiles/LLVMJITLink.dir/COFFLinkGraphBuilder.cpp.obj lib/ExecutionEngine/JITLink/CMakeFiles/LLVMJITLink.dir/COFF_x86_64.cpp.obj lib/ExecutionEngine/JITLink/CMakeFiles/LLVMJITLink.dir/aarch64.cpp.obj lib/ExecutionEngine/JITLink/CMakeFiles/LLVMJITLink.dir/riscv.cpp.obj lib/ExecutionEngine/JITLink/CMakeFiles/LLVMJITLink.dir/x86_64.cpp.obj && D:\a\rust\rust\mingw64\bin\ranlib.exe lib\libLLVMJITLink.a && cd ."
D:\a\rust\rust\mingw64\bin\ar.exe: could not create temporary file whilst writing archive: no more archived files
[2531/3025] Building CXX object lib/XRay/CMakeFiles/LLVMXRay.dir/RecordPrinter.cpp.obj
[2532/3025] Linking CXX static library lib\libLLVMObjCopy.a
[2533/3025] Building CXX object lib/XRay/CMakeFiles/LLVMXRay.dir/FDRTraceExpander.cpp.obj
[2534/3025] Linking CXX static library lib\libLLVMDebugInfoDWARF.a
[2534/3025] Linking CXX static library lib\libLLVMDebugInfoDWARF.a
[2535/3025] Linking CXX static library lib\libLLVMObjectYAML.a
[2536/3025] Building CXX object lib/XRay/CMakeFiles/LLVMXRay.dir/InstrumentationMap.cpp.obj
[2537/3025] Linking CXX static library lib\libLLVMDebugInfoPDB.a
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-6f17d22bba15001f\cmake-0.1.48\src\lib.rs:975:5
 finished in 222.376 seconds
Build completed unsuccessfully in 0:06:25
Build completed unsuccessfully in 0:06:25
make: *** [Makefile:78: ci-mingw-subset-1] Error 1

@matthiaskrgr matthiaskrgr deleted the rollup-vm414p5 branch March 16, 2024 18:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-meta Area: Issues & PRs about the rust-lang/rust repository itself A-testsuite Area: The testsuite used to check the correctness of rustc merged-by-bors This PR was explicitly merged by bors. perf-regression Performance regression. 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-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.