Rollup of 8 pull requests #101508
Merged
Rollup of 8 pull requests #101508
Conversation
This file contains 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
Feel free to close if this is too minor.
internal: Migrate to using format arg captures in `syntax::make`
…jonas-schievink feat: Add a "Unmerge match arm" assist to split or-patterns inside match expressions Fixes rust-lang#13072. The way I implemented it it leaves the `OrPat` in place even if there is only one pattern now but I don't think something will break because of that, and when more code will be typed we'll parse it again anyway. Removing it (but keeping the child pattern) is hard, I don't know how to do that.
…h with explicit type", even when it is not exactly the same as the turbofish type I implemented that by checking the expressions' type. This could probably be implemented better by taking the function's return type and substituting the generic parameter with the provided turbofish, but this is more complicated.
Now that we use type information this is easy.
…er-type, r=Veykril Use correct type in "Replace turbofish with type" And support `?` and `.await` expressions. Fixes rust-lang#13148. The assist can still show up even if the turbofish's type is not used at all, e.g.: ```rust fn foo<T>() {} let v = foo::<i32>(); ```
The change in rust-lang/rust-analyzer#13123 actually re-uses the RefMut borrow instead of dropping it so we need to drop it manually where required.
Drop the expander borrow in all control flow paths The change in rust-lang/rust-analyzer#13123 actually re-uses the RefMut borrow instead of dropping it so we need to drop it manually where required. Fixes rust-lang/rust-analyzer#13153
…th, r=Veykril fix: unescape all occurrences of module name in module resolution Fixes rust-lang#13141
fix: sort and deduplicate auto traits in trait object types Fixes rust-lang#12739 Chalk solver doesn't sort and deduplicate auto traits in trait object types, so we need to handle them ourselves in the lowering phase, just like [`rustc`](https://github.com/rust-lang/rust/blob/880416180b0a9ee1141c07d4d17667edb77daebd/compiler/rustc_typeck/src/astconv/mod.rs#L1487-L1488) and [`chalk-integration`](https://github.com/rust-lang/chalk/blob/master/chalk-integration/src/lowering.rs#L575) do. Quoting from [the Chalk book](https://rust-lang.github.io/chalk/book/types/rust_types.html#dyn-types): > Note that -- for this purpose -- ordering of bounds is significant. That means that if you create a `dyn Foo + Send` and a `dyn Send + Foo`, chalk would consider them distinct types. The assumption is that bounds are ordered in some canonical fashion somewhere else. Also, trait object types with more than one non-auto traits were previously allowed, but are now disallowed with this patch.
…rcegen, r=Veykril clippy: make generated code nice to read Feel free to close if this is too minor. (For context, I _have_ read the clippy policy in `dev/style.md`)
Co-authored-by: Lukas Wirth <lukastw97@gmail.com>
This CSS still matches sometimes, as you can see in <https://doc.rust-lang.org/1.63.0/std/collections/enum.TryReserveErrorKind.html#variant.AllocError.fields>, but since nothing else is setting `margin-top`, putting it back to `initial` does nothing. This selector was added in 2fd378b (but it was called `.stability` instead of `.item-info` at the time), probably as an override for the selector immediately above it that sets a negative margin. That negative margin was removed in 593d6d1.
Add incremental test for changing struct name in assoc type. The ICE appears on beta and is fixed on nightly. Fixes rust-lang#100521
…ut-dyn, r=cjgillot fix RPIT ICE for implicit HRTB when missing dyn Closes rust-lang#101297 r? `@cjgillot` cc `@nikomatsakis`
Fix compile errors for uwp-windows-msvc targets Fixes rust-lang#101480
Remove dead broken code from const zst handling in backends cc `@RalfJung` found by `@eddyb` in rust-lang#98957 (comment)
…=estebank Add list of recognized repr attributes to the unrecognized repr error
…v-item-info, r=GuillaumeGomez rustdoc: remove outdated CSS `.sub-variant > div > .item-info` This CSS still matches sometimes, as you can see in <https://doc.rust-lang.org/1.63.0/std/collections/enum.TryReserveErrorKind.html#variant.AllocError.fields>, but since nothing else is setting `margin-top`, putting it back to `initial` does nothing. This selector was added here, but it was called `.stability` instead of `.item-info` at the time, probably as an override for the selector immediately above it that sets a negative margin: https://github.com/rust-lang/rust/blob/2fd378b82b14f2746462018e8510e15a079818a0/src/librustdoc/html/static/rustdoc.css#L514-L522 That negative margin was removed in 593d6d1.
…r=lnicola ⬆️ rust-analyzer r? `@ghost`
rustbot
added
T-compiler
|
@bors r+ p=8 rollup=never |
bors
added
the
S-waiting-on-bors
|
☀️ Test successful - checks-actions |
|
📌 Perf builds for each rolled up PR: previous master: 699bfa882b In the case of a perf regression, run the following command for each PR you suspect might be the cause: |
|
Finished benchmarking commit (8c41305): comparison URL. Overall result: ✅ improvements - no action needed@rustbot label: -perf-regression Instruction countThis is a highly reliable metric that was used to determine the overall result at the top of this comment.
Max RSS (memory usage)ResultsThis 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.
CyclesResultsThis 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.
Footnotes |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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:
#results > table#101488 (rustdoc: remove unused CSS#results > table).sub-variant > div > .item-info#101491 (rustdoc: remove outdated CSS.sub-variant > div > .item-info)Failed merges:
r? @ghost
@rustbot modify labels: rollup
Create a similar rollup