Skip to content

Rollup of 7 pull requests #109581

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

Merged
merged 17 commits into from
Mar 25, 2023
Merged

Rollup of 7 pull requests #109581

merged 17 commits into from
Mar 25, 2023

Conversation

matthiaskrgr
Copy link
Member

Successful merges:

Failed merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

raoulstrackx and others added 17 commits March 22, 2023 14:01
This converts a few functions to more compact versions of
themselves, and moves `RUSTDOC_MOBILE_BREAKPOINT` to main.js where
it's actually used.
This is based on the compatibility data for `window.matchMedia` and
`MediaQueryList`'s `EventTarget` implementation.

https://developer.mozilla.org/en-US/docs/Web/API/MediaQueryList#browser_compatibility

https://developer.mozilla.org/en-US/docs/Web/API/Window/matchMedia#browser_compatibility

  * EventTarget would require us to drop support for all Chrome
    versions before 39. However, we already require Chrome 49,
    because rustdoc requires [CSS variables].
  * EventTarget would also limit us to Firefox 55, but since rust-lang#106502
    rustdoc only supports Firefox > 68.
  * EventTarget limits us to Mobile Safari version 14, but rust-lang#102404
    shows that our CSS is broken in Safari versions before 15.5.

[CSS variables]: https://developer.mozilla.org/en-US/docs/Web/CSS/--*#browser_compatibility
…mpiler-errors

Fix bad suggestion for clone/is_some in field init shorthand

Fixes rust-lang#108470
…_output, r=pietroalbini

Bugfix: avoid panic on invalid json output from libtest

rust-lang#108659 introduces a custom test display implementation. It does so by using libtest to output json. The stdout is read and parsed; The code trims the line read and checks whether it starts with a `{` and ends with a `}`. If so, it concludes that it must be a json encoded `Message`. Unfortunately, this does not work in all cases:

- This assumes that tests running with `--nocapture` will never start and end lines with `{` and `}` characters
- Output is generated by issuing multiple `write_message` [statements](https://github.com/rust-lang/rust/blob/master/library/test/src/formatters/json.rs#L33-L60). Where only the last one issues a `\n`. This likely results in a race condition as we see multiple json outputs on the same line when running tests for the `x86_64-fortanix-unknown-sgx` target:
```
10:21:04 �[0m�[0m�[1m�[32m     Running�[0m tests/run-time-detect.rs (build/x86_64-unknown-linux-gnu/stage1-std/x86_64-fortanix-unknown-sgx/release/deps/run_time_detect-8c66026bd4b1871a)
10:21:04
10:21:04 running 1 tests
10:21:04 test x86_all ... ok
10:21:04 �[0m�[0m�[1m�[32m     Running�[0m tests/thread.rs (build/x86_64-unknown-linux-gnu/stage1-std/x86_64-fortanix-unknown-sgx/release/deps/thread-ed5456a7d80a6193)
10:21:04 thread 'main' panicked at 'failed to parse libtest json output; error: trailing characters at line 1 column 135, line: "{ \"type\": \"suite\", \"event\": \"ok\", \"passed\": 1, \"failed\": 0, \"ignored\": 0, \"measured\": 0, \"filtered_out\": 0, \"exec_time\": 0.000725911 }{ \"type\": \"suite\", \"event\": \"started\", \"test_count\": 1 }\n"', render_tests.rs:108:25
```

This PR implements a partial fix by being much more conservative of what it asserts is a valid json encoded `Message`. This prevents panics, but still does not resolve the race condition. A discussion is needed where this race condition comes from exactly and how it best can be avoided.

cc: `@jethrogb,` `@pietroalbini`
Refactor `find_*_stability` functions

The idea is to split the monolithic function into the 3 cases: stability, const stability, and body stability.
…GuillaumeGomez

rustdoc: clean up `storage.js`
Deeply check well-formedness of return-position `impl Trait` in trait

Walk the bounds of RPITITs to see if we find any more RPITITs 😸
miri: fix raw pointer dyn receivers

r? `@oli-obk`
Fixes rust-lang/miri#2786
…riddle

Add GUI test for "Auto-hide item methods' documentation" setting

Part of rust-lang#66181.

r? `@notriddle`
@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) 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. rollup A PR which is a rollup labels Mar 25, 2023
@matthiaskrgr
Copy link
Member Author

