Skip to content

Rollup of 5 pull requests#111798

Merged
bors merged 10 commits intorust-lang:masterfrom
GuillaumeGomez:rollup-t3bus8o
May 20, 2023
Merged

Rollup of 5 pull requests#111798
bors merged 10 commits intorust-lang:masterfrom
GuillaumeGomez:rollup-t3bus8o

Conversation

@GuillaumeGomez
Copy link
Copy Markdown
Member

@GuillaumeGomez GuillaumeGomez commented May 20, 2023

Successful merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

compiler-errors and others added 10 commits May 10, 2023 23:41
@compiler-errors
Use OpaqueTypeKey in query response
6f27876
@GuillaumeGomez
Migrate GUI colors test to original CSS color format
ad5955b
@Zoxc
Merge some query impl modules into one
9e755d9
@GuillaumeGomez
Migrate GUI colors test to original CSS color format
c2d3b23
@infinity0 @liushuyu
Set the timestamp of downloaded stage0 files ...
0d7d2ca 
... using server-reported timestamp.
This allows us to track changes to the downloaded artifact more easily
and in a more reproducible manner.

Co-authored-by: Zixing Liu <[email protected]>
@GuillaumeGomez
Rollup merge of rust-lang#111450 - compiler-errors:opaque-ty-key, r=o…
de07424 
…li-obk

Use `OpaqueTypeKey` in query response

Makes it a bit clearer that at least one of the types being returned from a canonical query is an opaque.
@GuillaumeGomez
Rollup merge of rust-lang#111726 - GuillaumeGomez:gui-test-migrate-co…
7597d57 
…lor, r=notriddle

Migrate GUI colors test to original CSS color format

Follow-up of rust-lang#111459.

r? ```@notriddle```
@GuillaumeGomez
Rollup merge of rust-lang#111746 - Zoxc:query-impl-mod, r=cjgillot
3f9a7e7 
Merge some query impl modules into one

This merges some modules in `rustc_query_impl` into one per query, analogous to rust-lang#111703.

r? `@cjgillot`
@GuillaumeGomez
Rollup merge of rust-lang#111765 - GuillaumeGomez:migrate-gui-test-co…
0d8a2e5 
…lor, r=notriddle

Migrate GUI colors test to original CSS color format

Follow-up of rust-lang#111459.

r? `@notriddle`
@GuillaumeGomez
Rollup merge of rust-lang#111771 - liushuyu:ubuntu/rep-stage0, r=ozka…
a6ebaf8 
…nonur

add `--remote-time` flag to curl for bootstrap

This pull request sets the timestamp of the downloaded stage0 binary according to the server-reported timestamp (if possible).
This allows make_orig-dl_tarball.sh to be more reproducible on the filesystem.
@rustbot rustbot added A-query-system Area: The rustc query system (https://rustc-dev-guide.rust-lang.org/query.html) S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) 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. WG-trait-system-refactor The Rustc Trait System Refactor Initiative (-Znext-solver) rollup A PR which is a rollup labels May 20, 2023
@GuillaumeGomez
Copy link
Copy Markdown
Member Author

GuillaumeGomez commented May 20, 2023

@bors r+ rollup=never p=5

@bors
Copy link
Copy Markdown
Collaborator

bors commented May 20, 2023

📌 Commit a6ebaf8 has been approved by GuillaumeGomez

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 20, 2023
@bors
Copy link
Copy Markdown
Collaborator

bors commented May 20, 2023

⌛ Testing commit a6ebaf8 with merge 6bacf5a...

@bors
Copy link
Copy Markdown
Collaborator

bors commented May 20, 2023

☀️ Test successful - checks-actions
Approved by: GuillaumeGomez
Pushing 6bacf5a to master...

1 similar comment
@bors
Copy link
Copy Markdown
Collaborator

bors commented May 20, 2023

☀️ Test successful - checks-actions
Approved by: GuillaumeGomez
Pushing 6bacf5a to master...

@bors bors added merged-by-bors This PR was explicitly merged by bors. labels May 20, 2023
@bors bors merged commit 6bacf5a into rust-lang:master May 20, 2023
@rust-timer
Copy link
Copy Markdown
Collaborator

rust-timer commented May 20, 2023

📌 Perf builds for each rolled up PR:

PR# Perf Build Sha

previous master: 6bacf5a544

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 20, 2023
@rust-timer
Copy link
Copy Markdown
Collaborator

rust-timer commented May 20, 2023

📌 Perf builds for each rolled up PR:

PR# Perf Build Sha
#111771 ab5b923ab4a6e0007ccccd2b3dc559d9c0b9e16c
#111765 747c0bec3906d91f592ffc8a17f819f9ad4f1b01
#111746 48c2b6361038e7405b57c82ae78ed0cb5fd74d8b
#111726 faeae18849cdfc33147df6e89254fc133f5eee04
#111450 fa8be9e6b573f2123737b914f523824f916704e0

previous master: 4eb5225cdf

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

@GuillaumeGomez GuillaumeGomez deleted the rollup-t3bus8o branch May 20, 2023 19:23
@rust-timer
Copy link
Copy Markdown
Collaborator

rust-timer commented May 21, 2023

Finished benchmarking commit (6bacf5a): 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)

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

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: 645.683s -> 642.813s (-0.44%)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

A-query-system Area: The rustc query system (https://rustc-dev-guide.rust-lang.org/query.html) 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-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) 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. WG-trait-system-refactor The Rustc Trait System Refactor Initiative (-Znext-solver)

Projects

None yet

Milestone

1.71.0

Development

Successfully merging this pull request may close these issues.

7 participants

@GuillaumeGomez @bors @rust-timer @rustbot @compiler-errors @Zoxc @infinity0