Rollup of 5 pull requests #132269
Closed
Rollup of 5 pull requests #132269
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
…jgillot Lower AST node id only once Fixes rust-lang#96346. I basically followed the given instructions except the inline part. `lower_jump_destination` can't reuse local existing `HirId` due to unknown name resolution result so I created an additional mapping for labels. r? `@cjgillot`
…ir, r=celinval stable_mir: Directly use types from rustc_abi In most cases, rustc_target is not necessary, so use rustc_abi instead of its reexports.
…s-margins, r=notriddle [rustdoc] Unify variant struct fields margins with struct fields As discussed in rust-lang#132220. | before | after | |-|-| |  |  | r? `@notriddle`
…r-errors cg_llvm: Use a type-safe helper to cast `&str` and `&[u8]` to `*const c_char` In `rustc_codegen_llvm` there are many uses of `.as_ptr().cast()` to convert a string or byte-slice to `*const c_char`, which then gets passed through FFI. This works, but is fragile, because there's nothing constraining the pointer cast to actually be from `u8` to `c_char`. If the original value changes to something else that has an `as_ptr` method, or the context changes to expect something other than `c_char`, the cast will silently do the wrong thing. By making the cast more explicit via a helper method, we can be sure that it will either perform the intended cast, or fail at compile time.
…none, r=compiler-errors refactor: cleaner check to return None It's very nit change. Refactor to shorten verbose check when returning None for `backend_feature_name`.
rustbot
added
S-waiting-on-review
|
@bors r + p=5 |
|
This has apparently acquired a merge conflict, despite my efforts to not have any of my PRs do that. Ah well. I opened a new rollup. @bors r- |
bors
added
S-waiting-on-author
|
☔ The latest upstream changes (presumably #132262) made this pull request unmergeable. Please resolve the merge conflicts. |
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:
&strand&[u8]to*const c_char#132260 (cg_llvm: Use a type-safe helper to cast&strand&[u8]to*const c_char)r? @ghost
@rustbot modify labels: rollup
Create a similar rollup