Rollup of 6 pull requests by compiler-errors · Pull Request #106482 · rust-lang/rust

compiler-errors · 2023-01-05T04:36:30Z

Successful merges:

Account for return-position impl Trait in trait in opt_suggest_box_span #105846 (Account for return-position impl Trait in trait in opt_suggest_box_span)
Split -Zchalk flag into -Ztrait-solver=(classic|chalk|next) flag #106385 (Split -Zchalk flag into -Ztrait-solver=(classic|chalk|next) flag)
Rename hir::Map::{get_,find_}parent_node to hir::Map::{,opt_}parent_id, and add hir::Map::{get,find}_parent #106403 (Rename hir::Map::{get_,find_}parent_node to hir::Map::{,opt_}parent_id, and add hir::Map::{get,find}_parent)
rustdoc: remove unnecessary wrapper around sidebar and mobile logos #106462 (rustdoc: remove unnecessary wrapper around sidebar and mobile logos)
Update Fuchsia walkthrough with new configs #106464 (Update Fuchsia walkthrough with new configs)
Tweak wording of fn call with wrong number of args #106478 (Tweak wording of fn call with wrong number of args)

Failed merges:

r? @ghost
@rustbot modify labels: rollup

This commit changes `.sidebar a:hover:not(.logo-container)` to add the `:not()` pseudo-class, retaining the old appearance of the logo when mousing over it. This didn't used to be necessary because the `a.sidebar-logo` was `display:inline`, and was what got the `background` changed on hover, while the `div.logo-container` inside it was `display:block`. This resulted in the hover rule not having any effect, because the logo-container box was not actually nested inside the sidebar-logo box: https://www.w3.org/TR/CSS2/visuren.html#anonymous-block-level > When an inline box contains an in-flow block-level box, the inline box (and its inline ancestors within the same line box) are broken around the block-level box (and any block-level siblings that are consecutive or separated only by collapsible whitespace and/or out-of-flow elements), splitting the inline box into two boxes (even if either side is empty), one on each side of the block-level box(es). The line boxes before the break and after the break are enclosed in anonymous block boxes, and the block-level box becomes a sibling of those anonymous boxes. When such an inline box is affected by relative positioning, any resulting translation also affects the block-level box contained in the inline box.

The new `download-ci-llvm` configuration option dosn't work with `lld = true` (see rust-lang#100853). The Fuchsia walkthrough should recommend setting it to `false`.

…ckh726 Account for return-position `impl Trait` in trait in `opt_suggest_box_span` RPITITs are the only types where their opaque bounds might normalize to some other self type than the opaque type itself. To avoid needing to do normalization, let's just match on either alias kind. Ideally, we'd just get rid of `opt_suggest_box_span`. It's kind of a wart on type-checking `if`/`match`. I've recently refactored this expression for being confusing/wrong, but moving it into the error path is pretty hard. Fixes rust-lang#105838

…=jackh726 Split `-Zchalk` flag into `-Ztrait-solver=(classic|chalk|next)` flag We'll eventually need a way to select more than chalk + not-chalk. Does this need an MCP since it's touching a `-Z` flag? Or perhaps I should preserve `-Zchalk` for the time being... maybe I could make it a warning to use that flag? cc ``@rust-lang/types`` r? types

…, r=cjgillot Rename `hir::Map::{get_,find_}parent_node` to `hir::Map::{,opt_}parent_id`, and add `hir::Map::{get,find}_parent` The `hir::Map::get_parent_node` function doesn't return a `Node`, and I think that's quite confusing. Let's rename it to something that sounds more like something that gets the parent hir id => `hir::Map::parent_id`. Same with `find_parent_node` => `opt_parent_id`. Also, combine `hir.get(hir.parent_id(hir_id))` and similar `hir.find(hir.parent_id(hir_id))` function into new functions that actually retrieve the parent node in one call. This last commit is the only one that might need to be looked at closely.

…-sidebar, r=GuillaumeGomez rustdoc: remove unnecessary wrapper around sidebar and mobile logos This commit changes `.sidebar a:hover:not(.logo-container)` to add the `:not()` pseudo-class, retaining the old appearance of the logo when mousing over it. This didn't used to be necessary because the `a.sidebar-logo` was `display:inline`, and was what got the `background` changed on hover, while the `div.logo-container` inside it was `display:block`. This resulted in the hover rule not having any effect, because the logo-container box was not actually nested inside the sidebar-logo box: https://www.w3.org/TR/CSS2/visuren.html#anonymous-block-level > When an inline box contains an in-flow block-level box, the inline box (and its inline ancestors within the same line box) are broken around the block-level box (and any block-level siblings that are consecutive or separated only by collapsible whitespace and/or out-of-flow elements), splitting the inline box into two boxes (even if either side is empty), one on each side of the block-level box(es). The line boxes before the break and after the break are enclosed in anonymous block boxes, and the block-level box becomes a sibling of those anonymous boxes. When such an inline box is affected by relative positioning, any resulting translation also affects the block-level box contained in the inline box.

