Rollup of 10 pull requests #105348

JohnTitor · 2022-12-06T03:48:55Z

Successful merges:

Fix UI issues with Rustdoc scrape-examples feature. #104967 (Fix UI issues with Rustdoc scrape-examples feature.)
interpret: clobber return place when calling function #105207 (interpret: clobber return place when calling function)
Fix --pass in compiletest #105246 (Fix --pass in compiletest)
Add small comment explaining what method-margins.goml test is about #105256 (Add small comment explaining what method-margins.goml test is about)
Fix dupe word typos #105289 (Fix dupe word typos)
rustdoc: remove no-op mobile CSS .sidebar { margin: 0; padding: 0 } #105309 (rustdoc: remove no-op mobile CSS .sidebar { margin: 0; padding: 0 })
Update books #105313 (Update books)
Normalize inherent associated types after substitution #105315 (Normalize inherent associated types after substitution)
Point at GAT where clause when an obligation is unsatisfied #105324 (Point at GAT where clause when an obligation is unsatisfied)
Tweak "the following other types implement trait" #105338 (Tweak "the following other types implement trait")

Failed merges:

r? @ghost
@rustbot modify labels: rollup

* Help file was being loaded from the wrong place. * CSS selector in JS has a typo. * Line numbers are overflowing, change to display: grid to fix.

This isn't overriding anything, because the sidebar never has a margin or padding on it.

When *any* of the suggested impls is an exact match, *only* show the exact matches. This is particularly relevant for integer types. fix fmt

…r=notriddle Fix UI issues with Rustdoc scrape-examples feature. A few regressions have been introduced into scrape-examples in the last few months. This commit fixes those regressions: * Help file was being loaded from the wrong place (introduced in f9e1f6f). * CSS selector in JS has a typo (introduced in 1489718). * Line numbers in scraped example code snippets are overflowing (not sure if this was ever fixed). Changing from flexbox to grid display fixed this issue.

… r=oli-obk interpret: clobber return place when calling function Makes sure the callee cannot observe the previous contents of the return place, and the caller cannot read any of the old return place contents even if the function unwinds. I don't think we can test for this though, that would require some strange hand-written MIR. r? `````@oli-obk`````

Fix --pass in compiletest This makes `x test src/test/mir-opt --pass run` actually do the thing it says it does. The resulting tests do not pass, I'll fix that in a follow up.

…ins, r=notriddle Add small comment explaining what `method-margins.goml` test is about r? `````@notriddle`````

…jgillot Fix dupe word typos

…-padding, r=GuillaumeGomez rustdoc: remove no-op mobile CSS `.sidebar { margin: 0; padding: 0 }` This isn't overriding anything, because the sidebar never has a margin or padding on it.

