Skip to content
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

Rollup of 5 pull requests #114553

Merged
merged 10 commits into from
Aug 6, 2023
Merged

Rollup of 5 pull requests #114553

merged 10 commits into from
Aug 6, 2023

Conversation

matthiaskrgr
Copy link
Member

Successful merges:

Failed merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

the8472 and others added 10 commits August 5, 2023 15:53
@the8472
use offset_of! to calculate dirent64 field offsets
20c25d6
@GuillaumeGomez
Migrate GUI colors test to original CSS color format
08ca824
@Enselic
linkchecker: Remove unneeded FIXME about intra-doc links
cf08888 
It was added by 77971 but the adder proposed in that PR that the added
code is a good fallback to have in case rustdoc gets buggy, and I agree.
So remove the FIXME.
@ouz-a
Add alocation to smir
b9a539e
@ouz-a
cleanup misinformation regarding has_deref
6df5462
@matthiaskrgr
Rollup merge of rust-lang#114466 - ouz-a:smir_allocation, r=oli-obk
92c0421 
Add Allocation to SMIR

As it's discussed [here ](https://rust-lang.zulipchat.com/#narrow/stream/320896-project-stable-mir/topic/Representing.20Constants.20in.20smir)this is an attempt to cover Constants for smir in a different way compared to rust-lang#114342

cc rust-lang/project-stable-mir#15

r? ``@oli-obk``
@matthiaskrgr
Rollup merge of rust-lang#114505 - ouz-a:cleanup_mir, r=RalfJung
13de583 
Add documentation to has_deref

Documentation of `has_deref` needed some polish to be more clear about where it should be used and what's it's purpose.

cc rust-lang#114401

r? `@RalfJung`
@matthiaskrgr
Rollup merge of rust-lang#114519 - the8472:dirent-offset-of, r=dtolnay
3d1c36e 
use offset_of! to calculate dirent64 field offsets

r? `@dtolnay`
@matthiaskrgr
Rollup merge of rust-lang#114537 - GuillaumeGomez:migrate-gui-test-co…
0c98f15 
…lor-29, r=notriddle

Migrate GUI colors test to original CSS color format

Follow-up of rust-lang#111459.

r? ``@notriddle``
@matthiaskrgr
Rollup merge of rust-lang#114539 - Enselic:unneeded-fixme, r=ehuss
f542163 
linkchecker: Remove unneeded FIXME about intra-doc links

It was added by rust-lang#77971 but the adder [proposed](rust-lang#77971 (comment)) that the added code is a good fallback to have in case rustdoc gets buggy, and I agree. So remove the FIXME.

This PR is part of rust-lang#44366 which is E-help-wanted.

r? `@jyn514` since you added the FIXME

`@rustbot` label T-dev-tools
@rustbot rustbot added 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-libs Relevant to the library 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 Aug 6, 2023
@matthiaskrgr
Copy link
Member Author

@bors r+ rollup=never p=5

@bors
Copy link
Contributor

bors commented Aug 6, 2023

📌 Commit f542163 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 Aug 6, 2023
@bors
Copy link
Contributor

bors commented Aug 6, 2023

⌛ Testing commit f542163 with merge b5b1932858d7311a76448dfeff5738cf5340c1c3...

@rust-log-analyzer
Copy link
Collaborator

A job failed! Check out the build log: (web) (plain)

Click to see the possible cause of the failure (guessed by this bot)

@bors
Copy link
Contributor

bors commented Aug 6, 2023

💔 Test failed - checks-actions

@bors bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Aug 6, 2023
@matthiaskrgr
Copy link
Member Author

@bors retry no logs

@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 Aug 6, 2023
@bors
Copy link
Contributor

bors commented Aug 6, 2023

⌛ Testing commit f542163 with merge 85fbb57...

@bors
Copy link
Contributor

bors commented Aug 6, 2023

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

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Aug 6, 2023
@bors bors merged commit 85fbb57 into rust-lang:master Aug 6, 2023
@rustbot rustbot added this to the 1.73.0 milestone Aug 6, 2023
@rust-timer
Copy link
Collaborator

📌 Perf builds for each rolled up PR:

PR# Message Perf Build Sha
#114466 Add Allocation to SMIR 0c428511d2007de9620d011979af781a15de3912 (link)
#114505 Add documentation to has_deref ede6fb5f450261af29f248d44c5146e3f153c5c3 (link)
#114519 use offset_of! to calculate dirent64 field offsets d4a0f58fe7898195b4cd1139df6ffbefab9444e0 (link)
#114537 Migrate GUI colors test to original CSS color format 0a7c43c6f9e422cc57f4e23770ab432ae489a4eb (link)
#114539 linkchecker: Remove unneeded FIXME about intra-doc links 01cf61b951194e7461d8edad57e38d560f0a6925 (link)

previous master: 5973bfbd38

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

This was referenced Aug 6, 2023
Merged
Closed
Merged
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (85fbb57): 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)		 - - 0
Improvements ✅
(primary)		 -1.3% [-1.3%, -1.3%] 1
Improvements ✅
(secondary)		 -1.9% [-2.2%, -1.5%] 2
All ❌✅ (primary) -1.3% [-1.3%, -1.3%] 1

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: 651.426s -> 651.433s (0.00%)

@matthiaskrgr matthiaskrgr deleted the rollup-5yddunv branch March 16, 2024 18:18
@matthiaskrgr matthiaskrgr mentioned this pull request Jun 23, 2024
Closed
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
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-libs Relevant to the library 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.73.0
Development

Successfully merging this pull request may close these issues.
9 participants
@matthiaskrgr @bors @rust-log-analyzer @rust-timer @rustbot @the8472 @GuillaumeGomez @Enselic @ouz-a