Rollup of 9 pull requests #122045

matthiaskrgr · 2024-03-05T21:10:03Z

Successful merges:

Add basic i18n guidance for Display #121065 (Add basic i18n guidance for Display)
Stop using Bubble in coherence and instead emulate it with an intercrate check #121744 (Stop using Bubble in coherence and instead emulate it with an intercrate check)
Dummy tweaks (attempt 2) #121829 (Dummy tweaks (attempt 2))
Implement async closure signature deduction #121857 (Implement async closure signature deduction)
const_eval_select: make it safe but be careful with what we expose on stable for now #121894 (const_eval_select: make it safe but be careful with what we expose on stable for now)
Change some attributes to only_local. #122014 (Change some attributes to only_local.)
will_wake tests fail on Miri and that is expected #122016 (will_wake tests fail on Miri and that is expected)
only set noalias on Box with the global allocator #122018 (only set noalias on Box with the global allocator)
Remove some dead code #122028 (Remove some dead code)

r? @ghost
@rustbot modify labels: rollup

… stable for now

Co-authored-by: bjorn3 <17426603+bjorn3@users.noreply.github.com>

Co-authored-by: Simon Farnsworth <simon@farnz.org.uk>

They are two different ways of creating dummy results, with two different purposes. Their implementations are separate except for crates, where `DummyResult` depends on `DummyAstNode`. This commit removes that dependency, so they are now fully separate. It also expands the comment on `DummyAstNode`.

…ate check

Modified according to rust-lang/compiler-team#505.

drop_in_place has been a lang item, not an intrinsic, for forever

Add basic i18n guidance for `Display` I've tried to be relatively noncommittal here. The part I think is most important is to mention the concept of "display adapters" *somewhere* in the `std::fmt` documentation that has some chance of being discovered when people go looking for ways to provide context when `Display`ing their type. Rendered: > ### Internationalization > > Because a type can only have one `Display` implementation, it is often preferable to only implement `Display` when there is a single most "obvious" way that values can be formatted as text. This could mean formatting according to the "invariant" culture and "undefined" locale, or it could mean that the type display is designed for a specific culture/locale, such as developer logs. > > If not all values have a justifiably canonical textual format or if you want to support alternative formats not covered by the standard set of possible [formatting traits], the most flexible approach is display adapters: methods like [`str::escape_default`] or [`Path::display`] which create a wrapper implementing `Display` to output the specific display format. > > [formatting traits]: https://doc.rust-lang.org/nightly/std/fmt/index.html#formatting-traits > [`str::escape_default`]: https://doc.rust-lang.org/nightly/std/primitive.str.html#method.escape_default > [`Path::display`]: https://doc.rust-lang.org/nightly/std/path/struct.Path.html#method.display The module docs do already have a [localization header](https://doc.rust-lang.org/nightly/std/fmt/index.html#localization), so maybe this header should be l10n instead of i18n, or maybe this information should live under that header? I'm not sure, but here on the `Display` trait at least isn't a *bad* spot to put it. The other side of this that comes up a lot is `FromStr` compatibility, but that's for a different PR.

Stop using Bubble in coherence and instead emulate it with an intercrate check r? `````@compiler-errors````` This change is kinda funny, because all I've done is reimplement `Bubble` behaviour for coherence without using `Bubble` explicitly.

…ochenkov Dummy tweaks (attempt 2) r? `````@petrochenkov`````

