Rollup of 8 pull requests #120025

matthiaskrgr · 2024-01-16T16:55:26Z

Successful merges:

stabilise bound_map #118361 (stabilise bound_map)
Define hidden types in confirmation #119816 (Define hidden types in confirmation)
Inline check_closure, simplify deduce_sig_from_projection #119900 (Inline check_closure, simplify deduce_sig_from_projection)
Simplify closure_env_ty and closure_env_param #119969 (Simplify closure_env_ty and closure_env_param)
Add private NonZero<T> type alias. #119990 (Add private NonZero<T> type alias.)
Update books #119998 (Update books)
Lint overlapping_ranges_endpoints directly instead of collecting into a Vec #120002 (Lint overlapping_ranges_endpoints directly instead of collecting into a Vec)
Don't allow .html files in tests/mir-opt/ #120018 (Don't allow .html files in tests/mir-opt/)

r? @ghost
@rustbot modify labels: rollup

HTML files were needed for testing `-Z dump-mir-spanview`, but that flag has been removed by rust-lang#119566.

…Amanieu stabilise bound_map Closes rust-lang#86026

…, r=lcnr Define hidden types in confirmation fixes rust-lang#111470 r? `@lcnr` or `@compiler-errors` explanation in the newly added test

…r=oli-obk Inline `check_closure`, simplify `deduce_sig_from_projection` Some minor cleanups that I've collected when reimplementing async closure r? oli-obk

…nv-ty, r=oli-obk Simplify `closure_env_ty` and `closure_env_param` Random cleanup that I found when working on async closures. This makes it easier to separate the latter into a new tykind.

…=dtolnay Add private `NonZero<T>` type alias. According to step 2 suggested in rust-lang#100428 (review). This adds a private type alias for `NonZero<T>` so that some parts of the code can already start using `NonZero<T>` syntax. Using `NonZero<T>` for `convert` and other parts which implement `From` doesn't work while it is a type alias, since this results in conflicting implementations.

Update books ## rust-lang/nomicon 1 commits in f6bd083c4ccfc4ce6699b8b4154e3c45c5a27a8c..6bc2415218d4dd0cb01433d8320f5ccf79c343a1 2024-01-03 04:01:04 UTC to 2024-01-03 04:01:04 UTC - Update an example of `thread_local` to use `local_key_cell_methods` (rust-lang/nomicon#438) ## rust-lang/reference 1 commits in 3565c7978cfc9662f5963b135690ff9cbbfa0318..8c77e8be9da1a9c70545556218d563c8d061f1fd 2024-01-08 15:16:51 UTC to 2024-01-08 15:16:51 UTC - Document that <- is a single token (rust-lang/reference#1424) ## rust-lang/rust-by-example 4 commits in c0be6299e52e4164c30ba6f41bd0ad0aaee64972..ddf5cb0e6ee54ba2dd84c8ca3e1314120014e20d 2024-01-13 11:06:22 UTC to 2024-01-13 11:01:00 UTC - Update attribute.md, (rust-lang/rust-by-example#1791) - fix: typo `unusude` (rust-lang/rust-by-example#1797) - Update print.md (rust-lang/rust-by-example#1796) - Update alias.md (rust-lang/rust-by-example#1790) ## rust-lang/rustc-dev-guide 4 commits in d13e85152a977cd0bcaf583cf5f49e86225697de..4af29d1a7f64f88a36539662c6a84fe1fbe6cde1 2024-01-14 10:42:53 UTC to 2024-01-06 17:47:01 UTC - Expand upon PR guidelines (rust-lang/rustc-dev-guide#1851) - Correct the link to rust reference (rust-lang/rustc-dev-guide#1848) - Explain the important concepts of exhaustiveness checking (rust-lang/rustc-dev-guide#1830) - Add guide for rustdoc search implementation (rust-lang/rustc-dev-guide#1846)

…-errors Lint `overlapping_ranges_endpoints` directly instead of collecting into a Vec In rust-lang#119396 I was a bit silly: I was trying to avoid any lints being fired from within the exhaustiveness algorithm for some vague aesthetic/reusability reason that doesn't really hold. This PR fixes that: instead of passing a `&mut Vec` around I just added a method to the `TypeCx` trait. r? `@compiler-errors`

Don't allow `.html` files in `tests/mir-opt/` HTML files were needed for testing `-Z dump-mir-spanview`, but that flag has been removed by rust-lang#119566.

matthiaskrgr · 2024-01-16T16:55:42Z

@bors r+ rollup=never p=8

bors · 2024-01-16T16:55:45Z

📌 Commit 9154410 has been approved by matthiaskrgr

It is now in the queue for this repository.

bors · 2024-01-16T17:33:16Z

⌛ Testing commit 9154410 with merge e64f849...

bors · 2024-01-16T19:32:05Z

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

rust-timer · 2024-01-16T19:34:20Z

📌 Perf builds for each rolled up PR:

