Rollup of 10 pull requests #148693
Closed
Rollup of 10 pull requests #148693
+1,910
−1,194
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
lld is a great choice for a default linker.
This patch enables the std locking functions on AIX by including AIX on the list
of supported targets for the locking functions. Excluding AIX from the std
locking functions results to compilation errors such as: ("try_lock() not supported").
Updated email addresses for several contributors in the mailmap.
Avoid duplicating this comment in preparation for adding more enums.
Prepare for additional enums like Vendor and Os which have true `Unknown` variants. We want to use the same name for the escape hatch for all of these, thus rename this one.
Improve type safety by using an enum rather than strings.
Improve type safety by using an enum rather than strings.
Improve type safety by using an enum rather than strings.
Improve type safety by using an enum rather than strings.
… user-defined function names
…Jung Show packed field alignment in mir_transform_unaligned_packed_ref Fixes rust-lang#147528 I left the expected padding for the field out of the error message so the message would be the same on all platforms. It also isn't always possible to know the expected alignment, so this makes the message simpler.
Modify contributor email entries in .mailmap This adds mailmap entries for duplicates I found in https://thanks.rust-lang.org/rust/all-time/ If I added an entry for you and it is not correct, then please let me know! See the comments at the start of https://github.com/rust-lang/thanks/blob/master/mailmap/src/lib.rs for understanding these entries. After this gets into the repo, the thanks page will be regenerated within a day, and your double entries will be merged. cc ``````@aochagavia`````` cc ``````@fasterthanlime`````` cc ``````@jackh726`````` cc ``````@jakubadamw`````` cc ``````@yaahc`````` cc ``````@jackpot51`````` cc ``````@jonhoo`````` cc ``````@marcoieni`````` cc ``````@onur-ozkan`````` cc ``````@rylev`````` cc ``````@willcrichton`````` cc ``````@yoshuawuyts``````
rustc_builtin_macros: rename bench parameter to avoid collisions with user-defined function names Resolves rust-lang#148275 by preventing name collisions in the `#[bench]` macro. Previously, a user-defined function named "b" could not be benchmarked because the macro-generated lambda identity collided with the same name. We now generate the lambda ident as `__bench_<function_name>`, ensuring it is always distinct from the user’s function. Because the prefix is applied recursively (e.g. benchmarking `__bench_b` produces a lambda ident `__bench___bench_b`), there is no possible function name that can equal its corresponding lambda ident. This guarantees that the user can safely bench a function of any valid name without risk of identifier collision.
rustc_target: introduce Vendor, Abi, Env, Os Improve type safety by using an enum rather than strings. I'm not really sure this is better since only a few vendors have special semantics. r? ``@nnethercote``
…ng, r=Kivooeo `invalid_atomic_ordering`: also lint `update` & `try_update` Split from rust-lang#148590 Tracking issue for `update` and `try_update`: rust-lang#135894
…-hygiene-diagnostic, r=JonathanBrouwer Add note for identifier with attempted hygiene violation Fixes rust-lang#148580 I changed the original test to make sure we are pointing to the right scope.
…nBrouwer,Noratrieb Switch hexagon targets to rust-lld lld is a great choice for a default linker.
…AIX, r=workingjubilee
Enable std locking functions on AIX
This patch enables the std locking functions on AIX by including AIX on the list of supported targets for the locking functions. Excluding AIX from the std locking functions results to compilation errors such as: ("try_lock() not supported").
…pen, r=Kobzol [bootstrap] Make `--open` option work with `doc src/tools/error_index_generator` Fixes rust-lang#148557.
don't completely reset `HeadUsages` This is really subtle ☠️ I've actually went and added testing for `search_graph.ignore_candidate_head_usages` to https://github.com/lcnr/search_graph_fuzz now. I should have done that when I originally implemented but didn't quite know how to do so back then. The search graph is far too subtle to think through it manually. I've added the affected proof tree to https://github.com/rust-lang/trait-system-refactor-initiative/blob/main/notes/next-solver/search-graph/general.md#keeping-provisional-cache-entries-on-rerun. It's - A - B - C (depends on B and gets dropped when rerunning) - D (does not depend on B so we keep it around when rerunning) - C (irrevant candidate) - A - B - D - C (irrevant candidate) - D - A - rerun - C (use provisional cache entry which doesn't depend on B) - D (use provisional cache entry which doesn't depend on B) Fixes the ICE in rust-lang/trait-system-refactor-initiative#246 (comment). I think this issue is brittle enough that adding that as a test isn't really useful. Any small change to the search graph will prevent it from testing this. We do test this fix via the fuzzer. r? ```@BoxyUwU```
rustbot
added
A-attributes
rustbot
added
S-waiting-on-review
rustbot
removed
the
S-waiting-on-review
Collaborator
|
☔ The latest upstream changes (presumably #147935) made this pull request unmergeable. Please resolve the merge conflicts. |
bors
added
the
S-waiting-on-author
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
13 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:
invalid_atomic_ordering: also lintupdate&try_update#148601 (invalid_atomic_ordering: also lintupdate&try_update)--openoption work withdoc src/tools/error_index_generator#148644 ([bootstrap] Make--openoption work withdoc src/tools/error_index_generator)HeadUsages#148649 (don't completely resetHeadUsages)r? @ghost
@rustbot modify labels: rollup
Create a similar rollup