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.

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

Rollup of 5 pull requests #135005

Merged
merged 11 commits into from
Jan 2, 2025
Merged

Rollup of 5 pull requests #135005

merged 11 commits into from
Jan 2, 2025

Conversation

matthiaskrgr
Copy link
Member

Successful merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

ericlehong and others added 11 commits December 31, 2024 12:33
Signed-off-by: ericlehong <[email protected]>
… r=jieyouxu

handle submodules automatically on `doc` steps

Helps to make `doc` macros less complicated.
Fix typos

This PR fixes typos errors in comments and docs.

Thank you very much.
… r=lqd

`ObligationCause` construction tweaks in typeck

Mostly just consolidating the way we construct obligations in `FnCtxt`.
…cation-in-Ord-trait-docs, r=Noratrieb

Remove qualification of `std::cmp::Ordering` in `Ord` doc
…pe, r=lqd

Fix ICE when opaque captures a duplicated/invalid lifetime

See description on test.

Fixes rust-lang#132766
Fixes rust-lang#133693
Fixes rust-lang#134780
@rustbot rustbot added 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-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 Jan 1, 2025
@matthiaskrgr
Copy link
Member Author

@bors r+ rollup=never p=5

@bors
Copy link
Contributor

bors commented Jan 1, 2025

📌 Commit 92dbfcc 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 Jan 1, 2025
@bors
Copy link
Contributor

bors commented Jan 1, 2025

⌛ Testing commit 92dbfcc with merge 62b13a9...

@bors
Copy link
Contributor

bors commented Jan 2, 2025

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

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Jan 2, 2025
@bors bors merged commit 62b13a9 into rust-lang:master Jan 2, 2025
7 checks passed
@rustbot rustbot added this to the 1.85.0 milestone Jan 2, 2025
@rust-timer
Copy link
Collaborator

📌 Perf builds for each rolled up PR:

PR# Message Perf Build Sha
#134967 handle submodules automatically on doc steps b7594c10fc41bc82a5e9d0edd0431815a369060c (link)
#134973 Fix typos f7d78e7493d7095996ef9d3ee8f619407bf7916d (link)
#134984 ObligationCause construction tweaks in typeck d904b4b3a7748662db8404ce949af5f4741d3641 (link)
#134985 Remove qualification of std::cmp::Ordering in Ord doc 86128cd89b43afd474c652502eb3740287ae99f2 (link)
#135000 Fix ICE when opaque captures a duplicated/invalid lifetime 5d0f34c7b4fb2e56c7f6974f547102c57a492b52 (link)

previous master: 45d11e51bb

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 (62b13a9): 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 (primary -0.0%, secondary 0.1%)

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.9% [0.6%, 1.2%] 2
Regressions ❌
(secondary)
2.6% [1.7%, 3.5%] 2
Improvements ✅
(primary)
-0.9% [-1.1%, -0.8%] 2
Improvements ✅
(secondary)
-2.4% [-3.1%, -1.8%] 2
All ❌✅ (primary) -0.0% [-1.1%, 1.2%] 4

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: 761.546s -> 762.325s (0.10%)
Artifact size: 325.44 MiB -> 325.51 MiB (0.02%)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
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-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
Development

Successfully merging this pull request may close these issues.

8 participants