Rollup of 10 pull requests #102150

matthiaskrgr · 2022-09-22T19:34:57Z

Successful merges:

OpTy: fix a method taking self rather than &self #102113 (OpTy: fix a method taking self rather than &self)
rustdoc: clean up line numbers on code examples #102118 (rustdoc: clean up line numbers on code examples)
Add note to clippy::non_expressive_names doc #102123 (Add note to clippy::non_expressive_names doc)
rustdoc: remove no-op CSS .content .item-info { position: relative } #102125 (rustdoc: remove no-op CSS .content .item-info { position: relative })
Use appropriate variable names #102127 (Use appropriate variable names)
Const unification is already infallible, remove the error handling logic #102128 (Const unification is already infallible, remove the error handling logic)
Use valtrees for comparison #102133 (Use valtrees for comparison)
Improve some AllTypes fields name #102135 (Improve some AllTypes fields name)
Extend const_convert with const {FormResidual, Try} for ControlFlow. #102144 (Extend const_convert with const {FormResidual, Try} for ControlFlow.)
rustdoc: remove no-op CSS .location:empty { border: none } #102147 (rustdoc: remove no-op CSS .location:empty { border: none })

Failed merges:

r? @ghost
@rustbot modify labels: rollup

`display: inline-flex` was used as part of e961d39, the original commit that added these line numbers. Does anyone know why it was done this way?

This rule was added to help position the marker line in 110e727, which was a `position: absolute` pseudo-element that relied on its parent to put it in the right spot. The arrow was removed in 73d0f7c, so the `relative` position is no longer necessary.

This rule was added in 2bb2a29 to remove a border placed around the location when it's empty. That rule was removed in 6a5f8b1, so this rule does nothing.

OpTy: fix a method taking self rather than &self r? `@oli-obk`

…r=GuillaumeGomez rustdoc: clean up line numbers on code examples * First commit switches from `display: inline-flex; width: 100%` to `display: flex`. `display: inline-flex` was used as part of rust-lang@e961d39, the original commit that added these line numbers. Does anyone know why it was done this way? * Second commit makes it so that toggling this checkbox will update the page in real time, just like changing themes does. Preview: https://notriddle.com/notriddle-rustdoc-test/line-numbers/std/vec/struct.Vec.html

Add note to clippy::non_expressive_names doc Addresses confusion in rust-lang/rust-clippy#9514 by updating the lint docs.

…nfo, r=GuillaumeGomez rustdoc: remove no-op CSS `.content .item-info { position: relative }` This rule was added to help position the marker line in 110e727, which was a `position: absolute` pseudo-element that relied on its parent to put it in the right spot. (it was changed from a line to an arrow in 1ffb9cf, then a different arrow in ae3a53f). The arrow was removed in 73d0f7c, so the `relative` position is no longer necessary.

…ames, r=lcnr Use appropriate variable names

Const unification is already infallible, remove the error handling logic r? `@lcnr` is this expected to be used in the future? Right now it is dead code.

…t, r=lcnr Use valtrees for comparison r? `@lcnr`

…lds, r=notriddle Improve some AllTypes fields name r? `@notriddle`

…low, r=scottmcm Extend const_convert with const {FormResidual, Try} for ControlFlow. Very small change so I just used the existing `const_convert` feature flag. rust-lang#88674 Newly const API: ``` impl<B, C> const ops::Try for ControlFlow<B, C>; impl<B, C> const ops::FromResidual for ControlFlow<B, C>; ``` `@usbalbin` I hope it is ok that I added to your feature.

…r-none, r=GuillaumeGomez rustdoc: remove no-op CSS `.location:empty { border: none }` This rule was added in 2bb2a29 to remove a border placed around the location when it's empty. That rule was removed in 6a5f8b1, so this rule does nothing.

matthiaskrgr · 2022-09-22T19:35:17Z

@bors r+ rollup=never p=9

bors · 2022-09-22T19:35:18Z

📌 Commit dfeff64 has been approved by matthiaskrgr

It is now in the queue for this repository.

bors · 2022-09-22T20:40:55Z

⌛ Testing commit dfeff64 with merge 13847cb1691405d7d02cbc4ce19601aee44518d2...

bors · 2022-09-23T00:55:57Z

💥 Test timed out

notriddle · 2022-09-23T01:37:41Z

It locked up in the middle of pulling the crates.io index. Probably a fluke.

@bors retry

bors · 2022-09-23T04:19:23Z

⌛ Testing commit dfeff64 with merge 7f4712d92d3829938ed6d08d6d4e51f4a11097fa...

bors · 2022-09-23T04:20:06Z

💔 Test failed - checks-actions

matthiaskrgr · 2022-09-23T05:08:27Z

@bors retry no logs

bors · 2022-09-23T06:52:42Z

⌛ Testing commit dfeff64 with merge bc4d574...

bors · 2022-09-23T09:33:16Z

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

rust-timer · 2022-09-23T09:36:21Z

📌 Perf builds for each rolled up PR:

PR#	Perf Build Sha
#102147	1e97b20aad50425831f5ce6cdd8eef9b6d81075a
#102144	60b733f19789dbcffa60cc490edc86d27f41f6bb
#102135	d4cbd37d952ea60f78f2877a6a335846ad99eade
#102133	efffca91390a246675be015348aeb7c6a01b9439
#102128	fb3b6c5ac33f036722e22bb0226cb782aa0d72b4
#102127	0697d79c5746e81db9ae28267a016f56a5e16784
#102125	0b6dd01c91af7fb89e417b82535d9315e82ae25f
#102123	b34ad3a98f8094cf59865d07c5c16989dee9df1e
#102118	c5e728680dc8b874d8c9764faacf51e9a740a441
#102113	885a5b37e2cfaae10cd3b43cb92aab5f0c5373b5

