Rollup of 3 pull requests#154033
Closed
JonathanBrouwer wants to merge 7 commits intorust-lang:mainfrom
Closed
Conversation
Removing coherent and self-contained chunks of code from a catch-all "plumbing" module is typically an improvement. Giving the trait its own file also gets rid of the unhelpful `sealed` module that it was previously in.
All methods that accept `impl IntoQueryKey<_>` have been adjusted to consistently call `into_query_key` before doing anything else. When a function with a conversion trait calls another function with the same conversion trait, doing the conversion eagerly can reduce the overall number of instantiations.
…ed, r=scottmcm Change `?Sized` to `PointeeSized` in `UnwindSafe` impls for pointers Tracking issue: rust-lang#144404. This PR is similar to rust-lang#152646.
doc: clarify allocator invariant Added base + size <= usize::MAX to the Allocator documentation. Please refer to issue [153542](rust-lang#153542). Close rust-lang#153542
…cote Rename trait `IntoQueryParam` to `IntoQueryKey` This is in line with the general trend towards consistently referring to a query method parameter/argument as a “key”. In addition to the actual renaming, this PR also moves the trait out of `plumbing` and into its own file, and tweaks some of the occurrences of the trait to be more consistent with each other. r? nnethercote
rustbot
added
S-waiting-on-review
Contributor
Author
|
@bors r+ rollup=never p=5 |
Contributor
rust-bors
bot
added
S-waiting-on-bors
Contributor
|
☔ The latest upstream changes (presumably #154032) made this pull request unmergeable. Please resolve the merge conflicts. This pull request was unapproved. |
rustbot
removed
the
S-waiting-on-author
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
5 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:
?SizedtoPointeeSizedinUnwindSafeimpls for pointers #153945 (Change?SizedtoPointeeSizedinUnwindSafeimpls for pointers)IntoQueryParamtoIntoQueryKey#154028 (Rename traitIntoQueryParamtoIntoQueryKey)r? @ghost
Create a similar rollup