Rollup of 5 pull requests by Dylan-DPC · Pull Request #100868 · rust-lang/rust

Dylan-DPC · 2022-08-22T06:15:46Z

Successful merges:

Std module docs improvements #93162 (Std module docs improvements)
Add tests that check Vec::retain predicate execution order. #99386 (Add tests that check Vec::retain predicate execution order.)
Recover keywords in trait bounds #99915 (Recover keywords in trait bounds)
Migrate rustc_ast_passes diagnostics to SessionDiagnostic and translatable messages (first part) #100694 (Migrate rustc_ast_passes diagnostics to SessionDiagnostic and translatable messages (first part))
Catch overflow early #100757 (Catch overflow early)

Failed merges:

Move Error trait into core #99917 (Move Error trait into core)

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

For example, this fixes a error for `impl fn()` (notice the capitalization)

… keyword_lifetime, invalid_label, invalid_visibility

…any_params, c_var_args_without_named_arg, c_var_args_not_last

…aram_

Co-authored-by: RanolP <public.ranolp@gmail.com>

Co-authored-by: Giacomo Stevanato <giaco.stevanato@gmail.com>

…mulacrum Std module docs improvements My primary goal is to create a cleaner separation between primitive types and primitive type helper modules (fixes rust-lang#92777). I also changed a few header lines in other top-level std modules (seen at https://doc.rust-lang.org/std/) for consistency. Some conventions used/established: * "The \`Box\<T>` type for heap allocation." - if a module mainly provides a single type, name it and summarize its purpose in the module header * "Utilities for the _ primitive type." - this wording is used for the header of helper modules * Documentation for primitive types themselves are removed from helper modules * provided-by-core functionality of primitive types is documented in the primitive type instead of the helper module (such as the "Iteration" section in the slice docs) I wonder if some content in `std::ptr` should be in `pointer` but I did not address this.

…_maybeuninit, r=JohnTitor Add tests that check `Vec::retain` predicate execution order. This behaviour is documented for `Vec::retain` which means that there is code that rely on that but there weren't tests about that.

…, r=compiler-errors Recover keywords in trait bounds (_this pr was inspired by [this tweet](https://twitter.com/Azumanga/status/1552982326409367561)_) Recover keywords in trait bound, motivational example: ```rust fn f(_: impl fn()) {} // mistyped, meant `Fn` ``` <details><summary>Current nightly (3 needless and confusing errors!)</summary> <p> ```text error: expected identifier, found keyword `fn` --> ./t.rs:1:15 | 1 | fn _f(_: impl fn()) {} | ^^ expected identifier, found keyword | help: escape `fn` to use it as an identifier | 1 | fn _f(_: impl r#fn()) {} | ++ error: expected one of `:` or `|`, found `)` --> ./t.rs:1:19 | 1 | fn _f(_: impl fn()) {} | ^ expected one of `:` or `|` error: expected one of `!`, `(`, `)`, `,`, `?`, `for`, `~`, lifetime, or path, found keyword `fn` --> ./t.rs:1:15 | 1 | fn _f(_: impl fn()) {} | -^^ expected one of 9 possible tokens | | | help: missing `,` error: at least one trait must be specified --> ./t.rs:1:10 | 1 | fn _f(_: impl fn()) {} | ^^^^ ``` </p> </details> This PR: ```text error: expected identifier, found keyword `fn` --> ./t.rs:1:15 | 1 | fn _f(_: impl fn()) {} | ^^ expected identifier, found keyword | help: escape `fn` to use it as an identifier | 1 | fn _f(_: impl r#fn()) {} | ++ error[E0405]: cannot find trait `r#fn` in this scope --> ./t.rs:1:15 | 1 | fn _f(_: impl fn()) {} | ^^ help: a trait with a similar name exists (notice the capitalization): `Fn` | ::: /home/waffle/projects/repos/rust/library/core/src/ops/function.rs:74:1 | 74 | pub trait Fn<Args>: FnMut<Args> { | ------------------------------- similarly named trait `Fn` defined here ``` It would be nice to have suggestion in the first error like "have you meant `Fn` trait", instead of a separate error, but the recovery is deep inside ident parsing, which makes it a lot harder to do. r? `@compiler-errors`

Migrate rustc_ast_passes diagnostics to `SessionDiagnostic` and translatable messages (first part) Doing a full migration of the `rustc_ast_passes` crate. Making a draft here since there's not yet a tracking issue for the migrations going on. `@rustbot` label +A-translation

Catch overflow early Although this code should raise an overflow error, it didn't because [check_recursion_limit](https://doc.rust-lang.org/nightly/nightly-rustc/rustc_trait_selection/traits/select/struct.SelectionContext.html#method.check_recursion_limit) it checks for `depth = 128` but not for `129` which should have triggered the overflow error. Anyways this catches that error early. Fixes rust-lang#95134

Dylan-DPC · 2022-08-22T06:16:00Z

@bors r+ rollup=never p=5

bors · 2022-08-22T06:16:02Z

📌 Commit 88e39b2 has been approved by Dylan-DPC

It is now in the queue for this repository.

bors · 2022-08-22T08:32:44Z

⌛ Testing commit 88e39b2 with merge ee8c31e...

bors · 2022-08-22T11:13:46Z

☀️ Test successful - checks-actions
Approved by: Dylan-DPC
Pushing ee8c31e to master...

rust-timer · 2022-08-22T11:15:30Z

📌 Perf builds for each rolled up PR:

PR#	Perf Build Sha
#100757	a72b0e79ba45f05b339b45034996086bf10d3c26
#100694	2cfa1b07f58a39584b74c9a1f6f318ed81078629
#99915	476072990aa52bb3fca780f29d5ae4996f36772b
#99386	6ab8a8790ef63f795b63f85a5c112496529e157a
#93162	70e123d504b4e5fca697416de4597c9670f654b5

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-08-22T12:28:08Z

Finished benchmarking commit (ee8c31e): comparison URL.

Overall result: ❌ regressions - no action needed

@rustbot label: -perf-regression

Warning ⚠: The following benchmark(s) failed to build:

diesel-1.4.8

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.6%	[0.3%, 0.8%]	7
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)	-	-	0
Regressions ❌ (secondary)	3.3%	[2.2%, 5.0%]	10
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-1.0%	[-1.0%, -1.0%]	1
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.9%	[3.4%, 4.5%]	2
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-2.2%	[-2.2%, -2.2%]	1
All ❌✅ (primary)	-	-	0

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

AngelicosPhosphoros and others added 28 commits July 17, 2022 23:34

Add tests that check Vec::retain predicate execution order.

85a9c74

Recover keywords in bounds

c6558c0

For example, this fixes a error for `impl fn()` (notice the capitalization)

add a silly test for keywords in trait bounds recovery

798016c

Catch overflow early

c198a20

Update issue-83150.stderr

4b47686

Improve primitive/std docs separation and headers

17ddcb4

recover const Tr bounds (no ~)

5d5e451

Migrate forbidden_let

d6fdf14

Use DiagnosticMessage for BufferedEarlyLint.msg

80451de

Migrate deprecated_where_clause_location, forbidden_assoc_constraint,…

e144a23

… keyword_lifetime, invalid_label, invalid_visibility

Tidy

88afae5

Migrate trait_fn_async

e3d4c40

Migrate trait_fn_const

8d042f4

Migrate forbidden_lifetime_bound, forbidden_non_lifetime_param, too_m…

269c853

…any_params, c_var_args_without_named_arg, c_var_args_not_last

Migrate doc_comment_on_fn_param, forbidden_attr_on_fn_param

c6903c0

Rename c_var_args_without_named_arg to c_var_args_is_sole_param

07e0bc9

Migrate fn_param_forbidden_self and rename others to have prefix fn_p…

bfefefb

…aram_

Support #[fatal(..)]

b28cc09

Fix build_format not unescaping braces properly

8ed8aac

Co-authored-by: RanolP <public.ranolp@gmail.com>

Migrate forbidden_default and *_without_body

e331ae5

Remove redundant clone

6a34074

Fix incorrect return type of emit_fatal

70e0af6

Co-authored-by: Giacomo Stevanato <giaco.stevanato@gmail.com>

Replace #[error(..)] etc. to #[diag(..)]

09d495c

rustbot added A-translation Area: Translation infrastructure, and migrating existing diagnostics to SessionDiagnostic T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Aug 22, 2022

rustbot added T-libs Relevant to the library team, which will review and decide on the PR/issue. rollup A PR which is a rollup labels Aug 22, 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 Aug 22, 2022

bors added the merged-by-bors This PR was explicitly merged by bors. label Aug 22, 2022

bors merged commit ee8c31e into rust-lang:master Aug 22, 2022

rustbot added this to the 1.65.0 milestone Aug 22, 2022

Dylan-DPC deleted the rollup-a1hfi1r branch August 22, 2022 11:16

davidtwco removed the A-translation Area: Translation infrastructure, and migrating existing diagnostics to SessionDiagnostic label Oct 4, 2022

matthiaskrgr mentioned this pull request Jan 7, 2024

ICE: effects, gce: difference in caller_arg caller_abi layout #119701

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Rollup of 5 pull requests#100868

Rollup of 5 pull requests#100868
bors merged 28 commits intorust-lang:masterfrom
Dylan-DPC:rollup-a1hfi1r

Dylan-DPC commented Aug 22, 2022

Uh oh!

Dylan-DPC commented Aug 22, 2022

Uh oh!

bors commented Aug 22, 2022

Uh oh!

bors commented Aug 22, 2022

Uh oh!

bors commented Aug 22, 2022

Uh oh!

rust-timer commented Aug 22, 2022

Uh oh!

rust-timer commented Aug 22, 2022

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

10 participants

Uh oh!

Conversation

Dylan-DPC commented Aug 22, 2022

Uh oh!

Dylan-DPC commented Aug 22, 2022

Uh oh!

bors commented Aug 22, 2022

Uh oh!

bors commented Aug 22, 2022

Uh oh!

bors commented Aug 22, 2022

Uh oh!

rust-timer commented Aug 22, 2022

Uh oh!

rust-timer commented Aug 22, 2022

Overall result: ❌ regressions - no action needed

Instruction count

Max RSS (memory usage)

Cycles

Footnotes

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

10 participants