Rollup of 9 pull requests #104083

JohnTitor · 2022-11-07T00:46:29Z

Successful merges:

rustdoc: various cross-crate reexport fixes #103885 (rustdoc: various cross-crate reexport fixes)
Make underscore_literal_suffix a hard error. #103914 (Make underscore_literal_suffix a hard error.)
Add type_array to BaseTypeMethods #104045 (Add type_array to BaseTypeMethods)
Vec: IntoIterator signature consistency #104056 (Vec: IntoIterator signature consistency)
Fix typo in rustc_middle/lint.rs #104059 (Fix typo in rustc_middle/lint.rs)
rustdoc: remove unused CSS #sidebar-filler #104062 (rustdoc: remove unused CSS #sidebar-filler)
Migrate rust logo filter to CSS variables #104065 (Migrate rust logo filter to CSS variables)
LLVM 16: Update RISCV data layout #104066 (LLVM 16: Update RISCV data layout)
rustdoc: Add an example for round that is different from truncate #104074 (rustdoc: Add an example for round that is different from truncate)

Failed merges:

r? @ghost
@rustbot modify labels: rollup

…ss-crate functions and methods

…ions & function pointers for consistency with the way we display local definitions (cleaned from HIR, not from rustc_middle).

… where-clause to param declaration site I've overlooked this in rust-lang#103190.

…ds in trait-object types

as well as some FIXMEs

Moved type_array function to rustc_codegen_ssa::BaseTypeMethods trait. This allows using normal alloca function to create arrays as suggested in rust-lang#104022. Signed-off-by: Ayush Singh <ayushsingh1325@gmail.com>

Also makes the code dryer.

This hack was removed in 6a5f8b1, but the CSS was left in.

It's been a warning for 5.5 years. Time to make it a hard error. Closes rust-lang#42326.

