Rollup of 8 pull requests by matthiaskrgr · Pull Request #107105 · rust-lang/rust

matthiaskrgr · 2023-01-20T06:16:13Z

Successful merges:

Recover labels written as identifiers #106783 (Recover labels written as identifiers)
Don't treat closures from other crates as local #106973 (Don't treat closures from other crates as local)
Document how to get the type of a default associated type #106979 (Document how to get the type of a default associated type)
signal update string representation for haiku. #107053 (signal update string representation for haiku.)
Recognise double-equals homoglyph #107058 (Recognise double-equals homoglyph)
Custom MIR: Support storage statements #107067 (Custom MIR: Support storage statements)
Added const-generic ui test case for issue #106419 #107076 (Added const-generic ui test case for issue Nightly #![feature(generic_const_exprs)]: mismatched types in derive macro Clone #106419)
Fix broken format strings in infer.ftl #107091 (Fix broken format strings in infer.ftl)

Failed merges:

r? @ghost
@rustbot modify labels: rollup

…leywiser Recover labels written as identifiers This adds recovery for `break label expr` and `continue label`, as well as a test for `break label`.

…eader, r=lcnr Don't treat closures from other crates as local fixes rust-lang#104817 r? `@lcnr` Specialization can prefer an impl for an opaque type over a blanket impls that also matches. If the blanket impl only applies if an auto-trait applies, we look at the hidden type of the opaque type to see if that implements the auto trait. The hidden type can be a closure or generator, and thus we will end up seeing these types in coherence and have to handle them properly.

…pe, r=petrochenkov Document how to get the type of a default associated type

…omcc signal update string representation for haiku.

…wiser Recognise double-equals homoglyph Recognise `⩵` as a homoglyph for `==`. The first commit switches `char` to `&str`, as all previous homoglyphs corresponded to a single ASCII character, while the second implements the fix. `@rustbot` label +A-diagnostics +A-parser

…nts, r=oli-obk Custom MIR: Support storage statements r? `@oli-obk` `@JakobDegen`

…compiler-errors Added const-generic ui test case for issue rust-lang#106419 This PR adds a test case for rust-lang#106419 which has been fixed in master by rust-lang#105292 I also ran the test on f769d34 (the commit before rust-lang#105292 was merged) and it did fail there with the following output. ``` --- stderr ------------------------------- error[E0308]: mismatched types --> /home/patrikk/src/rust/src/test/ui/const-generics/issue-106419-struct-with-multiple-const-params.rs:5:10 | LL | #[derive(Clone)] | ^^^^^ | | | expected `A`, found `B` | expected `Bar<A, B>` because of return type | = note: expected struct `Bar<A, _>` found struct `Bar<B, _>` = note: this error originates in the derive macro `Clone` (in Nightly builds, run with -Z macro-backtrace for more info) error: aborting due to previous error For more information about this error, try `rustc --explain E0308`. ------------------------------------------ ```

…, r=compiler-errors Fix broken format strings in `infer.ftl` Fixes rust-lang#107088

matthiaskrgr · 2023-01-20T06:16:31Z

@bors r+ rollup=never p=7

bors · 2023-01-20T06:16:33Z

📌 Commit c42fad8 has been approved by matthiaskrgr

It is now in the queue for this repository.

bors · 2023-01-20T12:58:17Z

⌛ Testing commit c42fad8 with merge 04a41f8...

bors · 2023-01-20T15:28:33Z

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

rust-timer · 2023-01-20T15:30:53Z

📌 Perf builds for each rolled up PR:

PR#	Perf Build Sha
#107091	dcb3fd32b82e71b5490b38a50c89934e9424d3ba
#107076	e791ad9c4da85c6eb838bf1f0e80647d2e4f26ae
#107067	5fa5884a820f749297dfa65bba0ef1efca760955
#107058	2e6f4a4c354b746ef092e5809a340072a3802677
#107053	1aa094cbe55e5200541ffcd16e831d0a2dd72c20
#106979	c07c41e70df3ad108fdeb5381e9662b2ee627307
#106973	88b1d171b61e77a051760f23b91b97d2baafd18c
#106783	05beeead5d7a143fb01e10b394da81465a0de77d

