Rollup of 8 pull requests#102822

notriddle · 2022-10-09T01:15:03Z

Successful merges:

don't ICE when normalizing closure input tys #99818 (don't ICE when normalizing closure input tys)
Don't repeat lifetime names from outer binder in print #102514 (Don't repeat lifetime names from outer binder in print)
rustdoc: Document effect of fundamental types #102661 (rustdoc: Document effect of fundamental types)
Add regression test for #102124 #102782 (Add regression test for ICE: assertion failed: key.param_env.is_const()' -Zmir-opt-level=3 #102124)
Fix llvm-tblgen for cross compiling #102790 (Fix llvm-tblgen for cross compiling)
Document rust-docs-json component #102807 (Document rust-docs-json component)
Remove empty core::lazy and std::lazy #102812 (Remove empty core::lazy and std::lazy)
Clean up rustdoc highlight.rs imports a bit #102818 (Clean up rustdoc highlight.rs imports a bit)

Failed merges:

r? @ghost
@rustbot modify labels: rollup

`normalize_and_add_constraints` doesn't add entries in `universe_causes` when creating new universes, causing an ICE. Remove it! Add spans to track normalization constraints. Fix couple places where `universe_causes` is not updated correctly to track newly added universes.

PR rust-lang#98165 with commits 7c360dc and c1a2db3 has moved all of the components of these modules into different places, namely {std,core}::sync and {std,core}::cell. The empty modules remained. As they are unstable, we can simply remove them.

…ackh726 don't ICE when normalizing closure input tys We were ICEing while rendering diagnostics because `universe_causes` is expected to track every universe created in the typeck's infcx. `normalize_and_add_constraints` doesn't update `universe_causes` when creating new universes, causing an ICE. Remove it! Add spans to better track normalization constraints. Fix couple places where `universe_causes` is not updated correctly to track newly added universes. Fixes rust-lang#102800 ~Fixess rust-lang#99665~ (UPDATE: no longer true; the issue has a different failure path than when this PR was created and should be fixed by rust-lang#101708, but the changes in this PR are still correct and should prevent potential future ICEs)

…h726 Don't repeat lifetime names from outer binder in print Fixes rust-lang#102392 Fixes rust-lang#102414 r? ```@lcnr```

…t-of-fundamental, r=notriddle rustdoc: Document effect of fundamental types This was implemented in rust-lang#96565, but not documented. But it's a useful feature for everyone who implements own wrapper (especially wrappers-around-pointers) types, so that they can behave like pointers (and stdlib wrappers) do -- so here goes a mention in the unstable section of the rustdoc book. (That is where I initially looked to find tricks for making my own wrapper types be transparent to documentation).

…acrum Add regression test for rust-lang#102124 closes rust-lang#102124, which was already fixed on nightly.

Fix llvm-tblgen for cross compiling - Let llvm-config tell us where to find its tools - Add llvm-tblgen to rust-dev for cross-compiling Fixes rust-lang#86890. r? ````@jyn514````

…yn514 Document `rust-docs-json` component Follow up to rust-lang#102241 r? ````@jyn514````

Remove empty core::lazy and std::lazy PR rust-lang#98165 with commits 7c360dc and c1a2db3 has moved all of the components of these modules into different places, namely {std,core}::sync and {std,core}::cell. The empty modules remained. As they are unstable, we can simply remove them.

…s, r=Urgau Clean up rustdoc highlight.rs imports a bit r? `@Dylan-DPC`

notriddle · 2022-10-09T01:49:47Z

@bors r+ rollup=never p=8

bors · 2022-10-09T01:49:49Z

📌 Commit 16a1eea has been approved by notriddle

It is now in the queue for this repository.

bors · 2022-10-09T02:11:35Z

⌛ Testing commit 16a1eea with merge 9753eca8739a4a2bc74c08d1968055d6fc3a8198...

bors · 2022-10-09T02:44:35Z

💔 Test failed - checks-actions

notriddle · 2022-10-09T02:57:26Z

@bors retry

#93784 (comment)

rust-log-analyzer · 2022-10-09T03:57:52Z

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

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

.......... (70/78)
........   (78/78)


/checkout/src/test/rustdoc-gui/basic-code.goml basic-code... FAILED
[ERROR] (line 3) expected 1 elements, found 0: for command `assert-count: (".src-line-numbers", 1)`
Build completed unsuccessfully in 0:02:20

bors · 2022-10-09T04:10:55Z

⌛ Testing commit 16a1eea with merge 09674b997bca407d08ce079e6731893a462cc731...

bors · 2022-10-09T08:25:55Z

💥 Test timed out

matthiaskrgr · 2022-10-09T08:30:08Z

@bors retry

bors · 2022-10-09T08:30:17Z

⌛ Testing commit 16a1eea with merge c078410...

rust-log-analyzer · 2022-10-09T08:54:55Z

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

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

bors · 2022-10-09T11:32:54Z