…-reexport-fixes, r=cjgillot,GuillaumeGomez rustdoc: various cross-crate reexport fixes Fixes for various smaller cross-crate reexport issues. The PR is split into several commits for easier review. Will be squashed after approval. Most notable changes: * We finally render late-bound lifetimes in the generic parameter list of cross-crate functions & methods. Previously, we would display the re-export of `pub fn f<'s>(x: &'s str) {}` as `pub fn f(x: &'s str)` * We now render unnamed parameters of cross-crate functions and function pointers as underscores since that's exactly what we do for local definitions, too. Mentioned as a bug in rust-lang#44306. * From now on, the rendering of cross-crate trait-object types is more correct: * `for<>` parameter lists (for higher-ranked lifetimes) are now shown * the return type of `Fn{,Mut,Once}` trait bounds is now displayed Regarding the last list item, here is a diff for visualization (before vs. after): ```patch - dyn FnOnce(&'any str) + 'static + dyn for<'any> FnOnce(&'any str) -> bool + 'static ``` The redundant `+ 'static` will be removed in a follow-up PR that will hide trait-object lifetime-bounds if they coincide with [their default](https://doc.rust-lang.org/reference/lifetime-elision.html#default-trait-object-lifetimes) (see [Zulip discussion](https://rust-lang.zulipchat.com/#narrow/stream/266220-rustdoc/topic/clean_middle_ty.3A.20I.20need.20to.20add.20a.20parameter/near/307143097)). `FIXME(fmease)`s were added. ``@rustbot`` label A-cross-crate-reexports r? ``@GuillaumeGomez``

…enkov Make underscore_literal_suffix a hard error. It's been a warning for 5.5 years. Time to make it a hard error. Closes rust-lang#42326. r? ``@pnkfelix``

Add type_array to BaseTypeMethods Moved `type_array` function to `rustc_codegen_ssa::BaseTypeMethods` trait. This allows using normal `alloca` function to create arrays as suggested in rust-lang#104022. Signed-off-by: Ayush Singh <ayushsingh1325@gmail.com>

Vec: IntoIterator signature consistency Also makes the code dryer.

…trochenkov Fix typo in `rustc_middle/lint.rs`

…, r=GuillaumeGomez rustdoc: remove unused CSS `#sidebar-filler` This hack was removed in 6a5f8b1, but the CSS was left in.

…lter, r=notriddle Migrate rust logo filter to CSS variables

LLVM 16: Update RISCV data layout The RISCV data layout was changed in llvm/llvm-project@974e2e6. This updates all `riscv64*` targets, though I don't really know what the difference between the `gc` and `imac` ones is. Passes `x test codegen` at LLVM head and with the currently bundled LLVM version. Without this patch, some tests fail with: > error: internal compiler error: compiler/rustc_codegen_llvm/src/context.rs:192:13: data-layout for target `riscv64gc-unknown-none-elf`, `e-m:e-p:64:64-i64:64-i128:128-n64-S128`, differs from LLVM target's `riscv64` default layout, `e-m:e-p:64:64-i64:64-i128:128-n32:64-S128

… r=Mark-Simulacrum rustdoc: Add an example for round that is different from truncate The current examples for [round](https://github.com/rust-lang/rust/blob/master/library/std/src/f64.rs#L75) would have the same results as the example for [truncate](https://github.com/rust-lang/rust/blob/master/library/std/src/f64.rs#L95). This PR adds one more example to `round` that will have a different result from `truncate`.

JohnTitor · 2022-11-07T00:46:47Z

@bors r+ p=9 rollup=never

bors · 2022-11-07T00:46:49Z

📌 Commit 7ca833e has been approved by JohnTitor

It is now in the queue for this repository.

bors · 2022-11-07T02:15:42Z

⌛ Testing commit 7ca833e with merge 9b735a7...

bors · 2022-11-07T04:56:53Z

☀️ Test successful - checks-actions
Approved by: JohnTitor
Pushing 9b735a7 to master...

rust-timer · 2022-11-07T04:59:26Z

📌 Perf builds for each rolled up PR:

PR#	Perf Build Sha
#104074	a881ec34c7eff15fd30529e5de6e86b7adc8e6e4
#104066	8895e0ca86e22f09b6320d5a782e75d9981fd653
#104065	4f284e38abc89265131a97e1e4eb44dde05c8a4d
#104062	496b47ad38dd5ab0f3ed7c75b51a76febc67f1f5
#104059	5038381b2eb38a10edf5c30289d0e16b9957130b
#104056	dfc5f6a087d3389e5302e4fd3d7bd3bae34cecca
#104045	b5a81d15a7c89d56710b8102c8794c317e4fb1cf
#103914	cdb8fc8eadc8c1ac54f067b0050bb293692eac6c
#103885	ed81340f3191ce04274429c4b25c13a4d94e31ca

previous master: 7eef946fc0

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-07T06:16:05Z

Finished benchmarking commit (9b735a7): 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.6%	[0.6%, 0.6%]	2
Regressions ❌ (secondary)	5.1%	[4.7%, 5.5%]	2
Improvements ✅ (primary)	-0.6%	[-0.7%, -0.6%]	2
Improvements ✅ (secondary)	-2.3%	[-2.3%, -2.3%]	1
All ❌✅ (primary)	-0.0%	[-0.7%, 0.6%]	4

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.4%	[0.4%, 0.4%]	1
Regressions ❌ (secondary)	2.6%	[2.0%, 3.6%]	3
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-4.8%	[-4.9%, -4.6%]	2
All ❌✅ (primary)	0.4%	[0.4%, 0.4%]	1

fmease and others added 25 commits November 4, 2022 19:34

rustdoc: render late-bound lifetimes in generic parameter list of cro…

5965af7

…ss-crate functions and methods

rustdoc: render unnamed arguments as underscores in cross-crate funct…

9cdab67

…ions & function pointers for consistency with the way we display local definitions (cleaned from HIR, not from rustc_middle).

rustdoc: move cross-crate lifetime/outlives bounds on GAT params from…

2d9755f

… where-clause to param declaration site I've overlooked this in rust-lang#103190.

rustdoc: render for<> param lists of cross-crate trait-object types

1ac7034

rustdoc: render the return type of cross-crate Fn-family trait boun…

71561f8

…ds in trait-object types

rustdoc: add test for cross-crate trait-object types

7ec50b6

as well as some FIXMEs

rustdoc: create helper GenericParamDef::lifetime

5ccaed2

Add type_array to BaseTypeMethods

299bc61

Moved type_array function to rustc_codegen_ssa::BaseTypeMethods trait. This allows using normal alloca function to create arrays as suggested in rust-lang#104022. Signed-off-by: Ayush Singh <ayushsingh1325@gmail.com>

Vec: IntoIterator signature consistency

743726e

Also makes the code dryer.

fix: typo

e15c406

rustdoc: remove unused CSS #sidebar-filler

b34fdd3

This hack was removed in 6a5f8b1, but the CSS was left in.

Migrate rust logo filter to CSS variables

24d86a1

LLVM 16: Update RISCV data layout

f414715

Extend rust-logo GUI test to check there is no filter for other logos

0e23d90

rustdoc: Add an example for round that is different from truncate

a398e09

Make underscore_literal_suffix a hard error.

dba6fc3

It's been a warning for 5.5 years. Time to make it a hard error. Closes rust-lang#42326.

Rollup merge of rust-lang#103914 - nnethercote:close-42326, r=petroch…

19c780a

…enkov Make underscore_literal_suffix a hard error. It's been a warning for 5.5 years. Time to make it a hard error. Closes rust-lang#42326. r? ``@pnkfelix``

Rollup merge of rust-lang#104056 - ripytide:patch-1, r=Mark-Simulacrum

57daec5

Vec: IntoIterator signature consistency Also makes the code dryer.

Rollup merge of rust-lang#104059 - Rejyr:rustc_middle-lint-typo, r=pe…

d6c41a2

…trochenkov Fix typo in `rustc_middle/lint.rs`

Rollup merge of rust-lang#104062 - notriddle:notriddle/sidebar-filler…

458b132

…, r=GuillaumeGomez rustdoc: remove unused CSS `#sidebar-filler` This hack was removed in 6a5f8b1, but the CSS was left in.

Rollup merge of rust-lang#104065 - GuillaumeGomez:css-migrate-logo-fi…

fe6161a

…lter, r=notriddle Migrate rust logo filter to CSS variables

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

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

bors merged commit 9b735a7 into rust-lang:master Nov 7, 2022

rustbot added this to the 1.67.0 milestone Nov 7, 2022

bors mentioned this pull request Nov 7, 2022

Add round_ties_even to f32 and f64 #95317

Merged

JohnTitor deleted the rollup-lo3wbzs branch November 7, 2022 05:10

bors mentioned this pull request Nov 7, 2022

Separate lifetime ident from lifetime resolution in HIR #104048

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Rollup of 9 pull requests #104083

Rollup of 9 pull requests #104083

Uh oh!

JohnTitor commented Nov 7, 2022

Uh oh!

JohnTitor commented Nov 7, 2022

Uh oh!

bors commented Nov 7, 2022

Uh oh!

bors commented Nov 7, 2022

Uh oh!

bors commented Nov 7, 2022

Uh oh!

rust-timer commented Nov 7, 2022

Uh oh!

rust-timer commented Nov 7, 2022

Uh oh!

Uh oh!

Rollup of 9 pull requests #104083

Rollup of 9 pull requests #104083

Uh oh!

Conversation

JohnTitor commented Nov 7, 2022

Uh oh!

JohnTitor commented Nov 7, 2022

Uh oh!

bors commented Nov 7, 2022

Uh oh!

bors commented Nov 7, 2022

Uh oh!

bors commented Nov 7, 2022

Uh oh!

rust-timer commented Nov 7, 2022

Uh oh!

rust-timer commented Nov 7, 2022

Overall result: no relevant changes - no action needed

Instruction count

Max RSS (memory usage)

Cycles

Uh oh!

Uh oh!