…ature-deduction, r=oli-obk Implement async closure signature deduction Self-explanatory from title. Regarding the interaction between signature deduction, fulfillment, and the new trait solver: I'm not worried about implementing closure signature deduction here because: 1. async closures are unstable, and 2. I'm reasonably confident we'll need to support signature deduction in the new solver somehow (i.e. via proof trees, which seem very promising). This is in contrast to rust-lang#109338, which was closed because it generalizes signature deduction for a *stable* kind of expression (`async {}` blocks and `Future` traits), and which proliferated usage may pose a stabilization hazard for the new solver. I'll be certain to make sure sure we revisit the closure signature deduction problem by the time that async closures are being stabilized (which isn't particularly soon) (edit: Put it into the async closure tracking issue). cc `````@lcnr````` r? `````@oli-obk`````

const_eval_select: make it safe but be careful with what we expose on stable for now As this is all still nightly-only I think `````@rust-lang/wg-const-eval````` can do that without involving t-lang. r? `````@oli-obk````` Cc `````@Nilstrieb````` -- the updated version of your RFC would basically say that we can remove these comments about not making behavior differences visible in stable `const fn`

…l_20240304, r=lcnr Change some attributes to only_local. Modified according to rust-lang/compiler-team#505. r? ``@lcnr``

will_wake tests fail on Miri and that is expected Follow-up to rust-lang#121622 r? ```@cuviper``` ```@dtolnay```

only set noalias on Box with the global allocator As discovered in rust-lang/miri#3341, `noalias` and custom allocators don't go well together. rustc can now check whether a Box uses the global allocator. This replaces the previous ad-hoc and rather unprincipled check for a zero-sized allocator. This is the rustc part of fixing that; Miri will also need a patch.

…=compiler-errors Remove some dead code drop_in_place has been a lang item, not an intrinsic, for forever

matthiaskrgr · 2024-03-05T21:10:19Z

@bors r+ rollup=never p=9

bors · 2024-03-05T21:10:22Z

📌 Commit 4f73d2a has been approved by matthiaskrgr

It is now in the queue for this repository.

…iaskrgr Rollup of 9 pull requests Successful merges: - rust-lang#121065 (Add basic i18n guidance for `Display`) - rust-lang#121744 (Stop using Bubble in coherence and instead emulate it with an intercrate check) - rust-lang#121829 (Dummy tweaks (attempt 2)) - rust-lang#121857 (Implement async closure signature deduction) - rust-lang#121894 (const_eval_select: make it safe but be careful with what we expose on stable for now) - rust-lang#122014 (Change some attributes to only_local.) - rust-lang#122016 (will_wake tests fail on Miri and that is expected) - rust-lang#122018 (only set noalias on Box with the global allocator) - rust-lang#122028 (Remove some dead code) r? `@ghost` `@rustbot` modify labels: rollup

bors · 2024-03-05T23:32:25Z

⌛ Testing commit 4f73d2a with merge 29414bf...

rust-log-analyzer · 2024-03-06T00:02:10Z

The job aarch64-gnu failed! Check out the build log: (web) (plain)

Click to see the possible cause of the failure (guessed by this bot)

[RUSTC-TIMING] switch_stdout test:true 0.709
[RUSTC-TIMING] process_spawning test:true 1.219
[RUSTC-TIMING] env test:true 1.494
[RUSTC-TIMING] stdbenches test:true 2.724
##[error]The runner has received a shutdown signal. This can happen when the runner service is stopped, or a manually started runner is canceled.
##[group]Clock drift check
  local time: Wed Mar  6 00:01:53 UTC 2024
  network time: Wed, 06 Mar 2024 00:01:53 GMT
##[endgroup]
##[endgroup]
Session terminated, killing shell...[RUSTC-TIMING] test test:true 13.601
 ...killed.
##[error]The operation was canceled.

bors · 2024-03-06T00:02:42Z

💔 Test failed - checks-actions

matthiaskrgr · 2024-03-06T00:03:50Z

@bors retry

bors · 2024-03-06T02:18:26Z

⌛ Testing commit 4f73d2a with merge b77e018...

bors · 2024-03-06T04:46:09Z

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

rust-timer · 2024-03-06T04:48:40Z

📌 Perf builds for each rolled up PR:

PR#	Message	Perf Build Sha
#121065	Add basic i18n guidance for `Display`	`2be5d6cc526d58671881c0fb33a8f04b512c244a` (link)
#121744	Stop using Bubble in coherence and instead emulate it with …	`edb1d477073068d9d8f18a86a7a08a486b918010` (link)
#121829	Dummy tweaks (attempt 2)	`cff5644781234088d47d9ff58f010251e152510c` (link)
#121857	Implement async closure signature deduction	`7806e0ffecb166b82cbbc9584ef9e3349cada758` (link)
#121894	const_eval_select: make it safe but be careful with what we…	`98140d8300d498ae221bf368598edd9338e892a5` (link)
#122014	Change some attributes to only_local.	`86c66510d4c51a70065e8b4b339130a6ba020548` (link)
#122016	will_wake tests fail on Miri and that is expected	`2a452e8af4e35bbce97d881e81a897a6961b3fa7` (link)
#122018	only set noalias on Box with the global allocator	`2fed023253bcd4cf77605846575e19217b74a5ea` (link)
#122028	Remove some dead code	`4c8d8db073fbffd513fe33290a98e64d52611f12` (link)

previous master: 62415e2a95

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-03-06T07:09:29Z

Finished benchmarking commit (b77e018): 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)	0.2%	[0.2%, 0.2%]	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.3%	[1.7%, 3.0%]	2
Regressions ❌ (secondary)	2.2%	[2.0%, 2.3%]	2
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	2.3%	[1.7%, 3.0%]	2

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)	1.4%	[1.4%, 1.4%]	1
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-2.0%	[-2.0%, -2.0%]	1
All ❌✅ (primary)	-	-	0

