Skip to content

Conversation

matthiaskrgr
Copy link
Member

Successful merges:

Failed merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

ehuss and others added 13 commits September 8, 2022 16:08
This was added in 611d0e6, to allow its
child `#results` element to be absolutely positioned inside it. The
child stopped being absolute in 8c04695.

To keep the layout looking the same, the links need to not have
`width: 100%` any more, relying instead on the box naturally growing to
fit because it has `display: block`.
Width changed by 2/4 pixels by b273c75
In rust-lang#100537, the relocation model
for UEFI targets was changed from PIC (the default value) to
static. There was some dicussion of this change here:
rust-lang#100537 (comment)

It turns out that this can cause compilation to fail as described in
rust-lang#101377, so switch back to PIC.

Fixes rust-lang#101377
…static-reloc, r=petrochenkov

Use RelocModel::Pic for UEFI targets

In rust-lang#100537, the relocation model for UEFI targets was changed from PIC (the default value) to
static. There was some dicussion of this change here: rust-lang#100537 (comment)

It turns out that this can cause compilation to fail as described in rust-lang#101377, so switch back to PIC.

Fixes rust-lang#101377
Fix ICE report flags display.

rust-lang#92310 made some changes to the ICE report that displays the rustc flags, but it introduced a bug where a flag like `-Z incremental-verify-ich=yes` was being treated as-if it was `-Cincremental`. This corrupted the output and made it confusing. The cause was using `starts_with` instead of properly splitting the option.

For example, with the command like `rustc foo.rs -Cincremental=/tmp/a -Zincremental-verify-ich=yes --crate-type lib` would previously look like:

```
note: compiler flags: -C incremental -Z incremental --crate-type lib
```

It now looks like:

```
note: compiler flags: -C incremental=[REDACTED] -Z incremental-verify-ich=yes --crate-type lib
```

I added a `[REDACTED]` marker for `-Cincremental` so it is a little less confusing that a value has been removed.

Fixes rust-lang#101588
Adapt test for msan message change

Similar to rust-lang#100445, this adapts the new test added by rust-lang#99207 to some relatively recent [LLVM changes](llvm/llvm-project@057cabd) that removed the function name from msan messages.

Found via our experimental rust + llvm @ HEAD bot:
https://buildkite.com/llvm-project/rust-llvm-integrate-prototype/builds/13347#018321b2-0cc3-4c91-b4db-774477e8b074

`@rustbot` label +llvm-main
…laumeGomez

rustdoc: remove unused CSS `#search { position: relative }`

This was added in 611d0e6, to allow its child `#results` element to be absolutely positioned inside it. The child stopped being absolute in 8c04695.

To keep the layout looking the same, the links need to not have `width: 100%` any more, relying instead on the box naturally growing to fit because it has `display: block`.
Rustdoc-Json: Correcty handle intra-doc-links to items without HTML page

Closes rust-lang#101531

I renamed the `did` field in `ItemLink ` to more accurately describe what it does.

r? `@jyn514`
Rustdoc-Json Tests: Use `@is` and `@ismany` more often.
@rustbot rustbot added A-rustdoc-json Area: Rustdoc JSON backend T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. rollup A PR which is a rollup labels Sep 10, 2022
@matthiaskrgr
Copy link
Member Author

@bors r+ rollup=never p=6

@bors
Copy link
Collaborator

bors commented Sep 10, 2022

📌 Commit 973059e has been approved by matthiaskrgr

It is now in the queue for this repository.

@bors 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 10, 2022
@bors
Copy link
Collaborator

bors commented Sep 10, 2022

⌛ Testing commit 973059e with merge db9d86b...

@bors
Copy link
Collaborator

bors commented Sep 10, 2022

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

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Sep 10, 2022
@bors bors merged commit db9d86b into rust-lang:master Sep 10, 2022
@rustbot rustbot added this to the 1.65.0 milestone Sep 10, 2022
@rust-timer
Copy link
Collaborator

📌 Perf builds for each rolled up PR:

PR# Perf Build Sha
#101634 ea6c3c7c0f3860f2a00342a5de8b1a1c9ea5b027
#101633 9cf665fc62c2e3cc5ba8b13ebd440d729e0f0eb8
#101624 9fd93a620a3d151f0e432241bbed7c03587d7b06
#101616 dddafa246d02a9ecc5677b3b0a8c5a414501344d
#101595 e6e365916df5c5e3489dc91d5a626d66ceeffedf
#101413 538e36c8b52d6309728c6aebb46b3f64a15bb247

previous master: cedd26b1ea

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
Copy link
Collaborator

Finished benchmarking commit (db9d86b): comparison URL.

Overall result: ❌ regressions - 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.

mean1 range count2
Regressions ❌
(primary)
1.3% [1.2%, 1.4%] 2
Regressions ❌
(secondary)
3.1% [0.8%, 4.0%] 8
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) 1.3% [1.2%, 1.4%] 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.

mean1 range count2
Regressions ❌
(primary)
- - 0
Regressions ❌
(secondary)
- - 0
Improvements ✅
(primary)
-2.6% [-2.6%, -2.6%] 1
Improvements ✅
(secondary)
-1.6% [-1.6%, -1.6%] 1
All ❌✅ (primary) -2.6% [-2.6%, -2.6%] 1

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.

mean1 range count2
Regressions ❌
(primary)
2.5% [2.5%, 2.5%] 1
Regressions ❌
(secondary)
2.8% [2.0%, 3.7%] 3
Improvements ✅
(primary)
-2.0% [-2.0%, -1.9%] 2
Improvements ✅
(secondary)
-2.6% [-3.0%, -2.3%] 2
All ❌✅ (primary) -0.5% [-2.0%, 2.5%] 3

Footnotes

  1. the arithmetic mean of the percent change 2 3

  2. number of relevant changes 2 3

@rustbot rustbot added the perf-regression Performance regression. label Sep 10, 2022
@lqd
Copy link
Member

lqd commented Sep 10, 2022

There's nothing noteworthy about the PR, and the results look like the other bimodal regressions. Probably mostly noise again ?!

@nnethercote
Copy link
Contributor

@rustbot label: +perf-regression-triaged

@rustbot rustbot added the perf-regression-triaged The performance regression has been triaged. label Sep 11, 2022
@matthiaskrgr matthiaskrgr deleted the rollup-sewkrgm branch October 9, 2022 00:31
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-rustdoc-json Area: Rustdoc JSON backend merged-by-bors This PR was explicitly merged by bors. perf-regression Performance regression. perf-regression-triaged The performance regression has been triaged. rollup A PR which is a rollup S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue.
Projects
None yet
Development

Successfully merging this pull request may close these issues.