Rollup of 5 pull requests#155432
Open
JonathanBrouwer wants to merge 11 commits intorust-lang:mainfrom
Open
Conversation
…rnal modules respectively
…jdonszelmann Fix attribute order implementation The implementation in rust-lang#153041 contained a mistake :c I swapped the place where the error message was on, but did not change any code for which attribute was also selected, which explains the empty crater results. **Interestingly, the original code is broken too, before rust-lang#153041 it always took the last attribute, regardless of what the `AttributeOrder` actually was...** Let's first see crater results before making a decision TODO for this PR: Make better tests for this
resolve: Introduce `(Local,Extern)Module` newtypes for local and external modules respectively Right now both `LocalModule` and `ExternModule` refer to the same `ModuleData`, but the module data for local and extern modules can potentially be made quite different, and we can specialize name lookup for both cases as an optimization. Declaration creation for local and external modules was already specialized as a part of the parallel import resolution work (see `define_local` and `define_extern`, rust-lang#145108 and previous PRs), because they have different properties with regards to ownership and synchronization.
Use `MaybeDangling` in `std` cc rust-lang#118166
…rror-kind, r=tgross35 Add `TryFromIntError::kind` method and `IntErrorKind::NotAPowerOfTwo` variant - ACP: rust-lang/libs-team#746 - Tracking issue: rust-lang#153978 This pull request adds `kind` method to [`TryFromIntError`](https://doc.rust-lang.org/core/num/struct.TryFromIntError.html), which outputs the detailed cause of converting an integer failing. This is primarily intended for use in cases where there are multiple causes for failure, such as converting from a large signed integer type to a small signed integer type. At the moment, this method returns [`&IntErrorKind`](https://doc.rust-lang.org/core/num/enum.IntErrorKind.html). This type implements the `Copy` trait and could return `IntErrorKind`, but returns a reference to align with the behavior of [`ParseIntError::kind`](https://doc.rust-lang.org/core/num/struct.ParseIntError.html#method.kind). If it is not necessary to align the behavior of `TryFromIntError::kind` with `ParseIntError::kind`, I'll change this method to return `IntErrorKind`. Before this pull request, `IntErrorKind` was only used by [`ParseIntError`](https://doc.rust-lang.org/core/num/struct.ParseIntError.html), but I changed it to be used by `TryFromIntError` as well, so I updated `IntErrorKind`'s documentation. [`impl TryFrom<usize> for Alignment`](https://doc.rust-lang.org/std/ptr/struct.Alignment.html#impl-TryFrom%3Cusize%3E-for-Alignment) returns `TryFromIntError` as an error if the given value is not a power of two. However, `IntErrorKind` does not have a variant that represents this. So I added the variant `NotAPowerOfTwo` to represent this. For this variant to stabilize, both `try_from_int_error_kind` and `ptr_alignment_type` features must be stabilized.
…ation-extension, r=jhpratt Documenting the case of `Weak::upgrade` returning `None` when the value behind the reference is missing Adds a clause to the documentation of `Weak` for `Arc` which was discussed in rust-lang#154936. Adds the same clause to the documentation of `Weak` for `Rc`, because the behavior is the same.
rustbot
added
A-attributes
Contributor
Author
|
@bors r+ rollup=never p=5 |
Contributor
rust-bors
bot
added
S-waiting-on-bors
Contributor
|
⌛ Testing commit f67a375 with merge 8e668eb... Workflow: https://github.com/rust-lang/rust/actions/runs/24570740426 |
rust-bors bot
pushed a commit
that referenced
this pull request
Apr 17, 2026
…uwer Rollup of 5 pull requests Successful merges: - #154781 (Fix attribute order implementation) - #155242 (resolve: Introduce `(Local,Extern)Module` newtypes for local and external modules respectively) - #149614 (Use `MaybeDangling` in `std`) - #153178 (Add `TryFromIntError::kind` method and `IntErrorKind::NotAPowerOfTwo` variant) - #155049 (Documenting the case of `Weak::upgrade` returning `None` when the value behind the reference is missing) Failed merges: - #155308 (Make `OnDuplicate::Error` the default for attributes)
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
6 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:
(Local,Extern)Modulenewtypes for local and external modules respectively #155242 (resolve: Introduce(Local,Extern)Modulenewtypes for local and external modules respectively)MaybeDanglinginstd#149614 (UseMaybeDanglinginstd)TryFromIntError::kindmethod andIntErrorKind::NotAPowerOfTwovariant #153178 (AddTryFromIntError::kindmethod andIntErrorKind::NotAPowerOfTwovariant)Weak::upgradereturningNonewhen the value behind the reference is missing #155049 (Documenting the case ofWeak::upgradereturningNonewhen the value behind the reference is missing)Failed merges:
OnDuplicate::Errorthe default for attributes #155308 (MakeOnDuplicate::Errorthe default for attributes)r? @ghost
Create a similar rollup