Skip to content

Rollup of 8 pull requests #115929

New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 24 commits into from
Sep 18, 2023
Merged

Rollup of 8 pull requests #115929

merged 24 commits into from
Sep 18, 2023

Conversation

matthiaskrgr
Copy link
Member

Successful merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

tshepang and others added 24 commits September 5, 2023 10:53
@tshepang
issue has since been fixed
86d32ef
@tgross35
Add myself to the mailmap
7db123d
Make AIX known by bootstrap
2962528
Add comment to elaborate
fc17e09
Adjust comment
5049a71
Adjust comment
122d1cc
@lcnr
GoalCandidate to Probe
be9d7e0
@lcnr
order added_goals_evaluation and nested_probes
a3f9530
@lcnr
inspect: explicitly store added goals
1b141b6
@lcnr
differentiate root and nested goals
0cb800e
@Mark-Simulacrum
Bump to supported Ubuntu
5b882ac 
The 22.10 Ubuntu repositories were returning 404s in last stable build.
@Mark-Simulacrum
Move to older, mirrored redox install
abd265e
@cjgillot
Do not clone MIR for const-prop lint.
5d18a0e
@jackh726
Add me as on vacation
c70ee68
@RalfJung
nop_lift macros: ensure that we are using the right interner
3b817b2
@tshepang
address review comment
a716c96 
See rust-lang#115558 (comment)
@matthiaskrgr
Rollup merge of rust-lang#115558 - tshepang:patch-4, r=Mark-Simulacrum
2e38432 
issue has since been fixed
@matthiaskrgr
Rollup merge of rust-lang#115724 - tgross35:mailmap, r=Mark-Simulacrum
5a8e8e5 
Add myself to the mailmap
@matthiaskrgr
Rollup merge of rust-lang#115811 - bzEq:make-aix-known, r=Mark-Simula…
c843ac2 
…crum

Make AIX known by bootstrap

Use `x.py` to build rustc on AIX directly is failing
```
unknown OS type: AIX
Build completed unsuccessfully in 0:00:00
```
If kernel is `AIX`, we should return default triple `powerpc64-ibm-aix` for current rustc.
@matthiaskrgr
Rollup merge of rust-lang#115838 - lcnr:added-goals, r=compiler-errors
944c413 
inspect: closer to proof trees for coherence

a continuation of rust-lang#115751. Now explicitly store the added goals

r? ```@compiler-errors```
@matthiaskrgr
Rollup merge of rust-lang#115902 - Mark-Simulacrum:bump-ci, r=albertl…
4977018 
…arsan68

Fix up a few CI images

This forward-ports changes made on the stable branch to fix CI (rust-lang#115787).
@matthiaskrgr
Rollup merge of rust-lang#115907 - RalfJung:interner-check, r=compile…
0d29cdd 
…r-errors

nop_lift macros: ensure that we are using the right interner

Right now someone could put down the wrong list name when using these macros, and everything would still build. Nothing does a type-check to ensure that the `$set` contains element of type `Self::Lifted`. Let's fix that.

For lists this is fairly easy; for the other interners we need to unwrap some newtypes which makes this more complicated.
@matthiaskrgr
Rollup merge of rust-lang#115908 - cjgillot:lint-noclone, r=oli-obk
c101c5f 
Do not clone MIR for const-prop lint.

Addresses rust-lang#115797 (comment)
@matthiaskrgr
Rollup merge of rust-lang#115916 - jackh726:vacation, r=jackh726
5290cc9 
Add me as on vacation
@rustbot rustbot added A-meta Area: Issues & PRs about the rust-lang/rust repository itself 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-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-infra Relevant to the infrastructure team, which will review and decide on the PR/issue. labels Sep 18, 2023
@rustbot rustbot added WG-trait-system-refactor The Rustc Trait System Refactor Initiative (-Znext-solver) rollup A PR which is a rollup labels Sep 18, 2023
@matthiaskrgr
Copy link
Member Author

@bors r+ rollup=never p=8

@bors
Copy link
Collaborator

bors commented Sep 18, 2023

📌 Commit 5290cc9 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 Sep 18, 2023
@bors
Copy link
Collaborator

bors commented Sep 18, 2023

⌛ Testing commit 5290cc9 with merge de68911...

@bors
Copy link
Collaborator

bors commented Sep 18, 2023

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

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Sep 18, 2023
@bors bors merged commit de68911 into rust-lang:master Sep 18, 2023
@rustbot rustbot added this to the 1.74.0 milestone Sep 18, 2023
@rust-timer
Copy link
Collaborator

📌 Perf builds for each rolled up PR:

PR# Message Perf Build Sha
#115558 issue has since been fixed d7d0e0cfa0a55018c43658fa039db40d4589e761 (link)
#115724 Add myself to the mailmap dfe714b136dd2dc2513cfc32e1da6f7232092c1a (link)
#115811 Make AIX known by bootstrap fdf8c6e404935c6eae398e98c7448f7157c69a12 (link)
#115838 inspect: closer to proof trees for coherence 2a5c7ed18304c829c75a3c4e6fbb20537c803df0 (link)
#115902 Fix up a few CI images 30f6059668bd306ea41ded2a417051fbdc1fb129 (link)
#115907 nop_lift macros: ensure that we are using the right interner 88f0a89b637732076978316c652b21cb3440726b (link)
#115908 Do not clone MIR for const-prop lint. 79948c2df0f3a4fe8973c5fafc64c3045582232e (link)
#115916 Add me as on vacation 58908e670f6aa8b12d1211feed4b0fdc356bdecd (link)

previous master: 078eb1120a

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 Sep 18, 2023
Merged
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (de68911): comparison URL.

Overall result: ✅ improvements - no action needed

@rustbot label: -perf-regression

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.2% [0.2%, 0.2%] 1
Regressions ❌
(secondary)		 - - 0
Improvements ✅
(primary)		 -0.5% [-0.7%, -0.2%] 19
Improvements ✅
(secondary)		 -0.5% [-0.6%, -0.2%] 12
All ❌✅ (primary) -0.4% [-0.7%, 0.2%] 20

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)		 3.9% [3.3%, 4.6%] 2
Improvements ✅
(primary)		 - - 0
Improvements ✅
(secondary)		 - - 0
All ❌✅ (primary) - - 0

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: 633.305s -> 634.379s (0.17%)
Artifact size: 317.99 MiB -> 317.94 MiB (-0.01%)

@matthiaskrgr matthiaskrgr deleted the rollup-hhasy22 branch March 16, 2024 18:19
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-meta Area: Issues & PRs about the rust-lang/rust repository itself 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-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-infra Relevant to the infrastructure 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.74.0
Development

Successfully merging this pull request may close these issues.