Rollup of 10 pull requests #108096

matthiaskrgr · 2023-02-15T20:31:00Z

Successful merges:

Migrating rustc_infer to session diagnostics (part 4) #107034 (Migrating rustc_infer to session diagnostics (part 4))
Fix unintentional UB in ui tests #107972 (Fix unintentional UB in ui tests)
Make InferCtxt::can_eq and InferCtxt::can_sub return booleans #108010 (Make InferCtxt::can_eq and InferCtxt::can_sub return booleans)
make x look for x.py if shell script does not exist #108021 (make x look for x.py if shell script does not exist)
Use target instead of machine for mir interpreter integer handling. #108047 (Use target instead of machine for mir interpreter integer handling.)
Don't suggest #[doc(hidden)] trait methods with matching return type #108049 (Don't suggest #[doc(hidden)] trait methods with matching return type)
Better names for illegal impl trait positions #108066 (Better names for illegal impl trait positions)
rustdoc: Use more let chain #108076 (rustdoc: Use more let chain)
clarify correctness of black_box #108088 (clarify correctness of black_box)
Demonstrate I/O in File examples #108094 (Demonstrate I/O in File examples)

Failed merges:

r? @ghost
@rustbot modify labels: rollup

…atisfied diagnostics

bump up x version Refactor code

The naming of `machine` only makes sense from a mir interpreter internals perspective, but outside users talk about the `target` platform

…li-obk Migrating rustc_infer to session diagnostics (part 4) `@rustbot` label +A-translation r? rust-lang/diagnostics cc rust-lang#100717

…rister Fix unintentional UB in ui tests `@matthiaskrgr` found UB in a bunch of the ui tests. This PR fixes a batch of miscellaneous tests I didn't think needed reviewers from a particular part of the project.

…l, r=lcnr Make `InferCtxt::can_eq` and `InferCtxt::can_sub` return booleans Nobody matches on the result, nor does the result return anything useful...

make x look for x.py if shell script does not exist Fixes rust-lang#107907 Manually tested by doing the following after changes were made: 1. `cargo install --path src/tools/x` 2. checked out old version: commit hash `775c3c0` from rust-lang#99992 3. Ran `x --help` and it works. Previously, it was giving the error `x.py not found`

Use `target` instead of `machine` for mir interpreter integer handling. The naming of `machine` only makes sense from a mir interpreter internals perspective, but outside users talk about the `target` platform. As per rust-lang#108029 (comment) r? `@RalfJung`

…=compiler-errors Don't suggest `#[doc(hidden)]` trait methods with matching return type Fixes rust-lang#107983, addressing the bad suggestion. The test can probably be made more specific to this case, but I'm unsure how. `@rustbot` label +A-diagnostics

…bad-impl-trait, r=petrochenkov Better names for illegal impl trait positions Just some wording tweaks, no behavior changes.

…otriddle rustdoc: Use more let chain Got the idea after yesterday's review. r? `@notriddle`

clarify correctness of `black_box` Resolves rust-lang#107957, as described in the related issue. No code changes, just documentation.

bors · 2023-02-15T20:43:11Z

⌛ Testing commit 5547101 with merge 508dd4ba2f0659d567ba4f8b09f31c9c8ecd7db9...

bors · 2023-02-15T20:56:04Z

💔 Test failed - checks-actions

matthiaskrgr · 2023-02-15T20:57:10Z

@bors retry

bors · 2023-02-16T00:12:58Z

⌛ Testing commit 5547101 with merge dc7a676...

bors · 2023-02-16T03:44:23Z

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

rust-timer · 2023-02-16T03:47:11Z

📌 Perf builds for each rolled up PR:

