Rollup of 11 pull requests #104555

matthiaskrgr · 2022-11-17T21:33:23Z

Successful merges:

Don't remap early-bound regions for return-position impl Trait in trait originating from impl #103852 (Don't remap early-bound regions for return-position impl Trait in trait originating from impl)
Simplify settings theme choice #104366 (Simplify settings theme choice)
Fix emit_unused_delims_expr ICE #104433 (Fix emit_unused_delims_expr ICE)
Fix ICE in in_operand for ty error #104444 (Fix ICE in in_operand for ty error)
Convert predicates into Predicate in the Obligation constructor #104483 (Convert predicates into Predicate in the Obligation constructor)
Don't attempt to normalize compiler backtraces #104496 (Don't attempt to normalize compiler backtraces)
rustdoc: remove redundant font-color CSS on .where #104503 (rustdoc: remove redundant font-color CSS on .where)
Check dyn* return type correctly #104508 (Check dyn* return type correctly)
ICE fixing, remove is_tainted_by_errors since we have ty_error for delay bug #104515 (ICE fixing, remove is_tainted_by_errors since we have ty_error for delay bug)
Migrate tooltip style to CSS variables #104532 (Migrate tooltip style to CSS variables)
Readd the matches_macro diag item #104545 (Readd the matches_macro diag item)

Failed merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

add ui tests

Its name is now not accurate anymore, but we'll adjust that later

…ror for delay bug

Backtraces can very significantly depending on environment and cause test suite failures spuriously. Ensuring a proper failure-status should be sufficient to keep a crash properly documented.

Before 7f6ce7d, light-theme where clauses had color `#4E4C4C` while the main color was `#000`. One of that commit's simplifications made it so that everything used the same black.

This is now used by Clippy

…impl, r=lcnr Don't remap early-bound regions for return-position `impl Trait` in trait originating from `impl` long title 😓 We don't want to remap early-bound regions that originate from the `impl`s themselves, since they have no corresponding region in the trait. Not sure if there's a better condition than checking if the EBR's def-id's parent is the impl -- maybe we should be checking if the region comes from the method or RPITIT... 🤷 r? types Fixes rust-lang#103850

…heme-choice, r=notriddle Simplify settings theme choice I removed the storage changes from rust-lang#98765 and only kept the UI changes. You can test it [here](https://rustdoc.crud.net/imperio/simplify-settings-theme-choice/foo/index.html). Discussion about this still in progress [on zulip](https://rust-lang.zulipchat.com/#narrow/stream/266220-rustdoc/topic/Last.20part.20of.20settings.20simplification). r? ````@notriddle````

Fix `emit_unused_delims_expr` ICE Fixes rust-lang#104392

…mpiler-errors Fix ICE in in_operand for ty error Fixes rust-lang#104390 By the way, moving some test cases to proper directory for tidy bless.

…r=compiler-errors Convert predicates into Predicate in the Obligation constructor instead of having almost all callers do that. This reduces a bit of boilerplate, and also paves the way for my work towards rust-lang/compiler-team#531 (as it makes it easier to accept both goals and clauses where right now it only accepts predicates).

…backtraces, r=jackh726 Don't attempt to normalize compiler backtraces Backtraces can very significantly depending on environment and cause spurious test suite failures. Ensuring a proper failure-status should be sufficient to keep a crash properly documented. This caused a failure in Fuchsia's test suite CI due to an extra newline between "stack" and "error" appearing after normalization. cc ````@jackh726```` r? ````@tmandry````

…aumeGomez rustdoc: remove redundant font-color CSS on `.where` Before 7f6ce7d, light-theme where clauses had color `#4E4C4C` while the main color was `#000`. One of that commit's simplifications made it so that everything used the same black.

Check `dyn*` return type correctly In `check_fn`, if the declared return type is `dyn Trait`, then we check the return type separately to produce better diagnostics, because this is never valid -- however, when `dyn*` was introduced, this check was never adjusted to only account for *unsized* `dyn Trait` and not *sized* `dyn* Trait`. Fixes rust-lang#104501

…r=compiler-errors ICE fixing, remove is_tainted_by_errors since we have ty_error for delay bug Fixes rust-lang#104510