PR#	Message	Perf Build Sha
#118361	stabilise bound_map	`2db8fda050f8d209cff4fea88434cfe8ce74160d` (link)
#119816	Define hidden types in confirmation	`578f6bffe19b64479efa2f26e684ceccb7ec9025` (link)
#119900	Inline `check_closure`, simplify `deduce_sig_from_projectio…	`94af6a63adb6a5a5f08493d76b7b6a7ab6458dde` (link)
#119969	Simplify `closure_env_ty` and `closure_env_param`	`950fa33e72e56b2a26a2bbdb34f2a86fa446a979` (link)
#119990	Add private `NonZero<T>` type alias.	`b2c7094d7dee949d50e87d8bb958f79b9da521f6` (link)
#119998	Update books	`9270f2ab0ef4a29cc75a7c96da5673f338484652` (link)
#120002	Lint `overlapping_ranges_endpoints` directly instead of col…	`e4a5de47a04d96d1aa4bbb5d182a6d8e2b3c1bb8` (link)
#120018	Don't allow `.html` files in `tests/mir-opt/`	`f0efe594426d564398c392fbe3fc17dfe4a3d86c` (link)

previous master: bf2637f4e8

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 · 2024-01-16T22:39:46Z

Finished benchmarking commit (e64f849): 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)	3.4%	[3.4%, 3.4%]	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)	2.0%	[2.0%, 2.0%]	1
Regressions ❌ (secondary)	1.4%	[1.4%, 1.4%]	1
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	2.0%	[2.0%, 2.0%]	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
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-1.8%	[-2.3%, -1.3%]	2
All ❌✅ (primary)	-	-	0

Binary size

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

Bootstrap: 666.444s -> 663.55s (-0.43%)
Artifact size: 308.25 MiB -> 308.22 MiB (-0.01%)

Fixes were done to address the following upstream changes: - rust-lang/rust#119606 - rust-lang/rust#119751 - rust-lang/rust#120025 - rust-lang/rust#116520 Resolves #2971 By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 and MIT licenses.

Dylan-DPC and others added 20 commits November 27, 2023 12:49

stabilise bound_map

a43dc2b

Define hidden types in confirmation

08fc5e8

Make sure the new solver agrees

0ae0044

Inline check_closure

50e1580

Signature deduction is only done for Fn traits

6a63183

Simplify closure_env_ty and closure_env_param

6f98a6c

Add private NonZero<T> type alias.

f760223

Update books

0a049cb

Lint overlapping ranges directly from exhaustiveness

8b66f49

Remove the unused overlapping_range_endpoints Vec

448c4a4

Revert unrelated changes from PR 119990

604d208

Don't allow .html files in tests/mir-opt/

40166c8

HTML files were needed for testing `-Z dump-mir-spanview`, but that flag has been removed by rust-lang#119566.

Rollup merge of rust-lang#118361 - Dylan-DPC:80626/stab/bound-map, r=…

304a17a

…Amanieu stabilise bound_map Closes rust-lang#86026

Rollup merge of rust-lang#119816 - oli-obk:tait_ice_unify_obligations…

d4b276c

…, r=lcnr Define hidden types in confirmation fixes rust-lang#111470 r? `@lcnr` or `@compiler-errors` explanation in the newly added test

Rollup merge of rust-lang#119900 - compiler-errors:closure-checking, …

5f9d1d4

…r=oli-obk Inline `check_closure`, simplify `deduce_sig_from_projection` Some minor cleanups that I've collected when reimplementing async closure r? oli-obk

Rollup merge of rust-lang#119969 - compiler-errors:simplify-closure-e…

4735171

…nv-ty, r=oli-obk Simplify `closure_env_ty` and `closure_env_param` Random cleanup that I found when working on async closures. This makes it easier to separate the latter into a new tykind.

Rollup merge of rust-lang#120018 - Zalathar:mir-opt-html, r=Nilstrieb

9154410

Don't allow `.html` files in `tests/mir-opt/` HTML files were needed for testing `-Z dump-mir-spanview`, but that flag has been removed by rust-lang#119566.

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 Jan 16, 2024

bors added the merged-by-bors This PR was explicitly merged by bors. label Jan 16, 2024

bors merged commit e64f849 into rust-lang:master Jan 16, 2024
12 checks passed

rustbot added this to the 1.77.0 milestone Jan 16, 2024

bors mentioned this pull request Jan 16, 2024

Fix naming in the lint API #120017

Merged

celinval mentioned this pull request Jan 18, 2024

Upgrade toolchain to nightly-2024-01-17 model-checking/kani#2976

Merged

matthiaskrgr deleted the rollup-e9ai06k branch March 16, 2024 18:19

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Rollup of 8 pull requests #120025

Rollup of 8 pull requests #120025

matthiaskrgr commented Jan 16, 2024

matthiaskrgr commented Jan 16, 2024

bors commented Jan 16, 2024

bors commented Jan 16, 2024

bors commented Jan 16, 2024

rust-timer commented Jan 16, 2024

rust-timer commented Jan 16, 2024

Rollup of 8 pull requests #120025

Rollup of 8 pull requests #120025

Conversation

matthiaskrgr commented Jan 16, 2024

matthiaskrgr commented Jan 16, 2024

bors commented Jan 16, 2024

bors commented Jan 16, 2024

bors commented Jan 16, 2024

rust-timer commented Jan 16, 2024

rust-timer commented Jan 16, 2024

Overall result: ❌ regressions - no action needed

Instruction count

Max RSS (memory usage)

Cycles

Binary size