Rollup of 9 pull requests #105095

matthiaskrgr · 2022-11-30T18:53:22Z

Successful merges:

rustdoc-json: Document and Test that args can be patterns. #103065 (rustdoc-json: Document and Test that args can be patterns.)
Don't overwrite local changes when updating submodules #104865 (Don't overwrite local changes when updating submodules)
Avoid Invalid code suggested when encountering unsatisfied trait bounds in derive macro code #104895 (Avoid Invalid code suggested when encountering unsatisfied trait bounds in derive macro code)
Rustdoc Json Tests: Don't assume that core::fmt::Debug will always have one item. #105063 (Rustdoc Json Tests: Don't assume that core::fmt::Debug will always have one item.)
rustdoc: add comment to confusing CSS main { min-width: 0 } #105064 (rustdoc: add comment to confusing CSS main { min-width: 0 })
Add Nicholas Bishop to .mailmap #105074 (Add Nicholas Bishop to .mailmap)
Add a regression test for #104322 #105081 (Add a regression test for New overflow error while compiling wundergraph #104322)
rustdoc: clean up sidebar link CSS #105086 (rustdoc: clean up sidebar link CSS)
add Tshepang Mbambo to .mailmap #105091 (add Tshepang Mbambo to .mailmap)

Failed merges:

r? @ghost
@rustbot modify labels: rollup

…unsatisfied trait bounds in derive macro code

This CSS was added in cad0fce, but the reason why it was necessary was unclear. This comment makes it clear.

Group `text-overflow: ellipses` along with `white-space: nowrap`. It makes no sense to try to apply it to links with `overflow-wrap: anywhere`, because it can't actually make ellipses when that's turned on. Simplify the selector for the 25rem left padding on sidebar links, to match up with the style for the container left padding that makes room for it.

…uillaumeGomez rustdoc-json: Document and Test that args can be patterns.

Don't overwrite local changes when updating submodules Fixes rust-lang#103485

…, r=TaKO8Ki Avoid Invalid code suggested when encountering unsatisfied trait bounds in derive macro code Fixes rust-lang#104884

…, r=notriddle Rustdoc Json Tests: Don't assume that core::fmt::Debug will always have one item. See rust-lang#104525 (comment) and rust-lang#104525 (comment) for motivation. This still assumes that `fmt` is the first method, but thats alot less brittle than assuming it will be the only method. Sadly, we can't use a aux crate to insulate the tests from core changes, because core is special, so all we can do is try not to depend on things that may change.

…, r=GuillaumeGomez rustdoc: add comment to confusing CSS `main { min-width: 0 }` This CSS was added in cad0fce, but the reason why it was necessary was unclear. This comment makes it clear.

…ark-Simulacrum Add Nicholas Bishop to `.mailmap`

…2, r=compiler-errors Add a regression test for rust-lang#104322 r? ``@compiler-errors``

…=GuillaumeGomez rustdoc: clean up sidebar link CSS Group `text-overflow: ellipses` along with `white-space: nowrap`. It makes no sense to try to apply it to links with `overflow-wrap: anywhere`, because it can't actually make ellipses when that's turned on. Simplify the selector for the 25rem left padding on sidebar links, to match up with the style for the container left padding that makes room for it.