…, r=notriddle Migrate tooltip style to CSS variables

…r=compiler-errors Readd the matches_macro diag item This is now used by Clippy r? `@compiler-errors` This was removed in rust-lang#104383. But in the meantime Clippy now makes use of it https://github.com/rust-lang/rust-clippy/blob/dac600e32fce89cb4b05ae6edb0c47982b99eb48/clippy_lints/src/manual_is_ascii_check.rs#L153 --- This is blocking the Clippy sync. (kinda. I could work around it, but I don't want to play ping-pong with this change.)

notriddle · 2022-11-18T02:28:16Z

@bors retry

Network flake

bors · 2022-11-18T04:52:29Z

⌛ Testing commit 239f84b with merge 84690c18c644683c290acb03f6292aee387e6eac...

bors · 2022-11-18T05:53:34Z

💔 Test failed - checks-actions

rust-log-analyzer · 2022-11-18T05:56:38Z

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

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

test str::utf8_char_counts ... ok

failures:

---- rc::rc_from_vec_opt stdout ----
thread 'rc::rc_from_vec_opt' panicked at 'assertion failed: `(left == right)`
  left: `9568`,
 right: `16`: Vector allocation not reused', library\alloc\tests\rc.rs:217:9

failures:
    rc::rc_from_vec_opt


test result: FAILED. 652 passed; 1 failed; 0 ignored; 0 measured; 0 filtered out; finished in 1.18s

error: test failed, to rerun pass `-p alloc --test collectionstests`
Build completed unsuccessfully in 0:48:25
make: *** [Makefile:83: ci-mingw-subset-1] Error 1

matthiaskrgr · 2022-11-18T07:43:31Z

The test failure is from https://github.com/rust-lang/rust/pull/104205/files#diff-7c162f3385758481b661bb4120fe36635a2933c200bd7713a34ba9e47bac411fR220 #104205
which merged already. cc @clubby789

I don't see any related changes or std changes in this pr so I want to know if this is spurious.
Anyway we might have to disable the test if it keeps failing randomly. :/
@bors retry

matthiaskrgr · 2022-11-18T08:47:23Z

cc #104563

bors · 2022-11-18T10:06:31Z

⌛ Testing commit 239f84b with merge 9d46c7a...

bors · 2022-11-18T13:12:12Z

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

rust-timer · 2022-11-18T13:15:21Z

📌 Perf builds for each rolled up PR:

PR#	Perf Build Sha
#104545	c9f200e8dfbac89e3fc43dc623109d3e2f917381
#104532	c8a350a1f25272bb8509e0380612a403f28dc9fe
#104515	cb0f350b21a22f59afced72e3f6eeae210f4b1e7
#104508	303a7bbb79e81eb91f1badf99e28b458ea36ce66
#104503	b641bea9e6955bd2862d83b65425110d388283a9
#104496	d58662ea2ba29ce6bfed124ee4d3b0d0a7ca0d07
#104483	9ec92a15221c79e68665de68f6cbed8ec76cdaf2
#104444	ebd07874246265e08428125e10fb1e62f1727948
#104433	5311858f9d4006231eb71a06d0eca2655b11d6ff
#104366	00262d47e1e2cd0fdac6c4a6b9003355e4698dc6
#103852	025f1134184784de70084d013d4b906d91c2b69c

previous master: 30117a1dbb

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-11-18T14:30:52Z

Finished benchmarking commit (9d46c7a): comparison URL.

Overall result: ❌ regressions - 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.4%, 0.5%]	2
Regressions ❌ (secondary)	1.3%	[1.3%, 1.3%]	2
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	0.4%	[0.4%, 0.5%]	2

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)	2.5%	[2.5%, 2.5%]	1
Regressions ❌ (secondary)	1.2%	[1.2%, 1.2%]	1
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-2.8%	[-4.0%, -1.7%]	5
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.7%	[0.7%, 0.7%]	1
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	-	-	0

nnethercote · 2022-11-21T22:46:39Z

externs is noisy at the moment, and the two doc regressions for syn and webrender are small enough to not worry about.

@rustbot label: +perf-regression-triaged

compiler-errors and others added 27 commits November 1, 2022 23:25

