Rollup of 8 pull requests by Manishearth · Pull Request #104591 · rust-lang/rust

Manishearth · 2022-11-18T22:48:20Z

Successful merges:

remove HRTB from [T]::is_sorted_by{,_key} #102977 (remove HRTB from [T]::is_sorted_by{,_key})
Fix mod_inv termination for the last iteration #103378 (Fix mod_inv termination for the last iteration)
unchecked_{shl|shr} should use u32 as the RHS #103456 (unchecked_{shl|shr} should use u32 as the RHS)
Simplify some pointer method implementations #103701 (Simplify some pointer method implementations)
Diagnostics icu4x based list formatting. #104047 (Diagnostics icu4x based list formatting.)
Enforce that dyn* coercions are actually pointer-sized #104338 (Enforce that dyn* coercions are actually pointer-sized)
Edit docs for rustc_errors::Handler::stash_diagnostic #104498 (Edit docs for rustc_errors::Handler::stash_diagnostic)
rustdoc: use code-header class to format enum variants #104556 (rustdoc: use code-header class to format enum variants)

Failed merges:

r? @ghost
@rustbot modify labels: rollup

On usize=u64 platforms, the 4th iteration would overflow the `mod_gate` back to 0. Similarly for usize=u32 platforms, the 3rd iteration would overflow much the same way. I tested various approaches to resolving this, including approaches with `saturating_mul` and `widening_mul` to a double usize. Turns out LLVM likes `mul_with_overflow` the best. In fact now, that LLVM can see the iteration count is limited, it will happily unroll the loop into a nice linear sequence. You will also notice that the code around the loop got simplified somewhat. Now that LLVM is handling the loop nicely, there isn’t any more reasons to manually unroll the first iteration out of the loop (though looking at the code today I’m not sure all that complexity was necessary in the first place). Fixesrust-lang#103361

Clarify that the diagnostic can be retrieved with `steal_diagnostic`.

The font size and weights should be exactly the same after this commit, but the spacing is changed to be exactly the same as methods.

remove HRTB from `[T]::is_sorted_by{,_key}` Changes the signature of `[T]::is_sorted_by{,_key}` to match `[T]::binary_search_by{,_key}` and make code like rust-lang#53485 (comment) compile. Tracking issue: rust-lang#53485 ~~Do we need an ACP for something like this?~~ Edit: Filed ACP here: rust-lang/libs-team#121

…tmcm Fix mod_inv termination for the last iteration On usize=u64 platforms, the 4th iteration would overflow the `mod_gate` back to 0. Similarly for usize=u32 platforms, the 3rd iteration would overflow much the same way. I tested various approaches to resolving this, including approaches with `saturating_mul` and `widening_mul` to a double usize. Turns out LLVM likes `mul_with_overflow` the best. In fact now, that LLVM can see the iteration count is limited, it will happily unroll the loop into a nice linear sequence. You will also notice that the code around the loop got simplified somewhat. Now that LLVM is handling the loop nicely, there isn’t any more reasons to manually unroll the first iteration out of the loop (though looking at the code today I’m not sure all that complexity was necessary in the first place). Fixesrust-lang#103361

…cottmcm `unchecked_{shl|shr}` should use `u32` as the RHS The other shift methods, such as https://doc.rust-lang.org/nightly/std/primitive.u64.html#method.checked_shr and https://doc.rust-lang.org/nightly/std/primitive.i16.html#method.wrapping_shl, use `u32` for the shift amount. That's consistent with other things, like `count_ones`, which also always use `u32` for a bit count, regardless of the size of the type. This PR changes `unchecked_shl` and `unchecked_shr` to also use `u32` for the shift amount (rather than Self). cc rust-lang#85122, the `unchecked_math` tracking issue