…support_docs, r=tmandry Update Fuchsia walkthrough with new configs The new `download-ci-llvm` configuration option dosn't work with `lld = true` (see rust-lang#100853). The Fuchsia walkthrough should recommend setting it to `false`. r? `@tmandry`

…iler-errors Tweak wording of fn call with wrong number of args

compiler-errors · 2023-01-05T04:36:39Z

@bors r+ rollup=never p=5

bors · 2023-01-05T04:36:41Z

📌 Commit e048ee2 has been approved by compiler-errors

It is now in the queue for this repository.

bors · 2023-01-05T06:47:05Z

⌛ Testing commit e048ee2 with merge 1429899...

bors · 2023-01-05T09:44:28Z

☀️ Test successful - checks-actions
Approved by: compiler-errors
Pushing 1429899 to master...

rust-timer · 2023-01-05T09:46:13Z

📌 Perf builds for each rolled up PR:

PR#	Perf Build Sha
#106478	a441230070dea05060c59b0f6fc40af81ae41fe1
#106464	1c87a2b1b765b1e18c0d7b10a0c5653a3813a2af
#106462	3c0719c776f37782ae778291f2da63e3e72cf001
#106403	f3fbf7fad2f92dc21b2c425a48887f42326609db
#106385	b3afeb1de3d929e6ccb61dd1aca7e4e7ae57150d
#105846	e92015cff539aaa92797de61504f137ec180872c

previous master: 03b9e1d154

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-01-05T11:04:09Z

Finished benchmarking commit (1429899): comparison URL.

Overall result: ❌ regressions - 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)	1.2%	[1.1%, 1.3%]	2
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-	-	0
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)	0.9%	[0.9%, 0.9%]	1
Regressions ❌ (secondary)	-	-	0
Improvements ✅ (primary)	-2.4%	[-2.4%, -2.4%]	2
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	-1.3%	[-2.4%, 0.9%]	3

Cycles

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

compiler-errors and others added 16 commits December 17, 2022 22:26

Account for RPITITs in opt_suggest_box_span

7df33a0

rename get_parent_node to parent_id

a313ef0

rename find_parent_node to opt_parent_id

6af339d

get_parent and find_parent

b1b19bd

Split -Zchalk flag into -Ztrait-solver=(stock|chalk|next) flag

a4974fa

Update tests, etc

1e81f9a

Rename stock solver to classic

8b0f43b

Update Fuchsia walkthrough with new configs

56eb7ee

The new `download-ci-llvm` configuration option dosn't work with `lld = true` (see rust-lang#100853). The Fuchsia walkthrough should recommend setting it to `false`.

Tweak wording of fn call with wrong number of args

5393c6b

Rollup merge of rust-lang#106478 - estebank:tweak-fn-mismatch, r=comp…

e048ee2

…iler-errors Tweak wording of fn call with wrong number of args

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 Jan 5, 2023

bors added the merged-by-bors This PR was explicitly merged by bors. label Jan 5, 2023

bors merged commit 1429899 into rust-lang:master Jan 5, 2023

bors mentioned this pull request Jan 5, 2023

Add vendor to Fuchsia's target triple #106429

Merged

compiler-errors deleted the rollup-g7n1p39 branch August 11, 2023 20:16

cuviper added this to the 1.68.0 milestone Nov 16, 2023

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Rollup of 6 pull requests#106482

Rollup of 6 pull requests#106482
bors merged 16 commits intorust-lang:masterfrom
compiler-errors:rollup-g7n1p39

compiler-errors commented Jan 5, 2023

Uh oh!

compiler-errors commented Jan 5, 2023

Uh oh!

bors commented Jan 5, 2023

Uh oh!

bors commented Jan 5, 2023

Uh oh!

bors commented Jan 5, 2023

Uh oh!

rust-timer commented Jan 5, 2023

Uh oh!

rust-timer commented Jan 5, 2023

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

8 participants

Uh oh!

Conversation

compiler-errors commented Jan 5, 2023

Uh oh!

compiler-errors commented Jan 5, 2023

Uh oh!

bors commented Jan 5, 2023

Uh oh!

bors commented Jan 5, 2023

Uh oh!

bors commented Jan 5, 2023

Uh oh!

rust-timer commented Jan 5, 2023

Uh oh!

rust-timer commented Jan 5, 2023

Overall result: ❌ regressions - no action needed

Instruction count

Max RSS (memory usage)

Cycles

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

8 participants