Rollup of 7 pull requests #116408

matthiaskrgr · 2023-10-04T03:02:08Z

Successful merges:

Replace 'mutex' with 'lock' in RwLock documentation #115961 (Replace 'mutex' with 'lock' in RwLock documentation)
Clarify arg and args documentation #116146 (Clarify arg and args documentation)
Adapt todo! documentation to mention displaying custom values #116363 (Adapt todo! documentation to mention displaying custom values)
bootstrap: make copying linker binaries conditional #116365 (bootstrap: make copying linker binaries conditional)
rustdoc: fix & clean up handling of cross-crate higher-ranked parameters #116388 (rustdoc: fix & clean up handling of cross-crate higher-ranked parameters)
Emit feature gate *warning* for auto traits pre-expansion #116393 (Emit feature gate warning for auto traits pre-expansion)
Mark myself as vacation or whatever #116395 (Mark myself as vacation or whatever)

r? @ghost
@rustbot modify labels: rollup

When copying the documentation for `clear_poison` from Mutex, not every occurence of 'mutex' was replaced with 'lock'.

Correct hidden trait in doc test

Replace 'mutex' with 'lock' in RwLock documentation When copying the documentation for `clear_poison` from Mutex, not every occurence of 'mutex' was replaced with 'lock'.

…ntation, r=thomcc Clarify `arg` and `args` documentation Fixes rust-lang#95400

…homcc Adapt `todo!` documentation to mention displaying custom values Resolves rust-lang#116130. I copied from the [existing documentation](https://doc.rust-lang.org/std/macro.unimplemented.html) for `unimplemented!` more or less directly, down to the example trait used. I also took the liberty of fixing some formatting and typographical errors that I noticed.

bootstrap: make copying linker binaries conditional The change in rust-lang#116276 breaks bootstrapping if you don't use `lld` for linking with your stage0 compiler. Making this copy conditional should be enough to fix it.

…ate-higher-ranked-params, r=notriddle rustdoc: fix & clean up handling of cross-crate higher-ranked parameters Preparatory work for the refactoring planned in rust-lang#113015 (for correctness & maintainability). --- 1. Render the higher-ranked parameters of cross-crate function pointer types **(*)**. 2. Replace occurrences of `collect_referenced_late_bound_regions()` (CRLBR) with `bound_vars()`. The former is quite problematic and the use of the latter allows us to yank a lot of hacky code **(†)** as you can tell from the diff! :) 3. Add support for cross-crate higher-ranked types (`#![feature(non_lifetime_binders)]`). We were previously ICE'ing on them (see `inline_cross/non_lifetime_binders.rs`). --- **(*)**: Extracted from test `inline_cross/fn-type.rs`: ```diff - fn(_: &'z fn(_: &'b str), _: &'a ()) -> &'a () + for<'z, 'a, '_unused> fn(_: &'z for<'b> fn(_: &'b str), _: &'a ()) -> &'a () ``` **(†)**: It returns an `FxHashSet` which isn't *predictable* or *stable* wrt. source code (`.rmeta`) changes. To elaborate, the ordering of late-bound regions doesn't necessarily reflect the ordering found in the source code. It does seem to be stable across compilations but modifying the source code of the to-be-documented crates (like adding or renaming items) may result in a different order: <details><summary>Example</summary> Let's assume that we're documenting the cross-crate re-export of `produce` from the code below. On `master`, rustdoc would render the list of binders as `for<'x, 'y, 'z>`. However, once you add back the functions `a`–`l`, it would be rendered as `for<'z, 'y, 'x>` (reverse order)! Results may vary. `bound_vars()` fixes this as it returns them in source order. ```rs // pub fn a() {} // pub fn b() {} // pub fn c() {} // pub fn d() {} // pub fn e() {} // pub fn f() {} // pub fn g() {} // pub fn h() {} // pub fn i() {} // pub fn j() {} // pub fn k() {} // pub fn l() {} pub fn produce() -> impl for<'x, 'y, 'z> Trait<'z, 'y, 'x> {} pub trait Trait<'a, 'b, 'c> {} impl Trait<'_, '_, '_> for () {} ``` </details> Further, as the name suggests, CRLBR only collects *referenced* regions and thus we drop unused binders. `bound_vars()` contains unused binders on the other hand. Let's stay closer to the source where possible and keep unused binders. Lastly, using `bound_vars()` allows us to get rid of * the deduplication and alphabetical sorting hack in `simplify.rs` * the weird field `bound_params` on `EqPredicate` both of which were introduced by me in rust-lang#102707 back when I didn't know better. To illustrate, let's look at the cross-crate bound `T: for<'a, 'b> Trait<A<'a> = (), B<'b> = ()>`. * With CRLBR + `EqPredicate.bound_params`, *before* bounds simplification we would have the bounds `T: Trait`, `for<'a> <T as Trait>::A<'a> == ()` and `for<'b> <T as Trait>::B<'b> == ()` which required us to merge `for<>`, `for<'a>` and `for<'b>` into `for<'a, 'b>` in a deterministic manner and without introducing duplicate binders. * With `bound_vars()`, we now have the bounds `for<'a, b> T: Trait`, `<T as Trait>::A<'a> == ()` and `<T as Trait>::B<'b> == ()` before bound simplification similar to rustc itself. This obviously no longer requires any funny merging of `for<>`s. On top of that `for<'a, 'b>` is guaranteed to be in source order.