Binary size

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

Bootstrap: 645.485s -> 646.106s (0.10%)
Artifact size: 175.07 MiB -> 175.08 MiB (0.01%)

compiler-errors and others added 21 commits March 1, 2024 16:03

Implement async closure signature deduction

d74d67c

const_eval_select: make it safe but be careful with what we expose on…

374607d

… stable for now

typo

d858809

Co-authored-by: bjorn3 <17426603+bjorn3@users.noreply.github.com>

Explain use of display adapters

4dbd256

doc wording improvements

215a4b6

Co-authored-by: Simon Farnsworth <simon@farnz.org.uk>

Remove unused impl DummyAstNode for Block.

a9dff2d

Stop using Bubble in coherence and instead emulate it with an intercr…

c98be32

…ate check

will_wake tests fail on Miri and that is expected

960dd38

Change some attributes to only_local.

8dd126d

Modified according to rust-lang/compiler-team#505.

only set noalias on Box with the global allocator

f391c07

Remove some dead code

5a16aeb

drop_in_place has been a lang item, not an intrinsic, for forever

Rollup merge of rust-lang#121829 - nnethercote:dummy-tweaks-2, r=petr…

0783a63

…ochenkov Dummy tweaks (attempt 2) r? `````@petrochenkov`````

Rollup merge of rust-lang#122014 - surechen:change_attributes_to_loca…

c1bb406

…l_20240304, r=lcnr Change some attributes to only_local. Modified according to rust-lang/compiler-team#505. r? ``@lcnr``

Rollup merge of rust-lang#122016 - RalfJung:will_wake, r=dtolnay

0760433

will_wake tests fail on Miri and that is expected Follow-up to rust-lang#121622 r? ```@cuviper``` ```@dtolnay```

Rollup merge of rust-lang#122028 - oli-obk:drop_in_place_leftovers, r…

4f73d2a

…=compiler-errors Remove some dead code drop_in_place has been a lang item, not an intrinsic, for forever

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 Mar 5, 2024

bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Mar 6, 2024

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 Mar 6, 2024

bors added the merged-by-bors This PR was explicitly merged by bors. label Mar 6, 2024

bors merged commit b77e018 into rust-lang:master Mar 6, 2024
12 checks passed

rustbot added this to the 1.78.0 milestone Mar 6, 2024

bors mentioned this pull request Mar 6, 2024

downgrade ptr.is_aligned_to crate-private #121920

Closed

This was referenced Mar 6, 2024

Distinguish between library and lang UB in assert_unsafe_precondition #121662

Merged

WIP: Remove ResumeTy from async lowering #107562

Draft

Move more intrinsics to rustc_intrinsic #122037

Merged

matthiaskrgr deleted the rollup-5l3vpn7 branch March 16, 2024 18:18

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Rollup of 9 pull requests #122045

Rollup of 9 pull requests #122045

matthiaskrgr commented Mar 5, 2024

matthiaskrgr commented Mar 5, 2024

bors commented Mar 5, 2024

bors commented Mar 5, 2024

rust-log-analyzer commented Mar 6, 2024

bors commented Mar 6, 2024

matthiaskrgr commented Mar 6, 2024

bors commented Mar 6, 2024

bors commented Mar 6, 2024

rust-timer commented Mar 6, 2024

rust-timer commented Mar 6, 2024

Rollup of 9 pull requests #122045

Rollup of 9 pull requests #122045

Conversation

matthiaskrgr commented Mar 5, 2024

matthiaskrgr commented Mar 5, 2024

bors commented Mar 5, 2024

bors commented Mar 5, 2024

rust-log-analyzer commented Mar 6, 2024

bors commented Mar 6, 2024

matthiaskrgr commented Mar 6, 2024

bors commented Mar 6, 2024

bors commented Mar 6, 2024

rust-timer commented Mar 6, 2024

rust-timer commented Mar 6, 2024

Overall result: ❌ regressions - no action needed

Instruction count

Max RSS (memory usage)

Cycles

Binary size