Rollup of 7 pull requests by compiler-errors · Pull Request #101592 · rust-lang/rust

compiler-errors · 2022-09-08T21:41:14Z

Successful merges:

Fix hermit warnings #101423 (Fix hermit warnings)
Introduce lowering_arena to avoid creating AST nodes on the fly #101499 (Introduce lowering_arena to avoid creating AST nodes on the fly)
llvm-wrapper: adapt for LLVM API changes #101530 (llvm-wrapper: adapt for LLVM API changes)
rustdoc: remove unused CSS #implementations-list > h3 > span.in-band #101554 (rustdoc: remove unused CSS #implementations-list > h3 > span.in-band)
rustdoc: remove unused CSS div.impl-items > div #101580 (rustdoc: remove unused CSS div.impl-items > div)
rustdoc: remove no-op CSS #settings-menu { padding: 0 } #101584 (rustdoc: remove no-op CSS #settings-menu { padding: 0 })
Make Debug impl for Term useful #101587 (Make Debug impl for Term useful)

Failed merges:

r? @ghost
@rustbot modify labels: rollup

No functional changes intended. Adapts PassWrapper for two recent LLVM API changes: * llvm/llvm-project@e7bac3b * llvm/llvm-project@93600eb * llvm/llvm-project@5e38b2a

This was added in 51f26ac to help with the display of an `<h3>` tag that has a `<span class='in-band'>` inside. The way implementation lists were rendered was changed in 34bd2b8 to have `<code class='in-band'>`, making this CSS unused. Then it was turned into a `<div>` in 9077d54 without issue. Finally, the header itself acquired the `in-band` class in 76a3b60.

This was added in 9077d54 to override the style on `<div>` tags that were acting as headers. These `<div>` tags were replaced with `<section>` tags in 32f6260, but this CSS was probably already redundant even then (the headers had already been replaced with real `<h3>` and `<h4>` tags in 76a3b60).

This CSS was added in 5e01ba3, and served to override CSS right above it that set a 5px padding for several kinds of buttons in the same toolbar. The CSS that it overrode is still there, but now it only applies to `#settings-menu > a`, so there's nothing to override.

Fix hermit warnings This fixes two `unused_imprt` and one `dead_code` warning for hermit.

…li-obk Introduce lowering_arena to avoid creating AST nodes on the fly `@oli-obk` requested this and other changes as a way of simplifying rust-lang#101345. This is just going to make the diff of rust-lang#101345 smaller. r? `@oli-obk` `@cjgillot`

llvm-wrapper: adapt for LLVM API changes No functional changes intended. Adapts PassWrapper for a few recent LLVM API changes: * llvm/llvm-project@e7bac3b * llvm/llvm-project@93600eb * llvm/llvm-project@5e38b2a Note that `ModuleMemorySanitizerPass` was renamed back to its pre-14 name, `MemorySanitizerPass`, hence the funky `#if LLVM_VERSION_GE(14, 0) && LLVM_VERSION_LT(16, 0)` guard. Found via our experimental rust + llvm at HEAD bot: https://buildkite.com/llvm-project/rust-llvm-integrate-prototype/builds/13290#018315e6-24e1-44c8-b56d-9aad9be11c29

…list-h3-span-in-band, r=Dylan-DPC rustdoc: remove unused CSS `#implementations-list > h3 > span.in-band` This was added in 51f26ac to help with the display of an `<h3>` tag that has a `<span class='in-band'>` inside. The way implementation lists were rendered was changed in 34bd2b8 to have `<code class='in-band'>`, making this CSS unused. Then it was turned into a `<div>` in 9077d54 without issue. Finally, the header itself acquired the `in-band` class in 76a3b60.

…-div, r=GuillaumeGomez rustdoc: remove unused CSS `div.impl-items > div` This was added in 9077d54 to override the style on `<div>` tags that were acting as headers. These `<div>` tags were replaced with `<section>` tags in 32f6260, but this CSS was probably already redundant even then (the headers had already been replaced with real `<h3>` and `<h4>` tags in 76a3b60).

… r=GuillaumeGomez rustdoc: remove no-op CSS `#settings-menu { padding: 0 }` This CSS was added in 5e01ba3, and served to override CSS right above it that set a 5px padding for several kinds of buttons in the same toolbar: https://github.com/rust-lang/rust/blob/5e01ba36c9f1037c4cf3e7421413fc6c41f85d05/src/librustdoc/html/static/css/rustdoc.css#L1400-L1409 The CSS that it overrode is still there, but now it only applies to `#settings-menu > a`, so there's nothing to override. https://github.com/rust-lang/rust/blob/24d69920201563f0ee7b530f1cda0f171b205cc2/src/librustdoc/html/static/css/rustdoc.css#L1445-L1454

Make `Debug` impl for `Term` useful because `Term { ptr: 78942378998734298342, maker: PhantomData, }` does not excel at communicating the necessary information

compiler-errors · 2022-09-08T21:41:26Z

@bors r+ rollup=never p=7

bors · 2022-09-08T21:41:27Z

📌 Commit e43cf3d has been approved by compiler-errors

It is now in the queue for this repository.

bors · 2022-09-08T21:45:27Z

⌛ Testing commit e43cf3d with merge c6861df...

bors · 2022-09-09T00:34:56Z

☀️ Test successful - checks-actions
Approved by: compiler-errors
Pushing c6861df to master...

rust-timer · 2022-09-09T00:37:09Z

📌 Perf builds for each rolled up PR:

