Rollup of 5 pull requests #117126

matthiaskrgr · 2023-10-24T15:09:02Z

Successful merges:

fix typos in comments #117081 (fix typos in comments)
OptWithInfcx naming nits, trait bound simplifications #117091 (OptWithInfcx naming nits, trait bound simplifications)
Add regression test for #117058 #117092 (Add regression test for regression: parsing change in allow()? #117058)
Update books #117093 (Update books)
remove change-id assertion in bootstrap test #117105 (remove change-id assertion in bootstrap test)

r? @ghost
@rustbot modify labels: rollup

In the bootstrap test, the assertion of the change-id fails whenever we update the change-id next to a breaking change in build configurations. This commit removes the assertion, as it's not critical or useful to have. Signed-off-by: onur-ozkan <work@onurozkan.dev>

fix typos in comments

`OptWithInfcx` naming nits, trait bound simplifications * Use an associated type `Interner` on `InferCtxtLike` to remove a redundant interner parameter (`I: Interner, Infcx: InferCtxtLike<I>` -> `Infcx: InferCtxtLike`). * Remove double-`Option` between `infcx: Option<Infcx>` and `fn universe_of_ty(&self, ty: ty::InferTy) -> Option<ty::UniverseIndex>`. We don't need the infcx to be optional if we can provide a "noop" (`NoInfcx`) implementation that just always returns `None` for universe index. * Also removes the `core::convert::Infallible` implementation which I found a bit weird... * Some naming nits with params. * I found `InferCtxt` + `InfCtx` and `Infcx` to be a lot of different ways to spell "inference context", so I got rid of the `InfCtx` type parameter name in favor of `Infcx` which is a more standard name. * I found `OptWithInfcx` to be a bit redundant -> `WithInfcx`. I'm making these changes because I intend to reuse the `InferCtxtLike` trait for uplifting the canonicalizer into a new trait -- conveniently, the information I need for uplifting the canonicalizer also is just the universe information of a type var, so it's super convenient 😸 r? `@BoxyUwU` or `@lcnr`

…, r=compiler-errors Add regression test for rust-lang#117058 The new behavior in nightly is correct, so add a test that it stays this way. Closes rust-lang#117058

Update books ## rust-lang/book 1 commits in 72187f5cd0beaaa9c6f584156bcd88f921871e83..3dca2fc50b922a8efb94903b9fee8bb42ab48f38 2023-10-19 18:01:47 UTC to 2023-10-19 18:01:47 UTC - Fix cargo doc links (rust-lang/book#3751) ## rust-embedded/book 1 commits in eac173690b8cc99094e1d88bd49dd61127fbd285..22bca3d0f6e9b9b556689b54ce96f25b46ecd1b3 2023-10-16 22:47:38 UTC to 2023-10-16 22:47:38 UTC - Improved hardware.md chapter. (rust-embedded/book#361) ## rust-lang/nomicon 1 commits in ddfa4214487686e91b21aa29afb972c08a8f0d5b..1842257814919fa62e81bdecd5e8f95be2839dbb 2023-10-17 15:11:58 UTC to 2023-10-17 15:11:58 UTC - Fixed `Hole::get` marked as unsafe in `exception-safety.md` (rust-lang/nomicon#427) ## rust-lang/reference 2 commits in 142b2ed77d33f37a9973772bd95e6144ed9dce43..16fd3c06d9e558dae2d52000818274ae70c9e90a 2023-10-14 22:31:04 UTC to 2023-10-11 15:35:55 UTC - Adjust reference for return-position `impl Trait` in trait and `async fn` in trait (rust-lang/reference#1409) - Fix temporary drop scope for last expression. (rust-lang/reference#1416) ## rust-lang/rust-by-example 1 commits in 8eb3a01ab74c567b7174784892fb807f2c632d6b..6709beeb7d0fbc5ffc91ac4893a24434123b9bfa 2023-10-20 19:11:21 UTC to 2023-10-20 19:11:21 UTC - docs: fix a typo (rust-lang/rust-by-example#1752) ## rust-lang/rustc-dev-guide 5 commits in b98af7d..b0ee9ec 2023-10-22 03:18:44 UTC to 2023-10-11 06:30:26 UTC - Add WF to glossary (rust-lang/rustc-dev-guide#1810) - recommend `unpretty=hir` alongside `unpretty=hir-tree` (rust-lang/rustc-dev-guide#1804) - Start a chapter about the evolving const effect system (rust-lang/rustc-dev-guide#1808) - Document subtle implied bounds issue in RPITIT inference (rust-lang/rustc-dev-guide#1807) - [suggested.md] `changelog-seen` -> `change-id` in `shell.nix` (rust-lang/rustc-dev-guide#1806)