…Lapkin Emit feature gate *warning* for `auto` traits pre-expansion Auto traits were introduced before we were more careful about not stabilizing new syntax pre-expansion. This is a more conservative step in the general direction we want to go in https://rust-lang.zulipchat.com/#narrow/stream/213817-t-lang/topic/Removal.20of.20.60auto.20trait.60.20syntax. Fixes rust-lang#116121

…=lqd Mark myself as vacation or whatever I think I have the capacity to review PRs currently assigned to me, before vacation, but I won't be able to take any more. So, until everything settles down, I don't want to be assigned to new PRs.

matthiaskrgr · 2023-10-04T03:02:25Z

@bors r+ rollup=never p=7

bors · 2023-10-04T03:02:28Z

📌 Commit d494048 has been approved by matthiaskrgr

It is now in the queue for this repository.

bors · 2023-10-04T03:38:45Z

⌛ Testing commit d494048 with merge a7bb2f6...

bors · 2023-10-04T05:28:50Z

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

rust-timer · 2023-10-04T05:30:51Z

📌 Perf builds for each rolled up PR:

PR#	Message	Perf Build Sha
#115961	Replace 'mutex' with 'lock' in RwLock documentation	`3b0f35fd860b6e8660eaa52c4b5081fb1e344b8f` (link)
#116146	Clarify `arg` and `args` documentation	`1d85eb798244c900b6b95bd9c0d3baf0fa181342` (link)
#116363	Adapt `todo!` documentation to mention displaying custom va…	`278e144c53509c0327a13c2c17b192d7894deb6e` (link)
#116365	bootstrap: make copying linker binaries conditional	`7d5a8ed161b80e5924fb0eb37f1125fdb412a25c` (link)
#116388	rustdoc: fix & clean up handling of cross-crate higher-rank…	`67caf0e70c8900f7b58ae1badef568b1dc3f7c90` (link)
#116393	Emit feature gate warning for `auto` traits pre-expansion	`a1a82f38b56f96c72a3bffe15a7832a97e0763a1` (link)
#116395	Mark myself as vacation or whatever	`a16ac8541ae9a9cd0f99a4ca69319717b975e11d` (link)

previous master: 4910642aab

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-10-04T06:49:50Z

Finished benchmarking commit (a7bb2f6): comparison URL.

Overall result: no relevant changes - no action needed

@rustbot label: -perf-regression

Instruction count

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

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

Cycles

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

Binary size

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

Bootstrap: 622.307s -> 622.561s (0.04%)
Artifact size: 272.04 MiB -> 272.02 MiB (-0.01%)

Kriskras99 and others added 17 commits September 19, 2023 12:46

Replace 'mutex' with 'lock' in RwLock documentation

cdf25c9

When copying the documentation for `clear_poison` from Mutex, not every occurence of 'mutex' was replaced with 'lock'.

clarify documentation about variable substituion

7bda9b1

update other place

221d0a6

Adapt todo! documentation to mention displaying custom values

f96cfb5

Correct hidden trait in doc test

Appease tidy

0c6d279

rustdoc: fix & clean up handling of cross-crate higher-ranked lifetimes

67de150

rustdoc: add support for cross-crate higher-ranked types

ace85f0

bootstrap: make copying linker binaries conditional

f55c879

Gate against auto traits pre-expansion

7815641

Mark myself as vacation or whatever

a18729c

Rollup merge of rust-lang#115961 - Kriskras99:master, r=thomcc

36e234a

Replace 'mutex' with 'lock' in RwLock documentation When copying the documentation for `clear_poison` from Mutex, not every occurence of 'mutex' was replaced with 'lock'.

Rollup merge of rust-lang#116146 - Milo123459:milo/clarify-arg-docume…

d5bd019

…ntation, r=thomcc Clarify `arg` and `args` documentation Fixes rust-lang#95400

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 Oct 4, 2023

bors added the merged-by-bors This PR was explicitly merged by bors. label Oct 4, 2023

bors merged commit a7bb2f6 into rust-lang:master Oct 4, 2023
11 checks passed

rustbot added this to the 1.75.0 milestone Oct 4, 2023

bors mentioned this pull request Oct 4, 2023

rustdoc: Unify where clause styling #113043

Closed

pvdrz mentioned this pull request Oct 4, 2023

Fix divergence from upstream master ferrocene/ferrocene#23

Merged

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

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Rollup of 7 pull requests #116408

Rollup of 7 pull requests #116408

matthiaskrgr commented Oct 4, 2023

matthiaskrgr commented Oct 4, 2023

bors commented Oct 4, 2023

bors commented Oct 4, 2023

bors commented Oct 4, 2023

rust-timer commented Oct 4, 2023

rust-timer commented Oct 4, 2023

Rollup of 7 pull requests #116408

Rollup of 7 pull requests #116408

Conversation

matthiaskrgr commented Oct 4, 2023

matthiaskrgr commented Oct 4, 2023

bors commented Oct 4, 2023

bors commented Oct 4, 2023

bors commented Oct 4, 2023

rust-timer commented Oct 4, 2023

rust-timer commented Oct 4, 2023

Overall result: no relevant changes - no action needed

Instruction count

Max RSS (memory usage)

Cycles

Binary size