Rollup of 4 pull requests by matthiaskrgr · Pull Request #101396 · rust-lang/rust

matthiaskrgr · 2022-09-03T22:20:44Z

Successful merges:

Suggest associated method on deref types when path syntax method fails #100302 (Suggest associated method on deref types when path syntax method fails)
Make trait bound not satisfied specify kind #100647 ( Make trait bound not satisfied specify kind)
rustdoc: remove .impl-items { flex-basis } CSS, not in flex container #101349 (rustdoc: remove .impl-items { flex-basis } CSS, not in flex container)
Fix global_asm macro pretty printing #101369 (Fix global_asm macro pretty printing)

Failed merges:

r? @ghost
@rustbot modify labels: rollup

Added in 34bd2b8 For this to actually do anything, [according to MDN] (and Firefox Dev Tools), it must be a "flex item", which only happens if its a direct child of a node with `display: flex` on it. It seems like it could not have worked at the time when this rule was added, because the only items in `rustdoc.css` with `display: flex` active were: * `#help` This should not contain anything like this. * `.impl-items h4, h4.impl, h3.impl` These are all headers, so they shouldn't contain `.impl-items` either. * `.content .impl-items .method, .content .impl-items > .type, .impl-items > .associatedconstant` Associated constants and methods definitely shouldn't contain a list of impl items, and the `.type` class seems to refer to type aliases, which, when shown inside of an impl, only show a link to the aliased type. [according to MDN]: https://developer.mozilla.org/en-US/docs/Web/CSS/flex-basis Nowadays, `display: flex` is a lot more prolific, but `.impl-items` still seems to only be used in plain block parents: * If it's not a trait impl, then it's nested below a `<div>` with an id but no class, added in a5216cf. This will be `display: block`, probably. For example, [vec deref] * Inherent impls also get a `<div>` tag, for example [vec impl], and they are also wrapped by their own non-flexbox `<details>` tag. * If it's a tait implementation, then it's also nested below a `<details>` container, like [deref cstring]. [vec impl]: https://doc.rust-lang.org/1.63.0/std/vec/struct.Vec.html#impl [vec deref]: https://doc.rust-lang.org/1.63.0/std/vec/struct.Vec.html#deref-methods-%5BT%5D [deref cstring]: https://doc.rust-lang.org/1.63.0/std/ops/trait.Deref.html#impl-Deref Also, this would imply that trait items ought to take up as much space as possible, pushing everything else to the edge of the screen. If this is nested directly below the `.rustdoc` container, which has a row basis, that would be bad.

…, r=jackh726 Suggest associated method on deref types when path syntax method fails Fixesrust-lang#100278

Make trait bound not satisfied specify kind Closesrust-lang#99875

…GuillaumeGomez rustdoc: remove `.impl-items { flex-basis }` CSS, not in flex container Added in 34bd2b8 For this to actually do anything, [according to MDN] (and Firefox Dev Tools), it must be a "flex item", which only happens if its a direct child of a node with `display: flex` on it. It seems like it could not have worked at the time when this rule was added, because the only items in `rustdoc.css` with `display: flex` active were: * `#help` This should not contain anything like this. * `.impl-items h4, h4.impl, h3.impl` These are all headers, so they shouldn't contain `.impl-items` either. * `.content .impl-items .method, .content .impl-items > .type, .impl-items > .associatedconstant` Associated constants and methods definitely shouldn't contain a list of impl items, and the `.type` class seems to refer to type aliases, which, when shown inside of an impl, only show a link to the aliased type. [according to MDN]: https://developer.mozilla.org/en-US/docs/Web/CSS/flex-basis Nowadays, `display: flex` is a lot more prolific, but `.impl-items` still seems to only be used in plain block parents: * If it's not a trait impl, then it's nested below a `<div>` with an id but no class, added in a5216cf. This will be `display: block`, probably. For example, [vec deref] * Inherent impls also get a `<div>` tag, for example [vec impl], and they are also wrapped by their own non-flexbox `<details>` tag. * If it's a tait implementation, then it's also nested below a `<details>` container, like [deref cstring]. [vec impl]: https://doc.rust-lang.org/1.63.0/std/vec/struct.Vec.html#impl [vec deref]: https://doc.rust-lang.org/1.63.0/std/vec/struct.Vec.html#deref-methods-%5BT%5D [deref cstring]: https://doc.rust-lang.org/1.63.0/std/ops/trait.Deref.html#impl-Deref Also, this would imply that trait items ought to take up as much space as possible, pushing everything else to the edge of the screen. If this is nested directly below the `.rustdoc` container, which has a row basis, that would be bad.

