Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Jump to bottom

Rollup of 4 pull requests #111552

Merged
merged 9 commits into from
May 14, 2023
Merged

Rollup of 4 pull requests #111552

merged 9 commits into from
May 14, 2023

Conversation

matthiaskrgr
Copy link
Member

Successful merges:

Failed merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

clubby789 and others added 9 commits May 11, 2023 21:41
@clubby789
Better diagnostics for env! where variable contains escape
2555f3b
@y21
improve error for impl<..> impl Trait for Type
7fe8334
@aDotInTheVoid
rustdoc-json: Add tests for #![feature(inherent_associated_types)]
c271c70
@GuillaumeGomez
Update browser-ui-test version to 0.16.3
7e6f65b
@GuillaumeGomez
Convert more GUI tests colors to their original format
91765d8
@matthiaskrgr
Rollup merge of rust-lang#111463 - clubby789:env-escaped-var, r=cjgillot
0b8f2bf 
Better diagnostics for `env!` where variable contains escape

Fixes rust-lang#110559
@matthiaskrgr
Rollup merge of rust-lang#111477 - y21:extra-impl-in-trait-impl, r=co…
d7f7425 
…mpiler-errors

better diagnostics for `impl<..> impl Trait for Type`

Fixes rust-lang#109963
@matthiaskrgr
Rollup merge of rust-lang#111534 - aDotInTheVoid:ita-rdj, r=fmease,Gu…
70ab314 
…illaumeGomez

rustdoc-json: Add tests for `#![feature(inherent_associated_types)]`

Follow up to rust-lang#109410, CC `@fmease`

r? `@GuillaumeGomez`
@matthiaskrgr
Rollup merge of rust-lang#111549 - GuillaumeGomez:update-gui-format, …
d1cd127 
…r=notriddle

[rustdoc] Convert more GUI tests colors to their original format

Follow-up of rust-lang#111459.

The update for the `browser-ui-test` version is about improvements for color handling (alpha for hex format in particular).

r? `@notriddle`
@rustbot rustbot added A-rustdoc-json Area: Rustdoc JSON backend A-testsuite Area: The testsuite used to check the correctness of rustc S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-infra Relevant to the infrastructure 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 May 14, 2023
@matthiaskrgr
Copy link
Member Author

@bors r+ rollup=never p=4

@bors
Copy link
Contributor

bors commented May 14, 2023

📌 Commit d1cd127 has been approved by matthiaskrgr

It is now in the queue for this repository.

@bors 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 May 14, 2023
@bors
Copy link
Contributor

bors commented May 14, 2023

⌛ Testing commit d1cd127 with merge 0a0e045...

@bors
Copy link
Contributor

bors commented May 14, 2023

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

1 similar comment
@bors
Copy link
Contributor

bors commented May 14, 2023

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

@bors bors added merged-by-bors This PR was explicitly merged by bors. labels May 14, 2023
@bors bors merged commit 0a0e045 into rust-lang:master May 14, 2023
@rust-timer
Copy link
Collaborator

📌 Perf builds for each rolled up PR:

PR# Perf Build Sha

previous master: 0a0e045e50

In the case of a perf regression, run the following command for each PR you suspect might be the cause: @rust-timer build $SHA

@rustbot rustbot added this to the 1.71.0 milestone May 14, 2023
@rust-timer
Copy link
Collaborator

📌 Perf builds for each rolled up PR:

PR# Perf Build Sha
#111549 0d921fa77fb369c72dd04a6b390eadb31df9804e
#111534 6347b8e5182fa60b3486e483d16ace92c7c0b0b9
#111477 dcf178ad9fb138f2c890b4ade02db148bd7f266f
#111463 b527480e2225148dd569dace4529c2b527dafd6d

previous master: bc888958c9

In the case of a perf regression, run the following command for each PR you suspect might be the cause: @rust-timer build $SHA

@bors bors mentioned this pull request May 14, 2023
Merged
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (0a0e045): 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.8% [2.1%, 3.7%] 6
Improvements ✅
(primary)		 -4.4% [-5.1%, -4.1%] 3
Improvements ✅
(secondary)		 -2.0% [-2.0%, -2.0%] 1
All ❌✅ (primary) -4.4% [-5.1%, -4.1%] 3

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)		 1.0% [0.7%, 1.3%] 4
Regressions ❌
(secondary)		 2.6% [2.6%, 2.6%] 1
Improvements ✅
(primary)		 - - 0
Improvements ✅
(secondary)		 - - 0
All ❌✅ (primary) 1.0% [0.7%, 1.3%] 4

Binary size

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

Bootstrap: 660.613s -> 660.495s (-0.02%)

@matthiaskrgr matthiaskrgr mentioned this pull request Jul 24, 2023
Closed
@matthiaskrgr matthiaskrgr deleted the rollup-4nidoti branch March 16, 2024 18:18
# for free to join this conversation on GitHub. Already have an account? # to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
A-rustdoc-json Area: Rustdoc JSON backend A-testsuite Area: The testsuite used to check the correctness of rustc merged-by-bors This PR was explicitly merged by bors. 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-infra Relevant to the infrastructure 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
Milestone
1.71.0
Development

Successfully merging this pull request may close these issues.
8 participants
@matthiaskrgr @bors @rust-timer @rustbot @clubby789 @y21 @aDotInTheVoid @GuillaumeGomez