PR#	Perf Build Sha
#108094	2d1aca2e6a83f4f1dc4d3b0ff24433136a061f59
#108088	d5fdda4de876bdbe4d7782534529f729fdeed586
#108076	6265f929468eed1218964b8de5cfd3d47f023e0f
#108066	44111d42dde6b2c21714cec80eef2a715656f688
#108049	e9f791b5cedf8000c676d60836cce79b2f9f919c
#108047	60fcb21cd249de1959bbd8f6c22a345e971f47d6
#108021	6f00f5045610fad351e2ba3237b78b827b9e4e93
#108010	4d09e308847294c4242327e294571a2639defb75
#107972	a60dd4e4291b33ddfa8ffca70c00e05e7ad445fc
#107034	aaa765f4da4cbd45e262b66849747b144b2c2ecd

previous master: c5283576ec

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 · 2023-02-16T05:34:41Z

Finished benchmarking commit (dc7a676): comparison URL.

Overall result: no relevant changes - no action needed

@rustbot label: -perf-regression

Instruction count

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

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.5%	[3.2%, 3.8%]	3
Regressions ❌ (secondary)	2.5%	[0.6%, 4.8%]	52
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-5.5%	[-5.8%, -5.2%]	2
All ❌✅ (primary)	3.5%	[3.2%, 3.8%]	3

Cycles

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

rust-log-analyzer · 2023-02-16T18:48:18Z

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

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