@bors r+ rollup=never p=7

@bors
Copy link
Collaborator

bors commented Mar 25, 2023

📌 Commit beac95a 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 25, 2023
@bors
Copy link
Collaborator

bors commented Mar 25, 2023

⌛ Testing commit beac95a with merge 27f0045cf33cf3c538ac843ac04a07414b772ec5...

@bors
Copy link
Collaborator

bors commented Mar 25, 2023

💔 Test failed - checks-actions

@bors bors removed the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Mar 25, 2023
@compiler-errors
Copy link
Member

@bors retry "no more archived files"

@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 25, 2023
@bors
Copy link
Collaborator

bors commented Mar 25, 2023

⌛ Testing commit beac95a with merge e5a94c74eae87992134d52b91ccd2bc8b0c492b9...

@bors
Copy link
Collaborator

bors commented Mar 25, 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 25, 2023
@matthiaskrgr
Copy link
Member Author

@bors retry

@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 25, 2023
@bors
Copy link
Collaborator

bors commented Mar 25, 2023

⌛ Testing commit beac95a with merge 78a48a7a204a21602ee9c19c9fa76ae44e4deb93...

@bors
Copy link
Collaborator

bors commented Mar 25, 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 25, 2023
@matthiaskrgr
Copy link
Member Author

@bors retry

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

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

Click to see the possible cause of the failure (guessed by this bot)
[2576/3025] Linking CXX static library lib\libLLVMAggressiveInstCombine.a
[2577/3025] Building CXX object tools/bugpoint/CMakeFiles/bugpoint.dir/ToolRunner.cpp.obj
[2578/3025] Linking CXX static library lib\libLLVMInstrumentation.a
[2579/3025] Linking CXX static library lib\libLLVMInstCombine.a
FAILED: lib/libLLVMInstCombine.a 
cmd.exe /C "cd . && "C:\Program Files\CMake\bin\cmake.exe" -E rm -f lib\libLLVMInstCombine.a && C:\a\rust\rust\mingw64\bin\ar.exe qc lib\libLLVMInstCombine.a  lib/Transforms/InstCombine/CMakeFiles/LLVMInstCombine.dir/InstructionCombining.cpp.obj lib/Transforms/InstCombine/CMakeFiles/LLVMInstCombine.dir/InstCombineAddSub.cpp.obj lib/Transforms/InstCombine/CMakeFiles/LLVMInstCombine.dir/InstCombineAtomicRMW.cpp.obj lib/Transforms/InstCombine/CMakeFiles/LLVMInstCombine.dir/InstCombineAndOrXor.cpp.obj lib/Transforms/InstCombine/CMakeFiles/LLVMInstCombine.dir/InstCombineCalls.cpp.obj lib/Transforms/InstCombine/CMakeFiles/LLVMInstCombine.dir/InstCombineCasts.cpp.obj lib/Transforms/InstCombine/CMakeFiles/LLVMInstCombine.dir/InstCombineCompares.cpp.obj lib/Transforms/InstCombine/CMakeFiles/LLVMInstCombine.dir/InstCombineLoadStoreAlloca.cpp.obj lib/Transforms/InstCombine/CMakeFiles/LLVMInstCombine.dir/InstCombineMulDivRem.cpp.obj lib/Transforms/InstCombine/CMakeFiles/LLVMInstCombine.dir/InstCombineNegator.cpp.obj lib/Transforms/InstCombine/CMakeFiles/LLVMInstCombine.dir/InstCombinePHI.cpp.obj lib/Transforms/InstCombine/CMakeFiles/LLVMInstCombine.dir/InstCombineSelect.cpp.obj lib/Transforms/InstCombine/CMakeFiles/LLVMInstCombine.dir/InstCombineShifts.cpp.obj lib/Transforms/InstCombine/CMakeFiles/LLVMInstCombine.dir/InstCombineSimplifyDemanded.cpp.obj lib/Transforms/InstCombine/CMakeFiles/LLVMInstCombine.dir/InstCombineVectorOps.cpp.obj && C:\a\rust\rust\mingw64\bin\ranlib.exe lib\libLLVMInstCombine.a && cd ."
C:\a\rust\rust\mingw64\bin\ar.exe: could not create temporary file whilst writing archive: no more archived files
[2580/3025] Linking CXX executable bin\UnicodeNameMappingGenerator.exe
[2581/3025] Linking CXX executable bin\llvm-config.exe
[2582/3025] Building CXX object tools/bugpoint/CMakeFiles/bugpoint.dir/ExecutionDriver.cpp.obj
[2583/3025] Building CXX object tools/llvm-profdata/CMakeFiles/llvm-profdata.dir/llvm-profdata.cpp.obj
[2583/3025] Building CXX object tools/llvm-profdata/CMakeFiles/llvm-profdata.dir/llvm-profdata.cpp.obj
[2584/3025] Building CXX object tools/bugpoint/CMakeFiles/bugpoint.dir/FindBugs.cpp.obj
[2585/3025] Linking CXX static library lib\libLLVMVectorize.a
[2586/3025] Building CXX object tools/bugpoint/CMakeFiles/bugpoint.dir/OptimizerDriver.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-6f17d22bba15001f\cmake-0.1.48\src\lib.rs:975:5
 finished in 291.332 seconds
