Rollup of 8 pull requests by GuillaumeGomez · Pull Request #108339 · rust-lang/rust

GuillaumeGomez · 2023-02-22T09:35:11Z

Successful merges:

Move some InferCtxt methods to EvalCtxt in new solver #108110 (Move some InferCtxt methods to EvalCtxt in new solver)
Fix ICE on type alias in recursion #108168 (Fix ICE on type alias in recursion)
Convert a hard-warning about named static lifetimes into lint "unused_lifetimes" #108230 (Convert a hard-warning about named static lifetimes into lint "unused_lifetimes")
Fix overlapping spans in removing extra arguments #108239 (Fix overlapping spans in removing extra arguments)
Add an InstCombine for redundant casts #108246 (Add an InstCombine for redundant casts)
no-fail-fast support for tool testsuites #108264 (no-fail-fast support for tool testsuites)
rustdoc: Fix duplicated attributes for first reexport #108310 (rustdoc: Fix duplicated attributes for first reexport)
Remove unused FileDesc::get_cloexec #108318 (Remove unused FileDesc::get_cloexec)

Failed merges:

r? @ghost
@rustbot modify labels: rollup

…_lifetimes" Define the `named_static_lifetimes` lint This lint will replace the existing hard-warning. Replace the named static lifetime hard-warning with the new lint Update the UI tests for the `named_static_lifetimes` lint Remove the direct dependency on `rustc_lint_defs` fix build Signed-off-by: Zhi Qi <qizhi@pingcap.com> use "UNUSED_LIFETIMES" instead Signed-off-by: Zhi Qi <qizhi@pingcap.com> update 1 test and fix typo Signed-off-by: Zhi Qi <qizhi@pingcap.com> update tests Signed-off-by: Zhi Qi <qizhi@pingcap.com> fix tests: add extra blank line Signed-off-by: Zhi Qi <qizhi@pingcap.com>

This commit adds `--no-fail-fast` flag to each `cargo test` command in each tool Step trait implementation. Fixesrust-lang#108261

…fcx, r=lcnr Move some `InferCtxt` methods to `EvalCtxt` in new solver Moving towards eventually making the `InferCtxt` within `EvalCtxt` private, so that we make sure not to do anything strange in the solver. This doesn't finish this work yet, just gets it started. r? ``@lcnr``

…compiler-errors Fix ICE on type alias in recursion Fixesrust-lang#108160

…bank Convert a hard-warning about named static lifetimes into lint "unused_lifetimes" Fixesrust-lang#96956. Some changes are ported from rust-lang#98079, thanks to jeremydavis519. r? `@estebank` `@petrochenkov` Any feedback is appreciated! ## Actions - [x] resolve conflicts - [x] fix build - [x] address review comments in last pr - [x] update tests

…piler-errors Fix overlapping spans in removing extra arguments Fixesrust-lang#108225 Each span is already extended to include the previous comma, so extending to the *next* comma is unecessary and causes an ICE with assertions on. ``@rustbot`` label +A-diagnostics

…ts, r=compiler-errors Add an InstCombine for redundant casts `@rustbot` label +A-mir-opt

…-fail-fast, r=ozkanonur no-fail-fast support for tool testsuites ~~This commit adds a change to pass "--no-fail-fast" flag to `cargo test` inside `tool::prepare_tool_cargo()` so there is no need to do it manually in each `Step` trait implementation in src/bootstrap/test.rs.~~ ~~Also, removes the flag from test.rs where prepare_tool_cargo() is called so cargo doesn't complain because the flag has been passed twice.~~ This commit adds `--no-fail-fast` flag to each `cargo test` command in each tool Step trait implementation (`miri`, `rustfmt` and `clippy`). Fixesrust-lang#108261

…cated-attributes, r=notriddle rustdoc: Fix duplicated attributes for first reexport Fixesrust-lang#108281. r? ``@notriddle``

Remove unused FileDesc::get_cloexec

GuillaumeGomez · 2023-02-22T09:35:22Z

@bors r+ rollup=never p=8

bors · 2023-02-22T09:35:24Z

📌 Commit 0d0de49 has been approved by GuillaumeGomez

It is now in the queue for this repository.

bors · 2023-02-22T12:04:49Z

⌛ Testing commit 0d0de49 with merge 3b4d6e0...

bors · 2023-02-22T15:14:14Z

☀️ Test successful - checks-actions
Approved by: GuillaumeGomez
Pushing 3b4d6e0 to master...

rust-timer · 2023-02-22T15:16:32Z

📌 Perf builds for each rolled up PR:

PR#	Perf Build Sha
#108318	e17658b8cb40e61b507b99037c8bf09d4e42052e
#108310	2e9609f8daf37db31abbfc4c5f550d9fe80116fb
#108264	67b894643cef8b2461f7990727a21cef3aadffaf
#108246	66381686298e3f7dc9dc6cc56d73e852ea426473
#108239	eb1bd68287e693d12bde8734bbc199a21948fb33
#108230	11835a0c10e14b092877e19853022c4d5a4904a9
#108168	3fd500866a80bf653671dd4b85ef62c868686f54
#108110	b6f45f222f6216cc3a80942d5f66bacb9891f004

previous master: bd4a96a12d

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-22T16:31:28Z