… r=jackh726 Fix `global_asm` macro pretty printing Fixesrust-lang#101051Fixesrust-lang#101047

matthiaskrgr · 2022-09-03T22:21:04Z

@bors r+rollup=never p=4

matthiaskrgr · 2022-09-03T22:35:27Z

@bors r+ rollup=never p=4

bors · 2022-09-03T22:35:29Z

📌 Commit a3dda51 has been approved by matthiaskrgr

It is now in the queue for this repository.

bors · 2022-09-04T02:59:48Z

⌛ Testing commit a3dda51 with merge 5fecdb7...

bors · 2022-09-04T05:14:25Z

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

rust-timer · 2022-09-04T05:15:48Z

📌 Perf builds for each rolled up PR:

PR#	Perf Build Sha
#101369	e0e12aee6a69d9ca85c21462105421aec42e2027
#101349	e8d1302e923f0eed768f761cb36670eb6a706cb2
#100647	5874d3119a2658dc980978e6fb06405603704b63
#100302	c5a89e0afda66ebc5f38505d203735475caf1623

previous master: 84f0c3f79a

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-04T06:30:00Z

Finished benchmarking commit (5fecdb7): comparison URL.

Overall result: ❌✅ regressions and 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.7%	[0.6%, 0.8%]	5
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-2.0%	[-2.0%, -2.0%]	1
All ❌✅ (primary)	-	-	0

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)	6.2%	[6.2%, 6.2%]	1
Regressions ❌ (secondary)	4.5%	[2.6%, 6.4%]	2
Improvements ✅ (primary)	-2.2%	[-2.2%, -2.2%]	1
Improvements ✅ (secondary)	-3.6%	[-5.1%, -2.3%]	4
All ❌✅ (primary)	2.0%	[-2.2%, 6.2%]	2

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.6%	[2.1%, 3.1%]	2
Regressions ❌ (secondary)	2.4%	[2.2%, 2.4%]	4
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	2.6%	[2.1%, 3.1%]	2

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

obeisand others added 8 commits August 29, 2022 16:53

Make the trait bound is not satisfied specify kind
1383f0e

Suggest associated method on deref types
12a4952

Fix global_asm macro pretty printing
e9b01c7

Rollup merge ofrust-lang#100302- compiler-errors:deref-path-methods…
bd9750f
…, r=jackh726 Suggest associated method on deref types when path syntax method fails Fixesrust-lang#100278

Rollup merge ofrust-lang#100647- obeis:issue-99875, r=nagisa
d085194
Make trait bound not satisfied specify kind Closesrust-lang#99875

Rollup merge ofrust-lang#101369- compiler-errors:global-asm-pprint,…
a3dda51
… r=jackh726 Fix `global_asm` macro pretty printing Fixesrust-lang#101051Fixesrust-lang#101047

rustbot added 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 Sep 3, 2022

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 3, 2022

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

bors merged commit 5fecdb7 into rust-lang:masterSep 4, 2022

rustbot added this to the 1.65.0 milestone Sep 4, 2022

bors mentioned this pull request Sep 4, 2022
Make const_eval_select a real intrinsic #100759
Merged

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

matthiaskrgr mentioned this pull request Sep 3, 2023
ICE: has escaping bound vars, so it cannot be wrapped in a dummy binder.#115517
Closed

Navigation Menu

Uh oh!

Uh oh!

Rollup of 4 pull requests - #101396

Rollup of 4 pull requests#101396
bors merged 8 commits into
rust-lang:masterfrom
matthiaskrgr:rollup-9n0257m

matthiaskrgr commented Sep 3, 2022

Uh oh!

matthiaskrgr commented Sep 3, 2022

Uh oh!

matthiaskrgr commented Sep 3, 2022

Uh oh!

bors commented Sep 3, 2022

Uh oh!

bors commented Sep 4, 2022

Uh oh!

bors commented Sep 4, 2022

Uh oh!

rust-timer commented Sep 4, 2022

Uh oh!

rust-timer commented Sep 4, 2022

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

7 participants

Uh oh!

Uh oh!

Conversation

matthiaskrgr commented Sep 3, 2022

Uh oh!

matthiaskrgr commented Sep 3, 2022

Uh oh!

matthiaskrgr commented Sep 3, 2022

Uh oh!

bors commented Sep 3, 2022

Uh oh!

bors commented Sep 4, 2022

Uh oh!

bors commented Sep 4, 2022

Uh oh!

rust-timer commented Sep 4, 2022

Uh oh!

rust-timer commented Sep 4, 2022

Overall result: ❌✅ regressions and improvements - no action needed

Instruction count

Max RSS (memory usage)

Cycles

Footnotes

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

7 participants