Build completed unsuccessfully in 0:06:07
Build completed unsuccessfully in 0:06:07
make: *** [Makefile:80: ci-mingw-subset-2] Error 1

@bors
Copy link
Collaborator

bors commented Mar 25, 2023

⌛ Testing commit beac95a with merge 96bd50d...

@bors
Copy link
Collaborator

bors commented Mar 25, 2023

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

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

📌 Perf builds for each rolled up PR:

PR# Perf Build Sha
#109570 d8d4a925a8dc82ad61750d3c3333b471c01543a7
#109568 8cc189fb959820d4bf7597c4325d2edf28228bff
#109545 a055635216b1d077cc59fd3676c3430ea846cf04
#109542 9fcf264ddce135b5e1fc4d476da725bac5fee7bc
#109539 98a1cf49ec7bc0164ffa45a30805d66e7b2c5203
#109484 67ad4aaea68c6bf08947c00ef91edc54310b396b
#109355 56543a56c7d219a316c95d6747bbeefafce8c3c7

previous master: b72e896268

In the case of a perf regression, run the following command for each PR you suspect might be the cause: @rust-timer build $SHA

@rust-timer
Copy link
Collaborator

Finished benchmarking commit (96bd50d): 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.7% [-0.7%, -0.7%] 2
Improvements ✅
(secondary)
-0.6% [-0.7%, -0.6%] 5
All ❌✅ (primary) -0.7% [-0.7%, -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)
3.6% [3.6%, 3.6%] 1
Regressions ❌
(secondary)
0.9% [0.9%, 1.0%] 2
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
-0.6% [-0.6%, -0.5%] 4
All ❌✅ (primary) 3.6% [3.6%, 3.6%] 1

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.6% [0.6%, 0.6%] 1
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
-0.8% [-2.0%, -0.4%] 6
All ❌✅ (primary) - - 0