Update books ## rust-lang/book 1 commits in 3f64052c048c6def93b94a2b514ee88bba918744..a60f4316ec923a5ac2ed6a2eba6960edb832d855 2022-11-16 15:07:18 UTC to 2022-11-16 15:07:18 UTC - Fix Install MdBook command (rust-lang/book#3424) ## rust-embedded/book 4 commits in c533348edd69f11a8f4225d633a05d7093fddbf3..19f798d448835a4888e3b3eae7fe69f1d61d8681 2022-11-17 15:08:11 UTC to 2022-11-08 23:27:57 UTC - start/hardware.md: Fix typo (rust-embedded/book#336) - doc: Fix `arm-none-eabi-gdb` installation instruction for Fedora 27 or newer to just use `gdb` (rust-embedded/book#335) - Update singletons.md (rust-embedded/book#334) - Remove incorrect claim HashMap is avail in no_std (rust-embedded/book#333) ## rust-lang/nomicon 2 commits in 05532356e7a4dbea2330aabb77611f5179493bb8..ae406aa5287a9e025abb72343aaceec98458c117 2022-11-21 22:48:20 UTC to 2022-11-15 00:29:20 UTC - Improve chapter about `Vec<T>` (rust-lang/nomicon#381) - Grammar change for 3.4: Limits of Lifetimes (lifetime-mismatch.md) (rust-lang/nomicon#386) ## rust-lang/reference 9 commits in 9f0cc13ffcd27c1fbe1ab766a9491e15ddcf4d19..3ae62681ff236d5528ef7c8c28ba7c6b2ecc6731 2022-12-05 00:51:50 UTC to 2022-11-15 20:43:30 UTC - Document that type parameter `Self` is unsized by default (rust-lang/reference#1285) - replace `crateid` term with `crate_name` (rust-lang/reference#1310) - Document native library modifier `verbatim` (rust-lang/reference#1299) - Update literal suffix docs for rust-lang#102944 (rust-lang/reference#1305) - update aliasing rules section of the reference (rust-lang/reference#1290) - Document RFC 2867: instruction_set attribute (rust-lang/reference#1253) - Fix a minor typo in the "Higher-ranked trait bounds" section (rust-lang/reference#1288) - Disallow newline directly following `//` (rust-lang/reference#1294) - Add an anchor to the "forwarding macro fragments" paragraph (rust-lang/reference#1300) ## rust-lang/rust-by-example 5 commits in 2b15c0abf2bada6e00553814336bc3e2d8399097..a9869b4a3c4cac3bc6099b41f088679e268400b8 2022-11-27 19:03:05 UTC to 2022-11-11 18:54:53 UTC - Migrate from highfive to triagebot (rust-lang/rust-by-example#1647) - Simpler version of the read_lines script. (rust-lang/rust-by-example#1641) - Fix comment in "Formatted print" example code (rust-lang/rust-by-example#1638) - Added a missing backtick in a comment in chapter 15.4. (rust-lang/rust-by-example#1642) - Clarify the confusing closure example rust-lang#1611 (rust-lang/rust-by-example#1643) ## rust-lang/rustc-dev-guide 13 commits in d0dc6c97a6486f68bac782fff135086eae6d77ec..e269950a57fa6fcda356426545fb5aa3691a7ced 2022-12-03 23:09:24 UTC to 2022-11-08 21:35:38 UTC - Remove duplicate paragraph (rust-lang/rustc-dev-guide#1523) - clarify subtree tool policy (rust-lang/rustc-dev-guide#1518) - Typo (rust-lang/rustc-dev-guide#1520) - Link directly to the section on `--keep-stage` (rust-lang/rustc-dev-guide#1515) - do an actual link to detect if it breaks in future (rust-lang/rustc-dev-guide#1517) - Triage some date-check items (rust-lang/rustc-dev-guide#1513) - Update path for `try_mark_green` implementation (rust-lang/rustc-dev-guide#1512) - Fix a broken design docs link about unused substs bug (rust-lang/rustc-dev-guide#1511) - updating-llvm: keep a calm tone (rust-lang/rustc-dev-guide#1449) - date-check: updating-llvm (rust-lang/rustc-dev-guide#1424) - rewrite the section about regions in the trait solver (rust-lang/rustc-dev-guide#1508) - Consistent ordered list indexing (rust-lang/rustc-dev-guide#1509) - Document multiple alternative suggestions on diagnostic structs (rust-lang/rustc-dev-guide#1486)

…errors Normalize inherent associated types after substitution Fixes rust-lang#105314. r? ````@cjgillot```` (rust-lang#105224) ````@rustbot```` label F-inherent_associated_types

…inding-obl, r=jackh726 Point at GAT `where` clause when an obligation is unsatisfied Slightly helps with rust-lang#105306

…rrors Tweak "the following other types implement trait" When *any* of the suggested impls is an exact match, *only* show the exact matches. This is particularly relevant for integer types. r? `@compiler-errors`

JohnTitor · 2022-12-06T03:49:04Z

@bors r+ rollup=never p=5

bors · 2022-12-06T03:49:05Z

📌 Commit 1310d9b has been approved by JohnTitor

It is now in the queue for this repository.

bors · 2022-12-06T06:34:16Z

⌛ Testing commit 1310d9b with merge c5351ad...

bors · 2022-12-06T09:21:43Z

☀️ Test successful - checks-actions
Approved by: JohnTitor
Pushing c5351ad to master...

rust-timer · 2022-12-06T09:24:33Z

📌 Perf builds for each rolled up PR:

PR#	Perf Build Sha
#105338	2cb8d06083dd88f77fe952b981af7269bf68f27f
#105324	317a4266f262e7a37d9ea2a8d92e2d7bfc00f278
#105315	95a7ffc506761f4d8f928de19eb8717dd120e005
#105313	40b0614bb0fa15bfbe2e7d49dccb70e0e7bbd949
#105309	d45019ae18d7fc5a8073a895b3596c4f04aad170
#105289	31f782e4977bfdf8e638e0cb1af5061a8b779c81
#105256	38fc40792c66481197de5290c2a03a551b6ba29e
#105246	dcb319ff7cd9cc35eaa752eca99023be5f7951cc
#105207	72e8d4762659a6fad215d4f7bddfbbad76b81dbb
#104967	58ebb2ef3c96e914c6beb9841e7c87b67069c525