add Tshepang Mbambo to .mailmap ... because my surname has changed ``` # before ❯ git shortlog --summary --email | rg Tshepang 326 Tshepang Lekhonkhobe <[email protected]> 8 Tshepang Mbambo <[email protected]> # after ❯ git shortlog --summary --email | rg Tshepang 334 Tshepang Mbambo <[email protected]>

matthiaskrgr · 2022-11-30T18:53:35Z

@bors r+ rollup=never p=9

bors · 2022-11-30T18:53:37Z

📌 Commit ffb071f has been approved by matthiaskrgr

It is now in the queue for this repository.

bors · 2022-11-30T20:01:43Z

⌛ Testing commit ffb071f with merge 54d7855ae18a9d6c85a4ee59fc30ed464c82a7db...

bors · 2022-12-01T00:16:43Z

💥 Test timed out

matthiaskrgr · 2022-12-01T01:37:38Z

@bors retry

rust-log-analyzer · 2022-12-01T01:38:44Z

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-12-01T04:16:33Z

⌛ Testing commit ffb071f with merge 744a97b...

bors · 2022-12-01T07:13:40Z

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

rust-timer · 2022-12-01T07:16:13Z

📌 Perf builds for each rolled up PR:

PR#	Perf Build Sha
#105091	c27b48ca7808d1d881e7eedfe3f0cff01e68addd
#105086	28e2f3f8126bcab54dd4faf0e06c2339d733bb18
#105081	d282cd6320c2274fc81cbafc1b2947e88176dbdf
#105074	07fb84c1be49caabd71e9ee742f6891e75a8f2b4
#105064	5d85b143928ec0ed86d7378247e88c325e31770b
#105063	92bc260cc0d9b975047e65b65afb47171356b09c
#104895	4e73acc961a93611e5319eea289e435a809c18d8
#104865	77afca15687c4be8594929e9b09d4cc23c059244
#103065	06eafd978d3830e8ca351124f2e022cd31ed5a53

previous master: 1dcf6add3d

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-12-01T08:31:26Z

Finished benchmarking commit (744a97b): 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
Improvements ✅ (secondary)	-1.5%	[-1.5%, -1.5%]	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)	-	-	0
Regressions ❌ (secondary)	2.5%	[2.4%, 2.6%]	3
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	-	-	0

Cycles

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

aDotInTheVoid and others added 20 commits October 14, 2022 19:57

rustdoc-json: Document and Test that args can be patterns.

bb04e7e

bootstrap

db760f6

suggested changes

8d14898

suggested changes

d742407

fix rust-lang#104884, Avoid Invalid code suggested when encountering …

3980945

…unsatisfied trait bounds in derive macro code

Don't assume that core::fmt::Debug will always have one item.

9286228

rustdoc: add comment to confusing CSS main { min-width: 0 }

43f5d2b

This CSS was added in cad0fce, but the reason why it was necessary was unclear. This comment makes it clear.

Add a regression test for rust-lang#104322

42ff718

Add Nicholas Bishop to .mailmap

f6e8580

add Tshepang Mbambo to .mailmap

fe6d9e9

Rollup merge of rust-lang#103065 - aDotInTheVoid:rdj-arg-pattern, r=G…

091f5e1

…uillaumeGomez rustdoc-json: Document and Test that args can be patterns.

Rollup merge of rust-lang#104865 - pratushrai0309:bootstrap, r=jyn514

3d64420

Don't overwrite local changes when updating submodules Fixes rust-lang#103485

Rollup merge of rust-lang#104895 - chenyukang:yukang/fix-104884-serde…

eabc072

…, r=TaKO8Ki Avoid Invalid code suggested when encountering unsatisfied trait bounds in derive macro code Fixes rust-lang#104884

Rollup merge of rust-lang#105064 - notriddle:notriddle/main-min-width…

4357c2d

…, r=GuillaumeGomez rustdoc: add comment to confusing CSS `main { min-width: 0 }` This CSS was added in cad0fce, but the reason why it was necessary was unclear. This comment makes it clear.

Rollup merge of rust-lang#105074 - nicholasbishop:bishop-mailmap, r=M…

c56c377

…ark-Simulacrum Add Nicholas Bishop to `.mailmap`

Rollup merge of rust-lang#105081 - weiznich:regression_test_for_10432…

6c4b5a2

…2, r=compiler-errors Add a regression test for rust-lang#104322 r? ``@compiler-errors``

bors removed the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Nov 30, 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 Nov 30, 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 Dec 1, 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 Dec 1, 2022

bors added the merged-by-bors This PR was explicitly merged by bors. label Dec 1, 2022

bors merged commit 744a97b into rust-lang:master Dec 1, 2022

rustbot added this to the 1.67.0 milestone Dec 1, 2022

pnkfelix mentioned this pull request Dec 9, 2022

New overflow error while compiling wundergraph #104322

Closed

matthiaskrgr deleted the rollup-9pu7vrx branch December 22, 2022 10:46

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Rollup of 9 pull requests #105095

Rollup of 9 pull requests #105095

matthiaskrgr commented Nov 30, 2022

matthiaskrgr commented Nov 30, 2022

bors commented Nov 30, 2022

bors commented Nov 30, 2022

bors commented Dec 1, 2022

matthiaskrgr commented Dec 1, 2022

rust-log-analyzer commented Dec 1, 2022

bors commented Dec 1, 2022

bors commented Dec 1, 2022

rust-timer commented Dec 1, 2022

rust-timer commented Dec 1, 2022

Rollup of 9 pull requests #105095

Rollup of 9 pull requests #105095

Conversation

matthiaskrgr commented Nov 30, 2022

matthiaskrgr commented Nov 30, 2022

bors commented Nov 30, 2022

bors commented Nov 30, 2022

bors commented Dec 1, 2022

matthiaskrgr commented Dec 1, 2022

rust-log-analyzer commented Dec 1, 2022

bors commented Dec 1, 2022

bors commented Dec 1, 2022

rust-timer commented Dec 1, 2022

rust-timer commented Dec 1, 2022

Overall result: ✅ improvements - no action needed

Instruction count

Max RSS (memory usage)

Cycles