Finished benchmarking commit (3b4d6e0): 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.4%	[0.3%, 0.6%]	4
Regressions ❌ (secondary)	0.8%	[0.7%, 0.9%]	6
Improvements ✅ (primary)	-0.8%	[-3.0%, -0.2%]	8
Improvements ✅ (secondary)	-0.2%	[-0.3%, -0.2%]	2
All ❌✅ (primary)	-0.4%	[-3.0%, 0.6%]	12

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)	-	-	0
Regressions ❌ (secondary)	2.5%	[2.1%, 3.4%]	8
Improvements ✅ (primary)	-2.5%	[-2.5%, -2.5%]	1
Improvements ✅ (secondary)	-2.9%	[-2.9%, -2.9%]	1
All ❌✅ (primary)	-2.5%	[-2.5%, -2.5%]	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
Improvements ✅ (primary)	-2.6%	[-2.6%, -2.6%]	1
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	-2.6%	[-2.6%, -2.6%]	1

pnkfelix · 2023-03-01T03:24:30Z

seems like a wash, in terms of mix of regressions and improvements. the one outlier was the 3% improvement to opt-full on cranelift-codegen.
the primary regressions were to ripgrep opt-full (0.59%), image opt-full (0.51%), cranelift-codegen check-full (0.42%), and cranelift-codegen check-incr-full (0.27%)
I do not think its worth trying to dissect the rollup at this point though. Marking as triaged.

@rustbot label: +perf-regression-triaged

- rust-lang/rust#106238 - rust-lang/rust#107409 - rust-lang/rust#108339 - rust-lang/rust#108498 - rust-lang/rust#108683 - rust-lang/rust#108814 - rust-lang/rust#108832 - rust-lang/rust#109020

clubby789and others added 17 commits February 17, 2023 16:20

Fix ICE on type alias in recursion
21bcd2e

Add an InstCombine for redundant casts
0e05280

Fix overlapping spans in removing extra arguments
0b9a3e2

Fix duplicated attributes for first reexport
f58c8ab

Add regression test forrust-lang#108281
fec6ad6

Remove unused FileDesc::get_cloexec
7867aa8

Move some InferCtxt methods to EvalCtxt in new solver
7596998

Add no-fail-fast support to miri, rustfmt and clippy testsuites
2f16355
This commit adds `--no-fail-fast` flag to each `cargo test` command in each tool Step trait implementation. Fixesrust-lang#108261

Rollup merge ofrust-lang#108168- clubby789:recursive-type-alias, r=…
89c201e
…compiler-errors Fix ICE on type alias in recursion Fixesrust-lang#108160

Rollup merge ofrust-lang#108246- saethlin:instcombine-redundant-cas…
4658210
…ts, r=compiler-errors Add an InstCombine for redundant casts `@rustbot` label +A-mir-opt

Rollup merge ofrust-lang#108310- GuillaumeGomez:fix-reexports-dupli…
8d33b78
…cated-attributes, r=notriddle rustdoc: Fix duplicated attributes for first reexport Fixesrust-lang#108281. r? ``@notriddle``

Rollup merge ofrust-lang#108318- tmiasko:rm-get_cloexec, r=the8472
0d0de49
Remove unused FileDesc::get_cloexec

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

bors mentioned this pull request Feb 22, 2023
apply query response: actually define opaque types #108342
Merged

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

bors merged commit 3b4d6e0 into rust-lang:masterFeb 22, 2023

rustbot added this to the 1.69.0 milestone Feb 22, 2023

GuillaumeGomez deleted the rollup-4z02kas branch February 22, 2023 15:26

This was referenced Feb 22, 2023
new solver: implement canonicalization and region constraints #107981
Merged
Make object bound candidates sound in the new trait solver #108333
Merged
Remove type-traversal trait aliases #108340
Merged

rustbot added the perf-regression Performance regression. label Feb 22, 2023

rustbot added the perf-regression-triaged The performance regression has been triaged. label Mar 1, 2023

ritikmishra mentioned this pull request Mar 12, 2023
Add some ICEs rust-lang/glacier#1525
Merged

Navigation Menu

Uh oh!

Uh oh!

Rollup of 8 pull requests - #108339

Rollup of 8 pull requests#108339
bors merged 17 commits into
rust-lang:masterfrom
GuillaumeGomez:rollup-4z02kas

GuillaumeGomez commented Feb 22, 2023

Uh oh!

GuillaumeGomez commented Feb 22, 2023

Uh oh!

bors commented Feb 22, 2023

Uh oh!

bors commented Feb 22, 2023

Uh oh!

bors commented Feb 22, 2023

Uh oh!

rust-timer commented Feb 22, 2023

Uh oh!

rust-timer commented Feb 22, 2023

Uh oh!

pnkfelix commented Mar 1, 2023

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

10 participants

Uh oh!

Uh oh!

Conversation

GuillaumeGomez commented Feb 22, 2023

Uh oh!

GuillaumeGomez commented Feb 22, 2023

Uh oh!

bors commented Feb 22, 2023

Uh oh!

bors commented Feb 22, 2023

Uh oh!

bors commented Feb 22, 2023

Uh oh!

rust-timer commented Feb 22, 2023

Uh oh!

rust-timer commented Feb 22, 2023

Overall result: ❌✅ regressions and improvements - ACTION NEEDED

Instruction count

Max RSS (memory usage)

Cycles

Uh oh!

pnkfelix commented Mar 1, 2023

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

10 participants