previous master: 56ee85274e

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-01-20T16:47:20Z

Finished benchmarking commit (04a41f8): 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.1%	[0.3%, 2.7%]	3
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)	-	-	0
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-1.6%	[-1.6%, -1.6%]	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)	2.2%	[2.2%, 2.2%]	1
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	-	-	0

WaffleLapkin and others added 19 commits January 12, 2023 11:28

Remove an unwrap() from parser that can be written as if-let-chain

741c653

Add a test for recovery of unticked labels

b060988

Recover labels written as identifiers

57d822a

Document how to get the type of a default associated type

b7cb77f

signal update string representation for haiku.

ae9e66b

Use strings for homoglyph replacements

3520bba

Add double-equals homoglyph

1487aa9

Custom MIR: Support storage statements

ca3d55e

Don't treat closures from other crates as local

42f1f54

Added UI test case for issue rust-lang#106419

8657cb8

Fix broken format strings in infer.ftl

f3cde8e

Rollup merge of rust-lang#106783 - WaffleLapkin:break-my-ident, r=wes…

df88f7e

…leywiser Recover labels written as identifiers This adds recovery for `break label expr` and `continue label`, as well as a test for `break label`.

Rollup merge of rust-lang#106979 - Nilstrieb:type-of-default-assoc-ty…

a2712cb

…pe, r=petrochenkov Document how to get the type of a default associated type

Rollup merge of rust-lang#107053 - devnexen:sigstringrepr_haiku, r=th…

35d488f

…omcc signal update string representation for haiku.

Rollup merge of rust-lang#107067 - tmiasko:custom-mir-storage-stateme…

66a9006

…nts, r=oli-obk Custom MIR: Support storage statements r? `@oli-obk` `@JakobDegen`

Rollup merge of rust-lang#107091 - clubby789:infer-ftl-missing-dollar…

c42fad8

…, r=compiler-errors Fix broken format strings in `infer.ftl` Fixes rust-lang#107088

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

GuillaumeGomez mentioned this pull request Jan 20, 2023

Rollup of 6 pull requests #107106

Merged

bors added the merged-by-bors This PR was explicitly merged by bors. label Jan 20, 2023

bors merged commit 04a41f8 into rust-lang:master Jan 20, 2023

rustbot added this to the 1.68.0 milestone Jan 20, 2023

bors mentioned this pull request Jan 20, 2023

Fix missing arguments issues and copy-paste bug for fluent #107111

Merged

This was referenced Jan 20, 2023

Remove references for L4re that are not defined. #103966

Closed

Compute generator saved locals on MIR #101692

Merged

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

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Rollup of 8 pull requests#107105

Rollup of 8 pull requests#107105
bors merged 19 commits intorust-lang:masterfrom
matthiaskrgr:rollup-rkz9t7r

matthiaskrgr commented Jan 20, 2023

Uh oh!

matthiaskrgr commented Jan 20, 2023

Uh oh!

bors commented Jan 20, 2023

Uh oh!

bors commented Jan 20, 2023

Uh oh!

bors commented Jan 20, 2023

Uh oh!

rust-timer commented Jan 20, 2023

Uh oh!

rust-timer commented Jan 20, 2023

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

11 participants

Uh oh!

Conversation

matthiaskrgr commented Jan 20, 2023

Uh oh!

matthiaskrgr commented Jan 20, 2023

Uh oh!

bors commented Jan 20, 2023

Uh oh!

bors commented Jan 20, 2023

Uh oh!

bors commented Jan 20, 2023

Uh oh!

rust-timer commented Jan 20, 2023

Uh oh!

rust-timer commented Jan 20, 2023

Overall result: ❌ regressions - no action needed

Instruction count

Max RSS (memory usage)

Cycles

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

11 participants