PR#	Perf Build Sha
#101587	f27b43daa51f10d2d6c3fa6b084034deccf4bd5f
#101584	507750b3fc94cf6ddaaac019b4c3c9390035bcd8
#101580	204f525e93836a0a109c4d155e4a227f1eab20b2
#101554	5f547eb3c210f46486db29b2b6f1e065d876bbbe
#101530	c91091990a6b6c392d1a2130b80b1c1a7273693a
#101499	d24ee86f3211d3fce3ebdd044a4c2986ea62357d
#101423	7938da91f5019569dc74e9f8a620cb3b60211c49

previous master: 1120c5e01d

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-09-09T06:06:02Z

Finished benchmarking commit (c6861df): comparison URL.

Overall result: ❌✅ regressions and improvements - ACTION NEEDED

Next Steps: If you can justify the regressions found in this perf run, please indicate this with @rustbot label: +perf-regression-triaged along with sufficient written justification. If you cannot justify the regressions please open an issue or create a new PR that fixes the regressions, add a comment linking to the newly created issue or PR, and then add the perf-regression-triaged label to this PR.

@rustbot label: +perf-regression
cc @rust-lang/wg-compiler-performance

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)	4.6%	[4.6%, 4.6%]	1
Improvements ✅ (primary)	-1.2%	[-1.3%, -1.1%]	2
Improvements ✅ (secondary)	-3.3%	[-3.8%, -2.9%]	6
All ❌✅ (primary)	-1.2%	[-1.3%, -1.1%]	2

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.9%	[0.9%, 0.9%]	1
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-2.2%	[-2.2%, -2.2%]	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)	-	-	0
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-2.6%	[-3.6%, -2.1%]	5
All ❌✅ (primary)	-	-	0

the arithmetic mean of the percent change↩↩² ↩³
number of relevant changes↩↩² ↩³

nnethercote · 2022-09-12T04:27:12Z

All these changes are just noise.

cranelift-codegen and keccak are noisy right now, so those improvements aren't real.
The coercions regression is only for a single profile/scenario combination, so I don't think it's meaningful.

@rustbot label: +perf-regression-triaged

mkroeningand others added 15 commits September 5, 2022 00:23

Hermit: Fix unused_imports
11af142

Hermit: Remove unused socklen_t (dead_code)
ce305f8

llvm-wrapper: adapt for LLVM API changes
a3b60f1
No functional changes intended. Adapts PassWrapper for two recent LLVM API changes: * llvm/llvm-project@e7bac3b * llvm/llvm-project@93600eb * llvm/llvm-project@5e38b2a

Introduce lowering_arena to avoid creating AST nodes on the fly
d9a1faa

ptr: 43276834268743978
ef36af2

Rollup merge ofrust-lang#101423- mkroening:hermit-warnings, r=sanxiyn
2c4dc4f
Fix hermit warnings This fixes two `unused_imprt` and one `dead_code` warning for hermit.

Rollup merge ofrust-lang#101587- BoxyUwU:term_debug, r=compiler-errors
e43cf3d
Make `Debug` impl for `Term` useful because `Term { ptr: 78942378998734298342, maker: PhantomData, }` does not excel at communicating the necessary information

bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Sep 8, 2022

compiler-errors mentioned this pull request Sep 8, 2022
Rollup of 4 pull requests #101590
Closed

bors added the merged-by-bors This PR was explicitly merged by bors. label Sep 9, 2022

bors merged commit c6861df into rust-lang:masterSep 9, 2022

rustbot added this to the 1.65.0 milestone Sep 9, 2022

bors mentioned this pull request Sep 9, 2022
Use futex-based locks and thread parker on Hermit #101475
Merged

rustbot added the perf-regression Performance regression. label Sep 9, 2022

rustbot added the perf-regression-triaged The performance regression has been triaged. label Sep 12, 2022

compiler-errors deleted the rollup-d2fya7z branch November 2, 2022 02:58

matthiaskrgr mentioned this pull request Jun 27, 2024
error: internal compiler error: compiler/rustc_infer/src/infer/lexical_region_resolve/mod.rs:486:17: cannot relate region: LUB('{erased}, '{erased}) #127033
Open

Navigation Menu

Uh oh!

Uh oh!

Rollup of 7 pull requests - #101592

Rollup of 7 pull requests#101592
bors merged 15 commits into
rust-lang:masterfrom
compiler-errors:rollup-d2fya7z

compiler-errors commented Sep 8, 2022

Uh oh!

compiler-errors commented Sep 8, 2022

Uh oh!

bors commented Sep 8, 2022

Uh oh!

bors commented Sep 8, 2022

Uh oh!

bors commented Sep 9, 2022

Uh oh!

rust-timer commented Sep 9, 2022

Uh oh!

rust-timer commented Sep 9, 2022

Uh oh!

nnethercote commented Sep 12, 2022

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

10 participants

Uh oh!

Uh oh!

Conversation

compiler-errors commented Sep 8, 2022

Uh oh!

compiler-errors commented Sep 8, 2022

Uh oh!

bors commented Sep 8, 2022

Uh oh!

bors commented Sep 8, 2022

Uh oh!

bors commented Sep 9, 2022

Uh oh!

rust-timer commented Sep 9, 2022

Uh oh!

rust-timer commented Sep 9, 2022

Overall result: ❌✅ regressions and improvements - ACTION NEEDED

Instruction count

Max RSS (memory usage)

Cycles

Footnotes

Uh oh!

nnethercote commented Sep 12, 2022

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

10 participants