…ion, r=albertlarsan68 remove change-id assertion in bootstrap test In the bootstrap test, the assertion of the change-id fails whenever we update the change-id next to a breaking change in build configurations. This commit removes the assertion, as it's not critical or useful to have. ref rust-lang#115898 (comment)

matthiaskrgr · 2023-10-24T15:11:58Z

@bors r+ rollup=never p=5

bors · 2023-10-24T15:12:01Z

📌 Commit 9510e97 has been approved by matthiaskrgr

It is now in the queue for this repository.

bors · 2023-10-24T17:28:48Z

⌛ Testing commit 9510e97 with merge 98b4a64...

bors · 2023-10-24T19:31:11Z

☀️ Test successful - checks-actions
Approved by: matthiaskrgr
Pushing 98b4a64 to master...

rust-timer · 2023-10-24T19:32:38Z

📌 Perf builds for each rolled up PR:

PR#	Message	Perf Build Sha
#117081	fix typos in comments	`af5c66eaf7a9cf64dcbb76ed9ec5828dff2a6619` (link)
#117091	`OptWithInfcx` naming nits, trait bound simplifications	`c938106b2edbdca86b1891cb9543868691e2a9b9` (link)
#117092	Add regression test for #117058	`4879ad18c6a3cddd74511aeefb85eae15c2179d7` (link)
#117093	Update books	`40313a1da84a63f4a9a6a009469f7b72ec561064` (link)
#117105	remove change-id assertion in bootstrap test	`2fba6768cb2708975df3a094cac8b238ffea61ef` (link)

previous master: 07a4b7e2a9

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-10-24T20:41:51Z

Finished benchmarking commit (98b4a64): 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)	3.3%	[3.3%, 3.3%]	1
Regressions ❌ (secondary)	-	-	0
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-1.9%	[-2.2%, -1.6%]	2
All ❌✅ (primary)	3.3%	[3.3%, 3.3%]	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.2%	[2.2%, 2.2%]	1
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	-	-	0

Binary size

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

Bootstrap: missing data
Artifact size: 304.38 MiB -> 304.34 MiB (-0.01%)

GoodDaisy and others added 11 commits October 23, 2023 20:52

fix typos in comments

0d780b1

Update books

c1fb05c

Naming nits

8951342

Remove redundant type parameter

269d5a3

Add regression test for rust-lang#117058

712106b

Rollup merge of rust-lang#117081 - GoodDaisy:master, r=wesleywiser

0aade2f

fix typos in comments

Rollup merge of rust-lang#117092 - matthewjasper:attribute-validation…

af58cda

…, r=compiler-errors Add regression test for rust-lang#117058 The new behavior in nightly is correct, so add a test that it stays this way. Closes rust-lang#117058

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 24, 2023

bors added the merged-by-bors This PR was explicitly merged by bors. label Oct 24, 2023

bors merged commit 98b4a64 into rust-lang:master Oct 24, 2023
11 checks passed

rustbot added this to the 1.75.0 milestone Oct 24, 2023

This was referenced Oct 24, 2023

Begin to abstract rustc_type_ir for rust-analyzer #116828

Merged

Add a new download-ci-llvm = if-unchanged option and enable it by default for profile = codegen #116881

Merged

github-actions bot mentioned this pull request Oct 31, 2023

Automated pull from upstream master ferrocene/ferrocene#74

Merged

matthiaskrgr deleted the rollup-8huie8f branch March 16, 2024 18:18

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Rollup of 5 pull requests #117126

Rollup of 5 pull requests #117126

matthiaskrgr commented Oct 24, 2023

matthiaskrgr commented Oct 24, 2023

bors commented Oct 24, 2023

bors commented Oct 24, 2023

bors commented Oct 24, 2023

rust-timer commented Oct 24, 2023

rust-timer commented Oct 24, 2023

Rollup of 5 pull requests #117126

Rollup of 5 pull requests #117126

Conversation

matthiaskrgr commented Oct 24, 2023

matthiaskrgr commented Oct 24, 2023

bors commented Oct 24, 2023

bors commented Oct 24, 2023

bors commented Oct 24, 2023

rust-timer commented Oct 24, 2023

rust-timer commented Oct 24, 2023

Overall result: no relevant changes - no action needed

Instruction count

Max RSS (memory usage)

Cycles

Binary size