-
-
Notifications
You must be signed in to change notification settings - Fork 14.4k
Rollup of 5 pull requests #151852
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 #151852
Conversation
This updates the rust-version file to 5c49c4f.
Pull recent changes from https://github.com/rust-lang/rust via Josh. Upstream ref: rust-lang/rust@5c49c4f Filtered ref: rust-lang/rustc-dev-guide@866efc3 Upstream diff: rust-lang/rust@44a5b55...5c49c4f This merge was created using https://github.com/rust-lang/josh-sync.
Rustc pull update
coercions.md: add date-check marker
Co-authored-by: Yuki Okushi <[email protected]>
Document experimental RFC process in walkthrough
…ting-docs Add a new subsection for contributors
Add info about unused_attributes
This updates the rust-version file to 873d468.
Pull recent changes from https://github.com/rust-lang/rust via Josh. Upstream ref: rust-lang/rust@873d468 Filtered ref: rust-lang/rustc-dev-guide@94e6e4f Upstream diff: rust-lang/rust@5c49c4f...873d468 This merge was created using https://github.com/rust-lang/josh-sync.
Rustc pull update
This updates the rust-version file to 0462e8f.
Pull recent changes from https://github.com/rust-lang/rust via Josh. Upstream ref: rust-lang/rust@0462e8f Filtered ref: rust-lang/rustc-dev-guide@a136707 Upstream diff: rust-lang/rust@873d468...0462e8f This merge was created using https://github.com/rust-lang/josh-sync.
Rustc pull update
Add missing autodiff run-make tests to the install docs
Refer to debug-logging bootstrap config by its full path.
`QueryStackFrame<I>` is a generic type, and the `I` parameter leaks out to many other related types. However, it only has two instantiations in practice: - `QueryStackFrame<QueryStackFrameExtra>` - `QueryStackFrame<QueryStackDeferred<'tcx>>` And most of the places that currently use `QueryStackFrame<I>` are actually specific to one of the instantiations. This commit removes the unneeded genericity. The following types are only ever used with `QueryStackDeferred<'tcx>`: - QueryMap - QueryJobInfo - QueryJob - QueryWaiter - QueryLatchInfo - QueryLatch - QueryState - QueryResult and their `<I>` parameter is changed to `<'tcx>`. Also, the `QueryContext::QueryInfo` associated type is removed. `CycleError<I>` and `QueryInfo<I>` are still generic over type, because they are used with both instantiations. This required also adding a `<'tcx>` parameter to the traits `QueryDispatcher` and `QueryContext`, which is annoying but I can't see how to avoid it.
…ercote
Reduce generics use in the query system.
In rust-lang#151203 I tried and failed to simplify `QueryStackFrame`. This is an alternative approach. There is no functional change, just tweaking of some names and types to make things clearer. Best reviewed one commit at a time.
r? @oli-obk
Document a safety condition for `TypedArena::alloc_raw_slice` This method was marked safe in rust-lang@51edc21, because there was no apparent reason for it to be unsafe. However, I believe that `alloc_raw_slice` does actually impose a significant safety obligation on its caller, because the caller must ensure that each slot in the slice is properly initialized before the arena is dropped. This is because the arena's Drop impl will unconditionally drop every storage slot that has been handed out, so it has no way to handle slots that were accidentally left uninitialized because a hypothetical caller of `alloc_raw_slice` panicked before initializing them.
…d-parens-labeled-loops, r=Kivooeo Fix false positive in unused_parens caused by break Fixes rust-lang#143256
…e, r=jdonszelmann Fix missing syntax context in lifetime hygiene debug output `-Zunpretty=expanded,hygiene` was not printing the syntax context for lifetimes. For example, two macro-generated lifetimes `'a` with different hygiene would both print as `/* 2538 */` instead of `/* 2538#0 */` and `/* 2538#1 */`, making it impossible to distinguish them. This was fixed by changing `print_lifetime` to call `ann_post()` with the full `Ident`, matching how regular identifiers are handled in `print_ident`. Closes: rust-lang#151797
rustc-dev-guide subtree update Subtree update of `rustc-dev-guide` to rust-lang/rustc-dev-guide@e03697d. Created using https://github.com/rust-lang/josh-sync. r? @ghost
|
Rollup of everything. @bors r+ rollup=never p=5 |
This comment has been minimized.
This comment has been minimized.
|
📌 Perf builds for each rolled up PR:
previous master: ef2657cbaf In the case of a perf regression, run the following command for each PR you suspect might be the cause: |
What is this?This is an experimental post-merge analysis report that shows differences in test outcomes between the merged PR and its parent PR.Comparing ef2657c (parent) -> 7d8ebe3 (this PR) Test differencesShow 32 test diffsStage 1
Stage 2
Additionally, 28 doctest diffs were found. These are ignored, as they are noisy. Job group index
Test dashboardRun cargo run --manifest-path src/ci/citool/Cargo.toml -- \
test-dashboard 7d8ebe3128fc87f3da1ad64240e63ccf07b8f0bd --output-dir test-dashboardAnd then open Job duration changes
How to interpret the job duration changes?Job durations can vary a lot, based on the actual runner instance |
|
Finished benchmarking commit (7d8ebe3): comparison URL. Overall result: no relevant changes - no action needed@rustbot label: -perf-regression Instruction countThis 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. CyclesResults (primary 3.0%, secondary 3.1%)A less reliable metric. May be of interest, but not used to determine the overall result above.
Binary sizeThis benchmark run did not return any relevant results for this metric. Bootstrap: 545.612s -> 475.389s (-12.87%) |
Successful merges:
TypedArena::alloc_raw_slice#151808 (Document a safety condition forTypedArena::alloc_raw_slice)r? @ghost
Create a similar rollup