previous master: ed61c139c2

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-06T10:39:33Z

Finished benchmarking commit (c5351ad): 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.0%	[1.0%, 1.0%]	1
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)	5.1%	[5.1%, 5.1%]	1
Regressions ❌ (secondary)	-	-	0
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-7.4%	[-7.4%, -7.4%]	1
All ❌✅ (primary)	5.1%	[5.1%, 5.1%]	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)	2.9%	[2.9%, 2.9%]	1
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	-	-	0

willcrichton and others added 22 commits November 26, 2022 22:04

Fix UI issues with Rustdoc scrape-examples feature.

83ba425

* Help file was being loaded from the wrong place. * CSS selector in JS has a typo. * Line numbers are overflowing, change to display: grid to fix.

Add test for scrape-examples next/prev buttons

5a9fffc

interpret: clobber return place when calling function

51ac2af

Fix --pass in compiletest

01a4898

Add small comment explaining what method-margins.goml test is about

6cc86db

fix dupe word typos

5811057

rustdoc: remove no-op mobile CSS .sidebar { margin: 0; padding: 0 }

65072ee

This isn't overriding anything, because the sidebar never has a margin or padding on it.

Update books

a192284

normalize inherent associated types after substitution

d5cb5fb

Point at GAT where clause when unsatisfied

a1fbc14

Restore missing newline

f7a7059

Tweak "the following other types implement trait"

e1649c4

When *any* of the suggested impls is an exact match, *only* show the exact matches. This is particularly relevant for integer types. fix fmt

Rollup merge of rust-lang#105246 - JakobDegen:run-mir-tests, r=jyn514

ef1f3bf

Fix --pass in compiletest This makes `x test src/test/mir-opt --pass run` actually do the thing it says it does. The resulting tests do not pass, I'll fix that in a follow up.

Rollup merge of rust-lang#105256 - GuillaumeGomez:comment-method-marg…

f04454d

…ins, r=notriddle Add small comment explaining what `method-margins.goml` test is about r? `````@notriddle`````

Rollup merge of rust-lang#105289 - Rageking8:fix-dupe-word-typos, r=c…

fa7d3ec

…jgillot Fix dupe word typos

Rollup merge of rust-lang#105309 - notriddle:notriddle/sidebar-margin…

6dd1a40

…-padding, r=GuillaumeGomez rustdoc: remove no-op mobile CSS `.sidebar { margin: 0; padding: 0 }` This isn't overriding anything, because the sidebar never has a margin or padding on it.

Rollup merge of rust-lang#105315 - fmease:norm-subst-iat, r=compiler-…

7ba37ad

…errors Normalize inherent associated types after substitution Fixes rust-lang#105314. r? ````@cjgillot```` (rust-lang#105224) ````@rustbot```` label F-inherent_associated_types

Rollup merge of rust-lang#105324 - compiler-errors:gat-where-clause-b…

e09c71e

…inding-obl, r=jackh726 Point at GAT `where` clause when an obligation is unsatisfied Slightly helps with rust-lang#105306

Rollup merge of rust-lang#105338 - estebank:other-impls, r=compiler-e…

1310d9b

…rrors Tweak "the following other types implement trait" When *any* of the suggested impls is an exact match, *only* show the exact matches. This is particularly relevant for integer types. r? `@compiler-errors`

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

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

bors merged commit c5351ad into rust-lang:master Dec 6, 2022

rustbot added this to the 1.67.0 milestone Dec 6, 2022

bors mentioned this pull request Dec 6, 2022

Combine ty::Projection and ty::Opaque into ty::Alias #104986

Merged

JohnTitor deleted the rollup-q9bichr branch December 6, 2022 11:08

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Rollup of 10 pull requests #105348

Rollup of 10 pull requests #105348

JohnTitor commented Dec 6, 2022

JohnTitor commented Dec 6, 2022

bors commented Dec 6, 2022

bors commented Dec 6, 2022

bors commented Dec 6, 2022

rust-timer commented Dec 6, 2022

rust-timer commented Dec 6, 2022

Rollup of 10 pull requests #105348

Rollup of 10 pull requests #105348

Conversation

JohnTitor commented Dec 6, 2022

JohnTitor commented Dec 6, 2022

bors commented Dec 6, 2022

bors commented Dec 6, 2022

bors commented Dec 6, 2022

rust-timer commented Dec 6, 2022

rust-timer commented Dec 6, 2022

Overall result: ❌ regressions - no action needed

Instruction count

Max RSS (memory usage)

Cycles