[2629/3021] Linking CXX static library lib\libLLVMWebAssemblyDesc.a
[2630/3021] Linking CXX static library lib\libLLVMM68kAsmParser.a
[2631/3021] Linking CXX static library lib\libLLVMWebAssemblyDisassembler.a
FAILED: lib/libLLVMWebAssemblyDisassembler.a 
cmd.exe /C "cd . && "C:\Program Files\CMake\bin\cmake.exe" -E rm -f lib\libLLVMWebAssemblyDisassembler.a && D:\a\rust\rust\mingw32\bin\ar.exe qc lib\libLLVMWebAssemblyDisassembler.a  lib/Target/WebAssembly/Disassembler/CMakeFiles/LLVMWebAssemblyDisassembler.dir/WebAssemblyDisassembler.cpp.obj && D:\a\rust\rust\mingw32\bin\ranlib.exe lib\libLLVMWebAssemblyDisassembler.a && cd ."
D:\a\rust\rust\mingw32\bin\ranlib.exe: could not create temporary file whilst writing archive: no more archived files
[2632/3021] Linking CXX static library lib\libLLVMWebAssemblyCodeGen.a
[2633/3021] Linking CXX static library lib\libLLVMX86CodeGen.a
[2634/3021] Building CXX object tools/dsymutil/CMakeFiles/dsymutil.dir/SymbolMap.cpp.obj
[2635/3021] Building CXX object tools/lli/CMakeFiles/lli.dir/ExecutionUtils.cpp.obj
[2635/3021] Building CXX object tools/lli/CMakeFiles/lli.dir/ExecutionUtils.cpp.obj
[2636/3021] Linking CXX executable bin\llvm-profdata.exe
[2637/3021] Building CXX object tools/lli/CMakeFiles/lli.dir/lli.cpp.obj
[2638/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 268.496 seconds
Build completed unsuccessfully in 0:07:32
Build completed unsuccessfully in 0:07:32
make: *** [Makefile:78: ci-mingw-subset-1] Error 1

matthiaskrgr · 2023-02-16T19:21:42Z

thanks @rust-log-analyzer, just in time 🙂

compiler-errors and others added 30 commits February 13, 2023 19:29

Make can_eq and can_sub return booleans

eb286dd

Port OutlivesContent, OutlivesBound, FUllfillReqLifetime, LfBoundNotS…

8fc5ba6

…atisfied diagnostics

Port "BorrowedTooLong" diagnostic

58e901b

Port RefLongerThanData

cb8ea01

Port another diagnostic

35dbec3

Resolve rebase

8d590dc

Port WhereClauseSuggestions

b8feb63

Make sure tests pass

6fa4c7d

Port SuggestRemoveSemiOrReturnBinding

9f06c3d

Port ConsiderAddingAwait

fdbec62

Port PlaceholderRelationLfNotSatisfied diagnostic

5c7afde

Specify correct spans in suggest_await_on_expect_found

58939b9

Better label for illegal impl trait types

3f80017

make x look for x.py if shell script does not exist

54cfc10

bump up x version Refactor code

Use target instead of machine for mir interpreter integer handling.

38b7cdf

The naming of `machine` only makes sense from a mir interpreter internals perspective, but outside users talk about the `target` platform

Use more let chain

86fd5a1

Don't suggest #[doc(hidden)] methods

f4de121

Fix unintentional UB in ui tests

de01ea2

clarify correctness of black_box

29621ba

Demonstrate I/O in File examples

15adc7b

Suggest simpler fs helper methods in File::{open,create}

4c2d48e

Rollup merge of rust-lang#107034 - IntQuant:issue-100717-infer-5, r=o…

1fdf0e1

…li-obk Migrating rustc_infer to session diagnostics (part 4) `@rustbot` label +A-translation r? rust-lang/diagnostics cc rust-lang#100717

Rollup merge of rust-lang#107972 - saethlin:fix-test-ub, r=michaelwoe…

d40c13a

…rister Fix unintentional UB in ui tests `@matthiaskrgr` found UB in a bunch of the ui tests. This PR fixes a batch of miscellaneous tests I didn't think needed reviewers from a particular part of the project.

Rollup merge of rust-lang#108010 - compiler-errors:can_eq-returns-boo…

8f65e25

…l, r=lcnr Make `InferCtxt::can_eq` and `InferCtxt::can_sub` return booleans Nobody matches on the result, nor does the result return anything useful...

Rollup merge of rust-lang#108066 - compiler-errors:better-labels-for-…

8259755

…bad-impl-trait, r=petrochenkov Better names for illegal impl trait positions Just some wording tweaks, no behavior changes.

Rollup merge of rust-lang#108076 - GuillaumeGomez:more-let-chain, r=n…

09ab35b

…otriddle rustdoc: Use more let chain Got the idea after yesterday's review. r? `@notriddle`

Rollup merge of rust-lang#108088 - callumio:issue-107957, r=dtolnay

863cd15

clarify correctness of `black_box` Resolves rust-lang#107957, as described in the related issue. No code changes, just documentation.

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 15, 2023

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 15, 2023

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 15, 2023

bors added the merged-by-bors This PR was explicitly merged by bors. label Feb 16, 2023

bors merged commit dc7a676 into rust-lang:master Feb 16, 2023

rustbot added this to the 1.69.0 milestone Feb 16, 2023

erikdesjardins mentioned this pull request Feb 19, 2023

CI: spurious error building LLVM on mingw: ranlib.exe: could not create temporary file whilst writing archive: no more archived files #108227

Open

matthiaskrgr deleted the rollup-ncexzf6 branch March 16, 2024 18:19

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Rollup of 10 pull requests #108096

Rollup of 10 pull requests #108096

matthiaskrgr commented Feb 15, 2023

bors commented Feb 15, 2023

bors commented Feb 15, 2023

matthiaskrgr commented Feb 15, 2023

bors commented Feb 16, 2023

bors commented Feb 16, 2023

rust-timer commented Feb 16, 2023

rust-timer commented Feb 16, 2023

rust-log-analyzer commented Feb 16, 2023

matthiaskrgr commented Feb 16, 2023

Rollup of 10 pull requests #108096

Rollup of 10 pull requests #108096

Conversation

matthiaskrgr commented Feb 15, 2023

bors commented Feb 15, 2023

bors commented Feb 15, 2023

matthiaskrgr commented Feb 15, 2023

bors commented Feb 16, 2023

bors commented Feb 16, 2023

rust-timer commented Feb 16, 2023

rust-timer commented Feb 16, 2023

Overall result: no relevant changes - no action needed

Instruction count

Max RSS (memory usage)

Cycles

rust-log-analyzer commented Feb 16, 2023

matthiaskrgr commented Feb 16, 2023