…ation__--this-can-be-simplified, r=scottmcm Simplify some pointer method implementations - Make `pointer::with_metadata_of` const (+simplify implementation) (cc rust-lang#75091) - Simplify implementation of various pointer methods r? ```@scottmcm``` ---- `from_raw_parts::<T>(this, metadata(self))` was annoying me for a while and I've finally figured out how it should _actually_ be done.

…, r=davidtwco Diagnostics `icu4x` based list formatting. This adds a new kind of `DiagnosticArg` and add the ability to convert it to a `FluentValue::Custom`. When emitting fluent output, it makes use of `ListFormatter` from `icu4x` project to convert it to localized version of list following the fluent locale, as a kind of eager translation. Tested locally with locales like `en`, `ja`, etc, and they work fine. <del>Though neither `zh-CN` nor `zh-Hans` works correctly, it seems they fallback to `und` locale somehow, emitting only comma-based list. I believe this is an internal issue of `icu4x` itself.</del>(Works fine after rust-lang#104047 (comment)) Would love to hear what others think. r? `@davidtwco` cc `@Manishearth`

…holk Enforce that `dyn*` coercions are actually pointer-sized Implement a perma-unstable, rudimentary `PointerSized` trait to enforce `dyn*` casts are `usize`-sized for now, at least to prevent ICEs and weird codegen issues from cropping up after monomorphization since currently we enforce *nothing*. This probably can/should be removed in favor of a more sophisticated trait for handling `dyn*` conversions when we decide on one, but I just want to get something up for discussion and experimentation for now. r? ```@eholk``` cc ```@tmandry``` (though feel free to claim/reassign) Fixesrust-lang#102141Fixesrust-lang#102173

…er-errors Edit docs for `rustc_errors::Handler::stash_diagnostic` Clarify that the diagnostic can be retrieved with `steal_diagnostic`. r? ```@compiler-errors```

…llaumeGomez rustdoc: use `code-header` class to format enum variants The font size and weights should be exactly the same after this PR, but the spacing is changed to be the same as methods. Preview: http://notriddle.com/notriddle-rustdoc-demos/variant/test_dingus_enum/enum.TestEnum.html

Manishearth · 2022-11-18T22:48:57Z

@bors r+ p=8 rollup=never

bors · 2022-11-18T22:48:59Z

📌 Commit 9db23f8 has been approved by Manishearth

It is now in the queue for this repository.

bors · 2022-11-18T23:20:57Z

⌛ Testing commit 9db23f8 with merge ff0ffda...

bors · 2022-11-19T02:28:36Z

☀️ Test successful - checks-actions
Approved by: Manishearth
Pushing ff0ffda to master...

rust-timer · 2022-11-19T02:30:53Z

📌 Perf builds for each rolled up PR:

PR#	Perf Build Sha
#104556	7c722a42fa614db80635cf7735294df830eb6f09
#104498	6050be731d56d161404d1cc3ec0c6a81667ec61f
#104338	abb1c446edc839cd31f48d9b523465b2f7a808f2
#104047	77d6c35a404ced47476557bc02f64824c33d9924
#103701	e15a2d92c947e00b4d7bf917ca78543a8f59585b
#103456	857cd267199ad68d97565fd2254491a10841be69
#103378	a324759bd4229ae3a3f480af4f54464b439e9493
#102977	f6d0d0c285f105b0810f160b5b3e201d80fb148d

previous master: b833ad56f4

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-11-19T03:48:44Z

Finished benchmarking commit (ff0ffda): comparison URL.

Overall result: ✅ improvements - 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
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-1.1%	[-1.1%, -1.1%]	2
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)	2.9%	[2.9%, 2.9%]	1
Improvements ✅ (primary)	-3.7%	[-6.9%, -0.6%]	2
Improvements ✅ (secondary)	-1.6%	[-2.2%, -1.0%]	2
All ❌✅ (primary)	-3.7%	[-6.9%, -0.6%]	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)	2.6%	[2.6%, 2.6%]	1
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	-	-	0

lqd · 2022-11-19T22:41:15Z

Is the impact on bootstrap timings here expected ? Do you know why serde now takes twice as long to build (maybe some different feature flags) ?

Manishearth · 2022-11-20T03:07:07Z

I don't know!

lqd · 2022-11-22T00:14:56Z

This is probably fine but I'll cc @rust-lang/wg-compiler-performance to see what they think.

