[beta] Beta backports #96692
Merged
[beta] Beta backports #96692
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
Contributor
ehuss
commented
May 4, 2022
ehuss
commented
- Revert diagnostic duplication and accidental stabilization Revert diagnostic duplication and accidental stabilization #96516
- Revert "Re-export core::ffi types from std::ffi" Revert "Re-export core::ffi types from std::ffi" #96492
- Make [e]println macros eagerly drop temporaries (for backport) Make [e]println macros eagerly drop temporaries (for backport) #96490
- Revert "impl From<&[T; N]> and From<&mut [T; N]> for Vec" Revert "impl From<&[T; N]> and From<&mut [T; N]> for Vec<T>" #96489
- Cargo:
- move workspace inheritance unstable docs to the correct place (move workspace inheritance unstable docs to the correct place cargo#10616)
… r=yaahc Revert "impl From<&[T; N]> and From<&mut [T; N]> for Vec<T>" This reverts commit 5dd7027.
…lacrum Make [e]println macros eagerly drop temporaries (for backport) This PR extracts the subset of rust-lang#96455 which is only the parts necessary for fixing the 1.61-beta regressions in rust-lang#96434. My larger PR rust-lang#96455 contains a few other changes relative to the pre-rust-lang#94868 behavior; those are not necessary to backport into 1.61. argument position | before rust-lang#94868 | after rust-lang#94868 | after this PR --- |:---:|:---:|:---: `write!($tmp, "…", …)` | :rage: | :rage: | :rage: `write!(…, "…", $tmp)` | :rage: | :rage: | :rage: `writeln!($tmp, "…", …)` | :rage: | :rage: | :rage: `writeln!(…, "…", $tmp)` | :rage: | :rage: | :rage: `print!("…", $tmp)` | :rage: | :rage: | :rage: `println!("…", $tmp)` | :smiley_cat: | :rage: | :smiley_cat: `eprint!("…", $tmp)` | :rage: | :rage: | :rage: `eprintln!("…", $tmp)` | :smiley_cat: | :rage: | :smiley_cat: `panic!("…", $tmp)` | :smiley_cat: | :smiley_cat: | :smiley_cat:
…rt, r=yaahc Revert "Re-export core::ffi types from std::ffi" This reverts commit 9aed829. Fixes rust-lang#96435 , a regression in crates doing `use std::ffi::*;` and `use std::os::raw::*;`. We can re-add this re-export once the `core::ffi` types are stable, and thus the `std::os::raw` types can become re-exports as well, which will avoid the conflict. (Type aliases to the same type still conflict, but re-exports of the same type don't.)
|
rustbot
added
T-compiler
rust-highfive
added
the
S-waiting-on-review
…ntal_permitted, r=jackh726 Revert diagnostic duplication and accidental stabilization fixes rust-lang#96460 this is an accidental stabilization that we should put into the beta. I believe it is low-risk, because it was literally what we had before rust-lang#94081 The effect on tests is massive, but mostly deduplication of diagnostics and some minor span changes.
|
@bors r+ rollup=never |
|
📌 Commit 1c78743 has been approved by |
bors
added
S-waiting-on-bors
|
☀️ Test successful - checks-actions |
# for free
to join this conversation on GitHub.
Already have an account?
# 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.