Skip to content

Rollup of 3 pull requests #134959

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 6 commits into from
Dec 31, 2024
Merged

Rollup of 3 pull requests #134959

merged 6 commits into from
Dec 31, 2024

Conversation

jhpratt
Copy link
Member

@jhpratt jhpratt commented Dec 31, 2024

Successful merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

compiler-errors and others added 6 commits December 31, 2024 01:08
@compiler-errors
Unsafe binder support in rustdoc
aac741a
@Walnut356
use python built in type annotations
693a0d5
@peicuiping
chore: fix some typos
09541c2 
Signed-off-by: peicuiping <ezc5@sina.cn>
@jhpratt
Rollup merge of rust-lang#134291 - Walnut356:type_annots, r=tgross35
f3d404a 
Use python built in type annotations in LLDB visualizer scripts

Replaces type annotation comments with python's built-in type annotations.

Built-in type annotations were added in python 3.5. LLDB [currently recommends (and as of LLVM 21, will enforce)](llvm/llvm-project#114807) a minimum python version of 3.8. Rust's test suite also requires python 3.10.
@jhpratt
Rollup merge of rust-lang#134857 - compiler-errors:rustdoc-unsafe-bin…
3785bc2 
…ders, r=camelid

Unsafe binder support in rustdoc

Adds rustdoc support for unsafe binder types: `unsafe<'a> Foo<'a>`. Doesn't add json support yet.

Tracking:
* rust-lang#130516
@jhpratt
Rollup merge of rust-lang#134957 - peicuiping:master, r=lqd
77926e6 
chore: fix some typos
@rustbot rustbot added A-rustdoc-json Area: Rustdoc JSON backend 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-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. rollup A PR which is a rollup labels Dec 31, 2024
@jhpratt
Copy link
Member Author

jhpratt commented Dec 31, 2024

@bors r+ rollup=never p=3

@bors
Copy link
Collaborator

bors commented Dec 31, 2024

📌 Commit 77926e6 has been approved by jhpratt

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 Dec 31, 2024
@bors
Copy link
Collaborator

bors commented Dec 31, 2024

⌛ Testing commit 77926e6 with merge aea4e43...

@bors
Copy link
Collaborator

bors commented Dec 31, 2024

☀️ Test successful - checks-actions
Approved by: jhpratt
Pushing aea4e43 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Dec 31, 2024
@bors bors merged commit aea4e43 into rust-lang:master Dec 31, 2024
7 checks passed
@rustbot rustbot added this to the 1.85.0 milestone Dec 31, 2024
@rust-timer
Copy link
Collaborator

📌 Perf builds for each rolled up PR:

PR# Message Perf Build Sha
#134291 Use python built in type annotations in LLDB visualizer scr… 8988068321c91643e82fe7103fc7e17c21efd774 (link)
#134857 Unsafe binder support in rustdoc 78f2271f61c7aeda1c1ba2d5bd42d55dc8161350 (link)
#134957 chore: fix some typos b2490286cdef778bc0a5ccc8a940635b47eb5955 (link)

previous master: 41b579660c

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 (aea4e43): 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 3.1%, secondary -1.4%)

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)		 3.1% [3.1%, 3.1%] 1
Regressions ❌
(secondary)		 - - 0
Improvements ✅
(primary)		 - - 0
Improvements ✅
(secondary)		 -1.4% [-1.4%, -1.4%] 1
All ❌✅ (primary) 3.1% [3.1%, 3.1%] 1

Cycles

Results (secondary -2.6%)

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)		 - - 0
Improvements ✅
(secondary)		 -2.6% [-2.8%, -2.4%] 2
All ❌✅ (primary) - - 0

Binary size

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

Bootstrap: 760.034s -> 760.593s (0.07%)
Artifact size: 325.55 MiB -> 325.49 MiB (-0.02%)

@jhpratt jhpratt deleted the rollup-vxt40of branch January 14, 2025 09:49
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-rustdoc-json Area: Rustdoc JSON backend 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-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue.
Projects
None yet
Milestone
1.85.0
Development

Successfully merging this pull request may close these issues.
7 participants
@jhpratt @bors @rust-timer @rustbot @compiler-errors @Walnut356 @peicuiping