Rollup of 8 pull requests #134988
Merged
Rollup of 8 pull requests #134988
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
The people updated in this commit have contributed under different email addresses than the ones they have used in rust-lang/team. A new change will use team data for thanks reviewers, which requires this to be in sync. Therefore, I have updated many of the people that I've noticed being duplicated after the change.
Signed-off-by: dxsullivan <193140725+dxsullivan@users.noreply.github.com>
…d-2, r=Mark-Simulacrum Add more mailmap entries If you have been pinged: I'm adding a mailmap entry for you to keep thanks.rust-lang.org working properly. **I have picked the canonical address mostly arbitrarily. If you want a different one as the canonical address, please tell me here**. <details> <summary>more details on the change</summary> builds on top of rust-lang#132471, this containing the less obvious changes that add new canonical email addresses instead of just adding new current ones. The people updated in this commit have contributed under different email addresses than the ones they have used in rust-lang/team. rust-lang/thanks#53 will use team data for thanks reviewers, which requires this to be in sync. Therefore, I have updated many of the people that I've noticed being duplicated after the change. </details> I'm adding a novel entry for you: ``@apiraino`` ``@KodrAus`` ``@cramertj`` ``@sunfishcode`` ``@Eh2406`` ``@skade`` ``@huonw`` ``@jsha`` ``@shepmaster`` ``@workingjubilee`` ``@rbtcollins`` ``@nrc`` ``@fitzgen`` ``@sophiajt`` ``@tmiasko`` ``@notriddle`` ``@TimNN`` ``@WaffleLapkin``
…r=estebank borrowck diagnostics: make `add_move_error_suggestions` use the HIR rather than `SourceMap` This PR aims to fix rust-lang#132806 by rewriting `add_move_error_suggestions`[^1]. Previously, it manually scanned the source text to find a leading `&`, which isn't always going to produce a correct result (see: that issue). Admittedly, the HIR visitor in this PR introduces a lot of boilerplate, but hopefully the logic at its core isn't too complicated (I go over it in the comments). I also tried a simpler version that didn't use a HIR visitor and suggested adding `ref` always, but the `&ref x` suggestions really didn't look good. As a bonus for the added complexity though, it's now able to produce nice `&`-removing suggestions in more cases. I tried to do this such that it avoids edition-dependent checks and its suggestions can be applied together with those from the match ergonomics 2024 migration lint. I haven't added tests for that since the details of match ergonomics 2024 are still being sorted out, but I can try if desired once that's finalized. [^1]: In brief, it fires on patterns where users try to bind by-value in such a way that moves out of a reference to a non-Copy type (including slice references with non-copy elements). The suggestions are to change the binding's mode to be by-reference, either by removing[^2] an enclosing `&`/`&mut` or adding `ref` to the binding. [^2]: Incidentally, I find the terminology of "consider removing the borrow" a bit confusing for a suggestion to remove a `&` pattern in order to make bindings borrow rather than move. I'm not sure what a good, concise way to explain that would be though, and that should go in a separate PR anyway.
…=fmease Add GUI test for item info elements color Fixes rust-lang#98341. r? ``@fmease``
Print how to rebless Python formatting in tidy Suggested [here](rust-lang#134964 (comment)). r? ``@Noratrieb``
chore: fix typos I hope my typo corrections will help you. Thank you for your work.
add .mailmap entry for myself Seeing rust-lang#132474 in the bors queue I decided to check myself and noticed I was listed four times. This fixed that by cannonicalizing all entries to use my username and the github no-reply email address, rather than some combination of name or username and different email addresses.
…compiler-errors Revert rust-lang#119515 single line where clause style guide This did not get implemented for the style edition in 2024, so this PR removes it from the documentation. See tracking issue rust-lang#132381. This can be added back in the next edition if it gets implemented. I'm a little unclear on what the style team intends for how future changes are documented. For example, the current style-guide documented behavior that rustfmt does not support. I'm not sure who the audience for this document is, or how this is intended to stay in sync with rustfmt. For example, if I read this and assume this is how it is supposed to work, and then rustfmt breaks that, it seems like that is confusing. Similarly, if I'm staying on an older edition, this documentation would be incorrect for my crate. Perhaps changes like this could be "teed-up" in a PR, but not merged until the edition is stabilized (similar to how the reference works)? And include notes for parts that are edition-specific (so if I am using an older edition, I can see that something is different). In general, I'm a little confused on how this is intended to work. Reverts: - rust-lang#119515
…, r=compiler-errors Revert style guide rhs break This reverts rust-lang#132369 and rust-lang#119838. The style-guide change for indentation of rhs was not implemented in time for the 2024 style edition. See tracking issue rust-lang#132380. cc rust-lang#134974 for the other style guide change in 2024. r? ``@compiler-errors``
|
☀️ Test successful - checks-actions |
|
📌 Perf builds for each rolled up PR:
previous master: 4e59b1da80 In the case of a perf regression, run the following command for each PR you suspect might be the cause: |
|
Finished benchmarking commit (2085bce): 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)Results (primary -1.4%)This 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.
CyclesResults (secondary -2.5%)This 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.
Binary sizeThis benchmark run did not return any relevant results for this metric. Bootstrap: 761.038s -> 761.779s (0.10%) |
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:
add_move_error_suggestionsuse the HIR rather thanSourceMap#133486 (borrowck diagnostics: makeadd_move_error_suggestionsuse the HIR rather thanSourceMap)whereclauses on the same line #119515 single line where clause style guide)r? @ghost
@rustbot modify labels: rollup
Create a similar rollup