Rollup of 6 pull requests #149387
Merged
Rollup of 6 pull requests #149387
+300
−408
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Also changes it from a static method to an instance method.
…raph Currently, If `expected_def_id` and `another_trait_def_id` have their crate imported as ExternCrateSource::Path the method get_extern_crate_renamed_symbol() will return None for both, resulting in a false positive. This fixes the issue by using a slitly different approach, we use a predicate instead and do the comparison of the item names only when both crates are imported as ExternCrateSource::Extern and are direct dependencies of the LOCAL_CRATE, otherwise false is returned.
Relocate issues/issue-51022.rs to entry-point/main-with-lifetime-param.rs Relocate issue-50714.rs to entry-point/main-where-fn-bound.rs Rename issue-118772.rs to main-with-invalid-signature.rs and delete duplicate test remove ui/entry-point/issue-118772.rs in issues.txt Relocate fn-main/wrong-location.rs to entry-point/main-in-submodule.rs Remove fn-main directory Relocate issue-50688.rs to mismatched_types/array-len-is-closure.rs
…ffleLapkin remove support for `typeof` see rust-lang/compiler-team#940 closes rust-lang#148700 This also enables checks for invariants previously broken by `typeof` again. r? types
…oshtriplett Rename `DropGuard::into_inner` to `DropGuard::dismiss` Tracking issue: rust-lang#144426 One of the open questions blocking the stabilization of `DropGuard` is what to name the associated method that prevents the destructor from running, and returns the captured value. This method is currently called `into_inner`, but most people (including myself) feel like this would benefit from a method that calls more attention to itself. This PR proposes naming this method `dismiss`, after the Linux kernel's [`ScopeGuard::dismiss`](https://rust.docs.kernel.org/kernel/types/struct.ScopeGuard.html#method.dismiss). Which crucially does not evoke images of violence or weaponry the way alternatives such as "disarm" or "defuse" do. And personally I enjoy the visual metaphor of "dismissing a guard" (e.g. a person keeping watch over something) - a job well done, they're free to go. This PR also changes the signature from an static method to an instance method. This also matches the Linux kernel's API, and seems alright since `dismiss` is not nearly as ubiquitous as `into_inner`. This makes it more convenient to use, with a much lower risk of conflicting. Though in the rare case there might be ambiguity, the explicit notation is available as a fallback. ```rust let x = DropGuard::into_inner(guard); // ← current let x = guard.dismiss(); // ← proposed
…ent_versions_of_crate, r=lcnr Fix false positive of "multiple different versions of crate X in the dependency graph" cc rust-lang#148892
fix ICE: rustdoc: const parameter types cannot be generic rust-lang#149288 fix rust-lang#149288 Applied the patch.
Deeply normalize param env in `compare_impl_item` if using the next solver Fixes rust-lang/trait-system-refactor-initiative#166. Duplicated the `normalize_param_env_or_error` function to force deep normalization for `compare_impl_item`. r? `@lcnr`
Tidying up UI tests [4/N] > [!NOTE] > Intermediate commits are intended to help review, but will be squashed prior to merge. part of rust-lang#133895 Relocate 4 tests in fn-main and issues and remove fn-main directory r? Kivooeo
rustbot
added
A-tidy
Member
Author
|
@bors r+ rollup=never p=5 |
Collaborator
bors
removed
the
S-waiting-on-review
bors
added
the
S-waiting-on-bors
Collaborator
Collaborator
|
☀️ Test successful - checks-actions |
Collaborator
|
📌 Perf builds for each rolled up PR:
previous master: cf8a95590a In the case of a perf regression, run the following command for each PR you suspect might be the cause: |
Contributor
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 cf8a955 (parent) -> f392ed5 (this PR) Test differencesShow 108 test diffsStage 1
Stage 2
Additionally, 56 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 f392ed53ca3884c96430f2a283ffffa836b204f5 --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 |
This was referenced Nov 27, 2025
Collaborator
|
Finished benchmarking commit (f392ed5): comparison URL. Overall result: ❌ regressions - please read the text belowOur benchmarks found a performance regression caused by this PR. Next Steps:
@rustbot label: +perf-regression Instruction countOur most reliable metric. Used to determine the overall result above. However, even this metric can be noisy.
Max RSS (memory usage)This benchmark run did not return any relevant results for this metric. CyclesResults (primary -2.6%, secondary -1.0%)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: 470.335s -> 472.637s (0.49%) |
Member
Author
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
10 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Successful merges:
typeof#148256 (remove support fortypeof)DropGuard::into_innertoDropGuard::dismiss#148589 (RenameDropGuard::into_innertoDropGuard::dismiss)const parameter types cannot be generic#149288)compare_impl_itemif using the next solver #149345 (Deeply normalize param env incompare_impl_itemif using the next solver)r? @ghost
@rustbot modify labels: rollup
Create a similar rollup