previous master: 77e7e88567

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 · 2022-09-23T10:51:59Z

Finished benchmarking commit (bc4d574): 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.3%	[-0.4%, -0.2%]	4
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	-0.3%	[-0.4%, -0.2%]	4

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)	-	-	0
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-4.7%	[-4.7%, -4.7%]	1
All ❌✅ (primary)	-	-	0

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

the arithmetic mean of the percent change ↩ ↩² ↩³
number of relevant changes ↩ ↩² ↩³

rust-log-analyzer · 2022-09-23T17:59:07Z

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 · 2022-09-23T23:29:01Z

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

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

RalfJung and others added 22 commits September 21, 2022 22:20

OpTy: fix a method taking self rather than &self

0f4d7b6

rustdoc: use block flex for line-number CSS

7a718f3

`display: inline-flex` was used as part of e961d39, the original commit that added these line numbers. Does anyone know why it was done this way?

rustdoc: dynamically show-hide line numbers on code examples

f66769f

rustdoc: adjust test to cope with slightly different scrolling behaviour

8b4c0d9

Add note to clippy::non_expressive_names doc

51c752a

use appropriate variable names

2d7f987

Const unification is already infallible, remove the error handling logic

13438ee

Improve some AllTypes fields name

d3f97a3

use valtrees for comparison

e859425

Constify {FormResidual, Try} for ControlFlow

5a5138d

rustdoc: remove no-op CSS .location:empty { border: none }

8abf487

This rule was added in 2bb2a29 to remove a border placed around the location when it's empty. That rule was removed in 6a5f8b1, so this rule does nothing.

Rollup merge of rust-lang#102113 - RalfJung:opty-assert-mem, r=oli-obk

41ad726

OpTy: fix a method taking self rather than &self r? `@oli-obk`

Rollup merge of rust-lang#102123 - schteve:clippy-note, r=Manishearth

86acea4

Add note to clippy::non_expressive_names doc Addresses confusion in rust-lang/rust-clippy#9514 by updating the lint docs.

Rollup merge of rust-lang#102127 - TaKO8Ki:use-appropriate-variable-n…

c5d2230

…ames, r=lcnr Use appropriate variable names

Rollup merge of rust-lang#102128 - oli-obk:const_unification, r=lcnr

b93c9a7

Const unification is already infallible, remove the error handling logic r? `@lcnr` is this expected to be used in the future? Right now it is dead code.

Rollup merge of rust-lang#102133 - b-naber:use-valtrees-in-fast-rejec…

aa38483

…t, r=lcnr Use valtrees for comparison r? `@lcnr`

Rollup merge of rust-lang#102135 - GuillaumeGomez:rename-alltypes-fie…

a99e675

…lds, r=notriddle Improve some AllTypes fields name r? `@notriddle`

bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Sep 22, 2022

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 Sep 23, 2022

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 Sep 23, 2022

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 Sep 23, 2022

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 Sep 23, 2022

bors added the merged-by-bors This PR was explicitly merged by bors. label Sep 23, 2022

bors mentioned this pull request Sep 23, 2022

Separate definitions and HIR owners in the type system #102040

Merged

bors merged commit bc4d574 into rust-lang:master Sep 23, 2022

rustbot added this to the 1.66.0 milestone Sep 23, 2022

matthiaskrgr deleted the rollup-6xmd8f3 branch October 9, 2022 00:31

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Rollup of 10 pull requests #102150

Rollup of 10 pull requests #102150

matthiaskrgr commented Sep 22, 2022

matthiaskrgr commented Sep 22, 2022

bors commented Sep 22, 2022

bors commented Sep 22, 2022

bors commented Sep 23, 2022

notriddle commented Sep 23, 2022 •

edited

Loading

bors commented Sep 23, 2022

bors commented Sep 23, 2022

matthiaskrgr commented Sep 23, 2022

bors commented Sep 23, 2022

bors commented Sep 23, 2022

rust-timer commented Sep 23, 2022

rust-timer commented Sep 23, 2022

rust-log-analyzer commented Sep 23, 2022

rust-log-analyzer commented Sep 23, 2022

Rollup of 10 pull requests #102150

Rollup of 10 pull requests #102150

Conversation

matthiaskrgr commented Sep 22, 2022

matthiaskrgr commented Sep 22, 2022

bors commented Sep 22, 2022

bors commented Sep 22, 2022

bors commented Sep 23, 2022

notriddle commented Sep 23, 2022 • edited Loading

bors commented Sep 23, 2022

bors commented Sep 23, 2022

matthiaskrgr commented Sep 23, 2022

bors commented Sep 23, 2022

bors commented Sep 23, 2022

rust-timer commented Sep 23, 2022

rust-timer commented Sep 23, 2022

Overall result: ✅ improvements - no action needed

Instruction count

Max RSS (memory usage)

Cycles

Footnotes

rust-log-analyzer commented Sep 23, 2022

rust-log-analyzer commented Sep 23, 2022

notriddle commented Sep 23, 2022 •

edited

Loading