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 #136272

Merged
merged 39 commits into from
Jan 30, 2025
Merged

Rollup of 5 pull requests #136272

merged 39 commits into from
Jan 30, 2025

Conversation

Zalathar
Copy link
Contributor

Successful merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

Kobzol and others added 30 commits January 21, 2025 17:00
It seems one can't overwrite a cache entry:
```
Failed to save: Unable to reserve cache with key linkcheck--0.8.1, another job may be creating this cache. More details: Cache already exists. Scope: refs/heads/master, Key: linkcheck--0.8.1, Version: 33f8fd511bed9c91c40778bc5c27cb58425caa894ab50f9c5705d83cb78660e0
Warning: Cache save failed.
```

A proper solution is to use `restore-keys`:
https://github.com/actions/cache/blob/main/tips-and-workarounds.md#update-a-cache
Update boring lines to sync with rustdoc
Compression of dylibs was removed in rust-lang#113695 (and decompression removed in rust-lang#132402).
Correct information on dylib compression
CI: use key-restore for cache GH action
Add some extra pointers for rustdoc frontend devs
Add a link to declare_lint! macro doc in diagnostics.md
BoxyUwU and others added 9 commits January 29, 2025 16:46
…ottmcm

optimize slice::ptr_rotate for small rotates

r? `@scottmcm`

This swaps the positions and numberings of algorithms 1 and 2 in `slice::ptr_rotate`, and pulls the entire outer loop into algorithm 3 since it was redundant for the first two. Effectively, `ptr_rotate` now always does the `memcpy`+`memmove`+`memcpy` sequence if the shifts fit into the stack buffer.
With this change, an `IndexMap`-style `move_index` function is optimized correctly.

Assembly comparisons:
- `move_index`, before: https://godbolt.org/z/Kr616KnYM
- `move_index`, after: https://godbolt.org/z/1aoov6j8h
- the code from `rust-lang#89714`, before: https://godbolt.org/z/Y4zaPxEG6
- the code from `rust-lang#89714`, after: https://godbolt.org/z/1dPx83axc

related to rust-lang#89714
some relevant discussion in https://internals.rust-lang.org/t/idea-shift-move-to-efficiently-move-elements-in-a-vec/22184

Behavior tests pass locally. I can't get any consistent microbenchmark results on my machine, but the assembly diffs look promising.
btree/node.rs: remove incorrect comment from pop_internal_level docs
…cations, r=jieyouxu

spastorino back from vacations
Rustc dev guide subtree update

r? `@Kobzol`
Cleanup docs for Allocator

This is an attempt to remove ungrammatical constructions and clean up the prose. I've sometimes had to try hard to understand what was being stated, so it is possible that I've misunderstood the original meaning. In particular, I did not see a difference between:
 - the borrow-checker lifetime of the allocator type itself.
 - as long as at least one of the allocator instance and all of its clones has not been dropped.
@rustbot rustbot added A-meta Area: Issues & PRs about the rust-lang/rust repository itself A-rustc-dev-guide Area: rustc-dev-guide 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. rollup A PR which is a rollup labels Jan 30, 2025
@Zalathar
Copy link
Contributor Author

@bors r+ rollup=never p=5

@bors
Copy link
Contributor

bors commented Jan 30, 2025

📌 Commit 4059a79 has been approved by Zalathar

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 30, 2025
@Zalathar
Copy link
Contributor Author

The slice change isn't marked rollup=never, but I've taken the liberty of only rolling it up with docs/admin changes, just in case a measurable difference occurs.

@bors
Copy link
Contributor

bors commented Jan 30, 2025

⌛ Testing commit 4059a79 with merge e6f12c8...

@bors
Copy link
Contributor

bors commented Jan 30, 2025

☀️ Test successful - checks-actions
Approved by: Zalathar
Pushing e6f12c8 to master...

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

📌 Perf builds for each rolled up PR:

PR# Message Perf Build Sha
#135847 optimize slice::ptr_rotate for small rotates e6536cbfb215c607293f22636f9eb5e6bf308406 (link)
#136215 btree/node.rs: remove incorrect comment from pop_internal_l… 5031d6458b6a3fb072f9e069aa23db404a0da697 (link)
#136252 spastorino back from vacations d31fab7894834e6d72a151a0c322e43aa1b48361 (link)
#136254 Rustc dev guide subtree update ffb442ed1d9276a8d149da21a4713a3bcb25bb8e (link)
#136259 Cleanup docs for Allocator bce14f23769ba2bc450dda7dc7efcfd526d188f8 (link)

previous master: 5e5567993d

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

@Zalathar Zalathar deleted the rollup-6s577l5 branch January 30, 2025 07:05
@rust-timer
Copy link
Collaborator

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

Results (secondary -2.8%)

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.8% [-3.8%, -1.8%] 2
All ❌✅ (primary) - - 0

Binary size

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

Bootstrap: 775.404s -> 776.287s (0.11%)
Artifact size: 328.40 MiB -> 328.44 MiB (0.01%)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-meta Area: Issues & PRs about the rust-lang/rust repository itself A-rustc-dev-guide Area: rustc-dev-guide 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.
Projects
None yet
Development

Successfully merging this pull request may close these issues.