Lukas Markeffskyand others added 29 commits October 12, 2022 18:39

remove HRTB from [T]::is_sorted_by{,_key}
a02ec4c

add regression test
f3d7b39

unchecked_{shl|shr} should use u32 as the RHS
3b16c04

Make pointer::with_metadata_of const (+simplify implementation)
6c54745

Simplify implementation of various pointer methods
d3b5192

Ignore the unchecked-shifts codegen test in debug-assertions builds
9d4b1f9

Edit docs for rustc_errors::Handler::stash_diagnostic
19b63bc
Clarify that the diagnostic can be retrieved with `steal_diagnostic`.

rustdoc: use code-header class to format enum variants
4525eb1
The font size and weights should be exactly the same after this commit, but the spacing is changed to be exactly the same as methods.

rustdoc: update tests for enum variant margin tweak
616f34e

Enforce that dyn* casts are actually pointer-sized
da3c539

Check both align and size in PointerSized
b3da04a

Only enforce ABI-mandated align, not preferred align is compatible
39e076a

Add rustc_baked_icu_data crate.
42d3bda

Migrate diagnostics list output to use icu list formatter.
a775004

Import icu locale fallback data
bde2f98

Enable icu sync feature for parallel compiler
d15b020

Include zh locale in icu data
707c035

Fix compilation issue after rebase
b21e0b8

Update crate documentation of rustc_baked_icu_data crate
b22cb90

Fix lockfile
2721e40

Rollup merge ofrust-lang#104498- pierwill:stash-diag-docs, r=compil…
a065e97
…er-errors Edit docs for `rustc_errors::Handler::stash_diagnostic` Clarify that the diagnostic can be retrieved with `steal_diagnostic`. r? ```@compiler-errors```

rustbot added the T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) label Nov 18, 2022

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 Nov 18, 2022

bors added the merged-by-bors This PR was explicitly merged by bors. label Nov 19, 2022

bors merged commit ff0ffda into rust-lang:masterNov 19, 2022

rustbot added this to the 1.67.0 milestone Nov 19, 2022

bors mentioned this pull request Nov 19, 2022
[WIP] Constified slice::sort_unstable, sort_internals #102279
Closed
7 tasks

Manishearth deleted the rollup-b3ser4e branch November 19, 2022 03:01

RalfJung mentioned this pull request Nov 19, 2022
More deriving on packed structs #104429
Merged

matthiaskrgr mentioned this pull request Aug 3, 2023
[ICE]: Broken MIR in drop glue with specialization #107228
Closed
4 tasks

Navigation Menu

Uh oh!

Uh oh!

Rollup of 8 pull requests - #104591

Rollup of 8 pull requests#104591
bors merged 29 commits into
rust-lang:masterfrom
Manishearth:rollup-b3ser4e

Manishearth commented Nov 18, 2022

Uh oh!

Manishearth commented Nov 18, 2022

Uh oh!

bors commented Nov 18, 2022

Uh oh!

bors commented Nov 18, 2022

Uh oh!

bors commented Nov 19, 2022

Uh oh!

rust-timer commented Nov 19, 2022

Uh oh!

rust-timer commented Nov 19, 2022

Uh oh!

lqd commented Nov 19, 2022

Uh oh!

Manishearth commented Nov 20, 2022

Uh oh!

lqd commented Nov 22, 2022

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

12 participants

Uh oh!

Uh oh!

Conversation

Manishearth commented Nov 18, 2022

Uh oh!

Manishearth commented Nov 18, 2022

Uh oh!

bors commented Nov 18, 2022

Uh oh!

bors commented Nov 18, 2022

Uh oh!

bors commented Nov 19, 2022

Uh oh!

rust-timer commented Nov 19, 2022

Uh oh!

rust-timer commented Nov 19, 2022

Overall result: ✅ improvements - no action needed

Instruction count

Max RSS (memory usage)

Cycles

Uh oh!

lqd commented Nov 19, 2022

Uh oh!

Manishearth commented Nov 20, 2022

Uh oh!

lqd commented Nov 22, 2022

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

12 participants