☀️ Test successful - checks-actions
Approved by: notriddle
Pushing c078410 to master...

rust-timer · 2022-10-09T11:35:29Z

📌 Perf builds for each rolled up PR:

PR#	Perf Build Sha
#102818	4a9f3b7c3fa14d022f585ce78bfbd4940eb298f4
#102812	9d80392c618ce5c0dc17ae6d1fb6bce61a3809a0
#102807	d3a544066f31753c8ea37442255a92c30b047f63
#102790	eed92dfa701f8399316bbc9b294f6577e3f422cc
#102782	fdd62ba41ddfa30ac3cdb6e2acc173d579598d87
#102661	b085b309dc7f3ba3ba8765febf99102a4fd391b2
#102514	b42605d045bb68dbbba11742ba842467cd5e81ff
#99818	35bdf3becec121888991dbc353fb8217776947d4

previous master: f382c2748a

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-10-09T14:11:43Z

Finished benchmarking commit (c078410): comparison URL.

Overall result: no relevant changes - no action needed

@rustbot label: -perf-regression

Instruction count

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

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)	11.6%	[11.6%, 11.6%]	1
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-	-	0
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)	-	-	0
Regressions ❌ (secondary)	3.3%	[2.0%, 4.7%]	2
Improvements ✅ (primary)	-2.1%	[-2.1%, -2.1%]	1
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	-2.1%	[-2.1%, -2.1%]	1

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

b-naber and others added 22 commits September 30, 2022 15:44

don't repeat lifetime names from outer binder in print

e1f735a

bless tests

a8f17e3

re-name params + add comments

e83dcf4

rustdoc: Document effect of fundamental types

31bc385

Add regression test for rust-lang#102124

462730f

Let llvm-config tell us where to find its tools

1283441

Add llvm-tblgen to rust-dev for cross-compiling

40e497f

Bump download-ci-llvm-stamp

c327719

Don't run llvm-config in dry runs

a027474

Document rust-docs-json component

7e64000

handle late-bound vars from inner binders correctly and add test

048e637

Clean up rustdoc highlight.rs imports a bit

3a7918a

Rollup merge of rust-lang#102514 - b-naber:binder-print-fixes, r=jack…

5ba30a6

…h726 Don't repeat lifetime names from outer binder in print Fixes rust-lang#102392 Fixes rust-lang#102414 r? ```@lcnr```

Rollup merge of rust-lang#102782 - Hosshii:issue-102124, r=Mark-Simul…

f1ab04f

…acrum Add regression test for rust-lang#102124 closes rust-lang#102124, which was already fixed on nightly.

Rollup merge of rust-lang#102790 - cuviper:llvm-tblgen, r=jyn514

21c6a0e

Fix llvm-tblgen for cross compiling - Let llvm-config tell us where to find its tools - Add llvm-tblgen to rust-dev for cross-compiling Fixes rust-lang#86890. r? ````@jyn514````

Rollup merge of rust-lang#102807 - aDotInTheVoid:rdj-rustup-docs, r=j…

8c4191a

…yn514 Document `rust-docs-json` component Follow up to rust-lang#102241 r? ````@jyn514````

Rollup merge of rust-lang#102818 - rust-lang:clean-up-highlight-impot…

16a1eea

…s, r=Urgau Clean up rustdoc highlight.rs imports a bit r? `@Dylan-DPC`

bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Oct 9, 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 Oct 9, 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 Oct 9, 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 Oct 9, 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 Oct 9, 2022

bors added the merged-by-bors This PR was explicitly merged by bors. label Oct 9, 2022

bors merged commit c078410 into rust-lang:master Oct 9, 2022

rustbot added this to the 1.66.0 milestone Oct 9, 2022

bors mentioned this pull request Oct 9, 2022

Uplift clippy::for_loops_over_fallibles lint into rustc #99696

Merged

notriddle deleted the rollup-mgfjb62 branch October 9, 2022 13:42

Uh oh!

Conversation

notriddle commented Oct 9, 2022

Uh oh!

notriddle commented Oct 9, 2022

Uh oh!

bors commented Oct 9, 2022

Uh oh!

bors commented Oct 9, 2022

Uh oh!

bors commented Oct 9, 2022

Uh oh!

notriddle commented Oct 9, 2022

Uh oh!

rust-log-analyzer commented Oct 9, 2022

Uh oh!

bors commented Oct 9, 2022

Uh oh!

bors commented Oct 9, 2022

Uh oh!

matthiaskrgr commented Oct 9, 2022

Uh oh!

bors commented Oct 9, 2022

Uh oh!

rust-log-analyzer commented Oct 9, 2022

Uh oh!

bors commented Oct 9, 2022

Uh oh!

rust-timer commented Oct 9, 2022

Uh oh!

rust-timer commented Oct 9, 2022

Overall result: no relevant changes - no action needed

Instruction count

Max RSS (memory usage)

Cycles

Footnotes

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

14 participants