Don't remap early-bound RPITIT regions that originate from impl

72fbb54

Simplify settings UI by merging system theme with the theme choices

b4580d5

Update GUI test

4074aae

Extend GUI test for theme settings

dacf9b8

simplify emit_unused_delims_expr

0616106

return when expr has errors

1cf4132

add ui tests

Generalize the ToPredicate trait

634df06

Its name is now not accurate anymore, but we'll adjust that later

Convert predicates into Predicate in the Obligation constructor

4f11f3b

fix rust-lang#104390, fix ICE in in_operand for ty error

20ea083

fix rust-lang#104510, Remove is_tainted_by_errors since we have ty_er…

9c2d4dd

…ror for delay bug

Don't attempt to normalize compiler backtraces

b44d808

Backtraces can very significantly depending on environment and cause test suite failures spuriously. Ensuring a proper failure-status should be sufficient to keep a crash properly documented.

rustdoc: remove redundant font-color CSS on .where

893bd78

Before 7f6ce7d, light-theme where clauses had color `#4E4C4C` while the main color was `#000`. One of that commit's simplifications made it so that everything used the same black.

Check dyn* return type correctly

75afb22

Migrate tooltip style to CSS variables

16b5590

Extend codeblock GUI test to include tooltips

11d0c97

Readd the matches_macro diag item

34a1434

This is now used by Clippy

Rollup merge of rust-lang#104433 - TaKO8Ki:fix-104392, r=estebank

c9ccb0b

Fix `emit_unused_delims_expr` ICE Fixes rust-lang#104392

Rollup merge of rust-lang#104444 - chenyukang:yukang/fix-104390, r=co…

1c52c24

…mpiler-errors Fix ICE in in_operand for ty error Fixes rust-lang#104390 By the way, moving some test cases to proper directory for tidy bless.

Rollup merge of rust-lang#104515 - chenyukang:yukang/fix-104510-ice, …

5829287

…r=compiler-errors ICE fixing, remove is_tainted_by_errors since we have ty_error for delay bug Fixes rust-lang#104510

Rollup merge of rust-lang#104532 - GuillaumeGomez:migrate-tooltip-css…

4e59188

…, r=notriddle Migrate tooltip style to CSS variables

rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-libs Relevant to the library team, which will review and decide on the PR/issue. labels Nov 17, 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 Nov 18, 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 Nov 18, 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 Nov 18, 2022

bors added the merged-by-bors This PR was explicitly merged by bors. label Nov 18, 2022

bors merged commit 9d46c7a into rust-lang:master Nov 18, 2022

rustbot added this to the 1.67.0 milestone Nov 18, 2022

rustbot added the perf-regression Performance regression. label Nov 18, 2022

rustbot added the perf-regression-triaged The performance regression has been triaged. label Nov 21, 2022

matthiaskrgr deleted the rollup-tncyca8 branch December 22, 2022 10:47

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Rollup of 11 pull requests #104555

Rollup of 11 pull requests #104555

matthiaskrgr commented Nov 17, 2022

notriddle commented Nov 18, 2022

bors commented Nov 18, 2022

bors commented Nov 18, 2022

rust-log-analyzer commented Nov 18, 2022

matthiaskrgr commented Nov 18, 2022

matthiaskrgr commented Nov 18, 2022

bors commented Nov 18, 2022

bors commented Nov 18, 2022

rust-timer commented Nov 18, 2022

rust-timer commented Nov 18, 2022

nnethercote commented Nov 21, 2022

Rollup of 11 pull requests #104555

Rollup of 11 pull requests #104555

Conversation

matthiaskrgr commented Nov 17, 2022

notriddle commented Nov 18, 2022

bors commented Nov 18, 2022

bors commented Nov 18, 2022

rust-log-analyzer commented Nov 18, 2022

matthiaskrgr commented Nov 18, 2022

matthiaskrgr commented Nov 18, 2022

bors commented Nov 18, 2022

bors commented Nov 18, 2022

rust-timer commented Nov 18, 2022

rust-timer commented Nov 18, 2022

Overall result: ❌ regressions - ACTION NEEDED

Instruction count

Max RSS (memory usage)

Cycles

nnethercote commented Nov 21, 2022