@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)
[2611/3021] Building CXX object tools/llc/CMakeFiles/llc.dir/llc.cpp.obj
[2612/3021] Linking CXX static library lib\libLLVMNVPTXCodeGen.a
[2613/3021] Linking CXX static library lib\libLLVMMipsCodeGen.a
[2614/3021] Linking CXX static library lib\libLLVMRISCVCodeGen.a
FAILED: lib/libLLVMRISCVCodeGen.a 
cmd.exe /C "cd . && "C:\Program Files\CMake\bin\cmake.exe" -E rm -f lib\libLLVMRISCVCodeGen.a && C:\a\rust\rust\mingw32\bin\ar.exe qc lib\libLLVMRISCVCodeGen.a  lib/Target/RISCV/CMakeFiles/LLVMRISCVCodeGen.dir/RISCVAsmPrinter.cpp.obj lib/Target/RISCV/CMakeFiles/LLVMRISCVCodeGen.dir/RISCVCallLowering.cpp.obj lib/Target/RISCV/CMakeFiles/LLVMRISCVCodeGen.dir/RISCVCodeGenPrepare.cpp.obj lib/Target/RISCV/CMakeFiles/LLVMRISCVCodeGen.dir/RISCVMakeCompressible.cpp.obj lib/Target/RISCV/CMakeFiles/LLVMRISCVCodeGen.dir/RISCVExpandAtomicPseudoInsts.cpp.obj lib/Target/RISCV/CMakeFiles/LLVMRISCVCodeGen.dir/RISCVExpandPseudoInsts.cpp.obj lib/Target/RISCV/CMakeFiles/LLVMRISCVCodeGen.dir/RISCVFrameLowering.cpp.obj lib/Target/RISCV/CMakeFiles/LLVMRISCVCodeGen.dir/RISCVGatherScatterLowering.cpp.obj lib/Target/RISCV/CMakeFiles/LLVMRISCVCodeGen.dir/RISCVInsertVSETVLI.cpp.obj lib/Target/RISCV/CMakeFiles/LLVMRISCVCodeGen.dir/RISCVInstrInfo.cpp.obj lib/Target/RISCV/CMakeFiles/LLVMRISCVCodeGen.dir/RISCVInstructionSelector.cpp.obj lib/Target/RISCV/CMakeFiles/LLVMRISCVCodeGen.dir/RISCVISelDAGToDAG.cpp.obj lib/Target/RISCV/CMakeFiles/LLVMRISCVCodeGen.dir/RISCVISelLowering.cpp.obj lib/Target/RISCV/CMakeFiles/LLVMRISCVCodeGen.dir/RISCVLegalizerInfo.cpp.obj lib/Target/RISCV/CMakeFiles/LLVMRISCVCodeGen.dir/RISCVMachineFunctionInfo.cpp.obj lib/Target/RISCV/CMakeFiles/LLVMRISCVCodeGen.dir/RISCVMacroFusion.cpp.obj lib/Target/RISCV/CMakeFiles/LLVMRISCVCodeGen.dir/RISCVMCInstLower.cpp.obj lib/Target/RISCV/CMakeFiles/LLVMRISCVCodeGen.dir/RISCVMergeBaseOffset.cpp.obj lib/Target/RISCV/CMakeFiles/LLVMRISCVCodeGen.dir/RISCVRedundantCopyElimination.cpp.obj lib/Target/RISCV/CMakeFiles/LLVMRISCVCodeGen.dir/RISCVRegisterBankInfo.cpp.obj lib/Target/RISCV/CMakeFiles/LLVMRISCVCodeGen.dir/RISCVRegisterInfo.cpp.obj lib/Target/RISCV/CMakeFiles/LLVMRISCVCodeGen.dir/RISCVSExtWRemoval.cpp.obj lib/Target/RISCV/CMakeFiles/LLVMRISCVCodeGen.dir/RISCVSubtarget.cpp.obj lib/Target/RISCV/CMakeFiles/LLVMRISCVCodeGen.dir/RISCVTargetMachine.cpp.obj lib/Target/RISCV/CMakeFiles/LLVMRISCVCodeGen.dir/RISCVTargetObjectFile.cpp.obj lib/Target/RISCV/CMakeFiles/LLVMRISCVCodeGen.dir/RISCVTargetTransformInfo.cpp.obj && C:\a\rust\rust\mingw32\bin\ranlib.exe lib\libLLVMRISCVCodeGen.a && cd ."
C:\a\rust\rust\mingw32\bin\ar.exe: could not create temporary file whilst writing archive: no more archived files
[2615/3021] Building CXX object tools/dsymutil/CMakeFiles/dsymutil.dir/CFBundle.cpp.obj
[2616/3021] Linking CXX static library lib\libLLVMPowerPCCodeGen.a
[2617/3021] Building CXX object tools/dsymutil/CMakeFiles/dsymutil.dir/Reproducer.cpp.obj
[2618/3021] Building CXX object tools/dsymutil/CMakeFiles/dsymutil.dir/SymbolMap.cpp.obj
[2618/3021] Building CXX object tools/dsymutil/CMakeFiles/dsymutil.dir/SymbolMap.cpp.obj
[2619/3021] Linking CXX executable bin\llvm-profdata.exe
[2620/3021] Building CXX object tools/dsymutil/CMakeFiles/dsymutil.dir/DwarfLinkerForBinary.cpp.obj
[2621/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 295.029 seconds
Build completed unsuccessfully in 0:07:49

@rust-log-analyzer
Copy link
Collaborator

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

Click to see the possible cause of the failure (guessed by this bot)
[RUSTC-TIMING] pathdiff test:false 0.220
[RUSTC-TIMING] rustc_demangle test:false 4.379
   Compiling cstr v0.2.8
[RUSTC-TIMING] syn test:false 20.779
rustc exited with signal: 11 (SIGSEGV)

Caused by:
Caused by:
  process didn't exit successfully: `/Users/runner/work/rust/rust/build/bootstrap/debug/rustc --crate-name syn --edition=2018 /Users/runner/.cargo/registry/src/index.crates.io-6f17d22bba15001f/syn-1.0.102/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="clone-impls"' --cfg 'feature="default"' --cfg 'feature="derive"' --cfg 'feature="extra-traits"' --cfg 'feature="fold"' --cfg 'feature="full"' --cfg 'feature="parsing"' --cfg 'feature="printing"' --cfg 'feature="proc-macro"' --cfg 'feature="quote"' --cfg 'feature="visit"' --cfg 'feature="visit-mut"' -Zunstable-options --check-cfg 'values(feature, "clone-impls", "default", "derive", "extra-traits", "fold", "full", "parsing", "printing", "proc-macro", "quote", "test", "visit", "visit-mut")' --check-cfg 'names()' --check-cfg 'values()' -C metadata=47e47c3c5b1ef108 -C extra-filename=-47e47c3c5b1ef108 --out-dir /Users/runner/work/rust/rust/build/x86_64-apple-darwin/stage0-rustc/release/deps -L dependency=/Users/runner/work/rust/rust/build/x86_64-apple-darwin/stage0-rustc/release/deps --extern proc_macro2=/Users/runner/work/rust/rust/build/x86_64-apple-darwin/stage0-rustc/release/deps/libproc_macro2-be6ba8f82e325dcb.rmeta --extern quote=/Users/runner/work/rust/rust/build/x86_64-apple-darwin/stage0-rustc/release/deps/libquote-026f507d17a7bdd6.rmeta --extern unicode_ident=/Users/runner/work/rust/rust/build/x86_64-apple-darwin/stage0-rustc/release/deps/libunicode_ident-3590c8b0001c5439.rmeta --cap-lints allow -Z binary-dep-depinfo --cfg syn_disable_nightly_tests` (exit status: 254)
[RUSTC-TIMING] synstructure test:false 2.341
[RUSTC-TIMING] cstr test:false 0.900
[RUSTC-TIMING] regex_automata test:false 10.367
[RUSTC-TIMING] regex_syntax test:false 20.904

@matthiaskrgr matthiaskrgr deleted the rollup-e8fi2vi 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
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-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.